[Bounty] Tundra moths (#3676)

* save

* saving

* ihatespritesihatesprites

* whhhy

* bodypartsvisiblethankuKmla

* motheyes

* almstodone

* testscreenshot I think temp removal of temp

* armkginsfixlater

* screenshot

* monkestation edit

* more monkeaddition

* mothmen

* fixed testscreenshot

* heatmod

* temp screenshot

* addition

* placeholdermarkings

* real modular

* modulize

* tundrastuff

* revert

* test

* tolazytowritemoreofthese

* I DID IT

* cryimg

* really pretty modulizartion

* more modulizaration

* modulizar?

* test

* test

* modularrr

* Update monkestation/code/modules/surgery/organs/internal/eyes.dm

Co-authored-by: Lucy <[email protected]>

* Update monkestation/code/modules/mob/living/carbon/human/species_type/Tundramoths/tundramoths.dm

Co-authored-by: Lucy <[email protected]>

* Update code/modules/unit_tests/screenshot_humanoids.dm

Co-authored-by: Lucy <[email protected]>

* stuff

* fix

* sdfsafs

* test screenshot

---------

Co-authored-by: Lucy <[email protected]>

code/__DEFINES/mobs.dm

@@ -114,6 +114,7 @@
 #define SPECIES_NIGHTMARE "nightmare"
 #define SPECIES_MONKEY "monkey"
 #define SPECIES_MOTH "moth"
+#define SPECIES_TUNDRA "tundra_moth" //Monkestation Addition
 #define SPECIES_MUSHROOM "mush"
 #define SPECIES_PLASMAMAN "plasmaman"
 #define SPECIES_PODPERSON "pod"

code/modules/surgery/organs/eyes.dm

@@ -688,7 +688,6 @@
 	flash_protect = FLASH_PROTECTION_SENSITIVE
 	overlay_ignore_lighting = TRUE
 
-
 /obj/item/organ/internal/eyes/lizard
 	name = "lizard eyes"
 	desc = "These eyes seem to glow."

code/modules/unit_tests/screenshot_humanoids.dm

@@ -25,6 +25,14 @@
 	test_screenshot("[/datum/species/moth]", get_flat_icon_for_all_directions(moth))
 
 	//MONKESTATION ADDITION START
+	var/mob/living/carbon/human/tundramoth = allocate(/mob/living/carbon/human/dummy/consistent)
+	tundramoth.dna.features["moth_antennae"] = "Tundra"
+	tundramoth.dna.features["moth_markings"] = "Tundra"
+	tundramoth.dna.features["moth_wings"] = "Tundra"
+	tundramoth.set_species(/datum/species/moth/tundra)
+	tundramoth.equipOutfit(/datum/outfit/job/doctor, visualsOnly = TRUE)
+	test_screenshot("[/datum/species/moth/tundra]", get_flat_icon_for_all_directions(tundramoth))
+
 	var/mob/living/carbon/human/apid = allocate(/mob/living/carbon/human/dummy/consistent)
 	apid.dna.features["apid_antenna"] = "Horns"
 	apid.dna.features["apid_wings"] = "Normal" // Just in case someone ever adds more
@@ -34,7 +42,7 @@
 	//MONKESTATION ADDITION END
 
 	// The rest of the species
-	for (var/datum/species/species_type as anything in subtypesof(/datum/species) - /datum/species/moth - /datum/species/lizard - /datum/species/apid)
+	for (var/datum/species/species_type as anything in subtypesof(/datum/species) - typesof(/datum/species/moth) - /datum/species/lizard - /datum/species/apid)
 		test_screenshot("[species_type]", get_flat_icon_for_all_directions(make_dummy(species_type, /datum/outfit/job/assistant/consistent)))
 
 /datum/unit_test/screenshot_humanoids/proc/make_dummy(species, job_outfit)

config/game_options.txt

@@ -349,6 +349,7 @@ ROUNDSTART_RACES human
 ROUNDSTART_RACES lizard
 #ROUNDSTART_RACES fly
 ROUNDSTART_RACES moth
+ROUNDSTART_RACES tundra_moth
 ROUNDSTART_RACES plasmaman
 #ROUNDSTART_RACES shadow
 ROUNDSTART_RACES oozeling

monkestation/code/modules/mob/living/carbon/human/human.dm

@@ -9,3 +9,6 @@
 
 /mob/living/carbon/human/species/ornithid
     race = /datum/species/ornithid
+
+/mob/living/carbon/human/species/moth/tundra
+	race = /datum/species/moth/tundra

monkestation/code/modules/mob/living/carbon/human/species_type/tundra_moths/mothaccessories.dm

@@ -0,0 +1,34 @@
+// These can be accessed by all types of moths, just modular
+
+// Tundra
+/datum/sprite_accessory/moth_wings/tundra
+	name = "Tundra"
+	icon = 'monkestation/icons/mob/species/tundramoths/moth_wings.dmi'
+	icon_state = "tundra"
+
+/datum/sprite_accessory/moth_antennae/tundra
+	name = "Tundra"
+	icon = 'monkestation/icons/mob/species/tundramoths/moth_antennae.dmi'
+	icon_state = "tundra"
+
+/datum/sprite_accessory/moth_markings/tundra
+	name = "Tundra"
+	icon = 'monkestation/icons/mob/species/tundramoths/moth_markings.dmi'
+	icon_state = "tundra"
+
+// Bluespace
+/datum/sprite_accessory/moth_wings/bluespace
+	icon = 'monkestation/icons/mob/species/tundramoths/moth_wings.dmi'
+	name = "Bluespace"
+	icon_state = "bluespace"
+
+/datum/sprite_accessory/moth_antennae/bluespace
+	name = "Bluespace"
+	icon = 'monkestation/icons/mob/species/tundramoths/moth_antennae.dmi'
+	icon_state = "bluespace"
+
+// Twilight
+/datum/sprite_accessory/moth_antennae/twilight
+	name = "Twilight"
+	icon = 'monkestation/icons/mob/species/tundramoths/moth_antennae.dmi'
+	icon_state = "twilight"

monkestation/code/modules/mob/living/carbon/human/species_type/tundra_moths/tundramoths.dm

@@ -0,0 +1,73 @@
+/datum/species/moth/tundra
+	name = "\improper Tundra Moth"
+	plural_form = "Tundra Moths"
+	id = SPECIES_TUNDRA
+	mutanteyes = /obj/item/organ/internal/eyes/moth/tundra
+	external_organs = list(/obj/item/organ/external/wings/moth = "Tundra", /obj/item/organ/external/antennae = "Tundra")
+
+	bodypart_overrides = list(
+		BODY_ZONE_HEAD = /obj/item/bodypart/head/tundramoth,
+		BODY_ZONE_CHEST = /obj/item/bodypart/chest/tundramoth,
+		BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/tundramoth,
+		BODY_ZONE_R_ARM = /obj/item/bodypart/arm/right/tundramoth,
+		BODY_ZONE_L_LEG = /obj/item/bodypart/leg/left/tundramoth,
+		BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/tundramoth,
+	)
+
+	coldmod = 0.67
+	heatmod = 1.5
+
+
+//Body parts
+/obj/item/bodypart/head/tundramoth
+	icon = 'monkestation/icons/mob/species/tundramoths/bodyparts.dmi'
+	icon_state = "tundra_moth_head"
+	icon_static = 'monkestation/icons/mob/species/tundramoths/bodyparts.dmi'
+	limb_id = SPECIES_TUNDRA
+	is_dimorphic = FALSE
+	should_draw_greyscale = FALSE
+	head_flags = /obj/item/bodypart/head/moth::head_flags
+
+/obj/item/bodypart/chest/tundramoth
+	icon = 'monkestation/icons/mob/species/tundramoths/bodyparts.dmi'
+	icon_state = "tundra_moth_chest_m"
+	icon_static = 'monkestation/icons/mob/species/tundramoths/bodyparts.dmi'
+	limb_id = SPECIES_TUNDRA
+	is_dimorphic = TRUE
+	should_draw_greyscale = FALSE
+
+/obj/item/bodypart/arm/left/tundramoth
+	icon = 'monkestation/icons/mob/species/tundramoths/bodyparts.dmi'
+	icon_state = "tundra_moth_l_arm"
+	icon_static = 'monkestation/icons/mob/species/tundramoths/bodyparts.dmi'
+	limb_id = SPECIES_TUNDRA
+	should_draw_greyscale = FALSE
+	unarmed_attack_verb = "slash"
+	unarmed_attack_effect = ATTACK_EFFECT_CLAW
+	unarmed_attack_sound = 'sound/weapons/slash.ogg'
+	unarmed_miss_sound = 'sound/weapons/slashmiss.ogg'
+
+/obj/item/bodypart/arm/right/tundramoth
+	icon = 'monkestation/icons/mob/species/tundramoths/bodyparts.dmi'
+	icon_state = "tundra_moth_r_arm"
+	icon_static = 'monkestation/icons/mob/species/tundramoths/bodyparts.dmi'
+	limb_id = SPECIES_TUNDRA
+	should_draw_greyscale = FALSE
+	unarmed_attack_verb = "slash"
+	unarmed_attack_effect = ATTACK_EFFECT_CLAW
+	unarmed_attack_sound = 'sound/weapons/slash.ogg'
+	unarmed_miss_sound = 'sound/weapons/slashmiss.ogg'
+
+/obj/item/bodypart/leg/left/tundramoth
+	icon = 'monkestation/icons/mob/species/tundramoths/bodyparts.dmi'
+	icon_state = "tundra_moth_l_leg"
+	icon_static = 'monkestation/icons/mob/species/tundramoths/bodyparts.dmi'
+	limb_id = SPECIES_TUNDRA
+	should_draw_greyscale = FALSE
+
+/obj/item/bodypart/leg/right/tundramoth
+	icon = 'monkestation/icons/mob/species/tundramoths/bodyparts.dmi'
+	icon_state = "tundra_moth_r_leg"
+	icon_static = 'monkestation/icons/mob/species/tundramoths/bodyparts.dmi'
+	limb_id = SPECIES_TUNDRA
+	should_draw_greyscale = FALSE

monkestation/code/modules/surgery/organs/internal/eyes.dm

@@ -45,3 +45,8 @@
 
 /obj/item/organ/internal/eyes/ethereal
 	eye_icon_state = "etherealeyes"
+
+/obj/item/organ/internal/eyes/moth/tundra
+	name = "tundra moth eyes"
+	eye_icon_state = "tundramotheyes"
+	icon_state = "eyeballs-tundramoth"

tgstation.dme

@@ -7415,6 +7415,8 @@
 #include "monkestation\code\modules\mob\living\carbon\human\species_type\simian.dm"
 #include "monkestation\code\modules\mob\living\carbon\human\species_type\skeletons.dm"
 #include "monkestation\code\modules\mob\living\carbon\human\species_type\teratoma.dm"
+#include "monkestation\code\modules\mob\living\carbon\human\species_type\tundra_moths\mothaccessories.dm"
+#include "monkestation\code\modules\mob\living\carbon\human\species_type\tundra_moths\tundramoths.dm"
 #include "monkestation\code\modules\mob\living\silicon\death.dm"
 #include "monkestation\code\modules\mob\living\simple_animal\megafauna\wendigo.dm"
 #include "monkestation\code\modules\mob\living\simple_animal\pets\bees.dm"