diff --git a/modular_doppler/kahraman_equipment/code/clothing/clothing.dm b/modular_doppler/kahraman_equipment/code/clothing/clothing.dm index 29faaad856cbf..e7ef49310e2cf 100644 --- a/modular_doppler/kahraman_equipment/code/clothing/clothing.dm +++ b/modular_doppler/kahraman_equipment/code/clothing/clothing.dm @@ -8,7 +8,7 @@ icon_state = "jumpsuit" worn_icon = 'modular_doppler/kahraman_equipment/icons/clothes/clothing_worn.dmi' supported_bodyshapes = list(BODYSHAPE_HUMANOID, BODYSHAPE_DIGITIGRADE) - bodyshape_icon_files = list(BODYSHAPE_HUMANOID_T = 'modular_doppler/kahraman_equipment/icons/clothes/clothing.dmi', + bodyshape_icon_files = list(BODYSHAPE_HUMANOID_T = 'modular_doppler/kahraman_equipment/icons/clothes/clothing_worn.dmi', BODYSHAPE_DIGITIGRADE_T = 'modular_doppler/kahraman_equipment/icons/clothes/clothing_worn_digi.dmi') worn_icon_state = "jumpsuit" sensor_mode = SENSOR_COORDS @@ -28,7 +28,7 @@ icon_state = "boots" worn_icon = 'modular_doppler/kahraman_equipment/icons/clothes/clothing_worn.dmi' supported_bodyshapes = list(BODYSHAPE_HUMANOID, BODYSHAPE_DIGITIGRADE) - bodyshape_icon_files = list(BODYSHAPE_HUMANOID_T = 'modular_doppler/kahraman_equipment/icons/clothes/clothing.dmi', + bodyshape_icon_files = list(BODYSHAPE_HUMANOID_T = 'modular_doppler/kahraman_equipment/icons/clothes/clothing_worn.dmi', BODYSHAPE_DIGITIGRADE_T = 'modular_doppler/kahraman_equipment/icons/clothes/clothing_worn_digi.dmi') worn_icon_state = "boots" armor_type = /datum/armor/colonist_clothing @@ -194,7 +194,7 @@ icon_state = "mask" worn_icon = 'modular_doppler/kahraman_equipment/icons/clothes/clothing_worn.dmi' supported_bodyshapes = list(BODYSHAPE_HUMANOID, BODYSHAPE_SNOUTED) - bodyshape_icon_files = list(BODYSHAPE_HUMANOID_T = 'modular_doppler/kahraman_equipment/icons/clothes/clothing.dmi', + bodyshape_icon_files = list(BODYSHAPE_HUMANOID_T = 'modular_doppler/kahraman_equipment/icons/clothes/clothing_worn.dmi', BODYSHAPE_SNOUTED_T = 'modular_doppler/kahraman_equipment/icons/clothes/clothing_worn_digi.dmi') worn_icon_state = "mask" flags_inv = HIDEEYES|HIDEFACE|HIDEFACIALHAIR|HIDESNOUT diff --git a/modular_doppler/modular_species/species_types/anthromorph/anthromorph.dm b/modular_doppler/modular_species/species_types/anthromorph/anthromorph.dm index 3e7db0a24bc55..2cef0bff97097 100644 --- a/modular_doppler/modular_species/species_types/anthromorph/anthromorph.dm +++ b/modular_doppler/modular_species/species_types/anthromorph/anthromorph.dm @@ -5,6 +5,7 @@ name = "\improper Anthromorph" plural_form = "Anthromorphic" id = SPECIES_ANTHROMORPH + preview_outfit = /datum/outfit/anthro_preview inherent_traits = list( TRAIT_MUTANT_COLORS, ) @@ -27,6 +28,25 @@ BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/digitigrade/anthromorph, ) +/datum/outfit/anthro_preview + name = "Anthromorph (Species Preview)" + uniform = /obj/item/clothing/under/rank/security/officer/skirt + +/datum/species/anthromorph/prepare_human_for_preview(mob/living/carbon/human/human_for_preview) + human_for_preview.dna.features["mcolor"] = "#776155" + human_for_preview.dna.features["snout"] = "Fox (Long)" + human_for_preview.dna.features["snout_color_2"] = "#ffffff" + human_for_preview.dna.features["snout_color_3"] = "#776155" + human_for_preview.dna.ear_type = FOX + human_for_preview.dna.features["ears"] = "Fox" + human_for_preview.dna.features["ears_color_1"] = "#776155" + human_for_preview.dna.features["ears_color_2"] = "#ffffff" + human_for_preview.set_haircolor("#574036", update = FALSE) + human_for_preview.set_hairstyle("Stacy Bun", update = TRUE) + human_for_preview.eye_color_left = "#C4F87A" + human_for_preview.eye_color_right = "#C4F87A" + regenerate_organs(human_for_preview) + human_for_preview.update_body(is_creating = TRUE) /datum/species/anthromorph/get_species_description() return "Nothing yet." diff --git a/modular_doppler/modular_species/species_types/aquatic/aquatic.dm b/modular_doppler/modular_species/species_types/aquatic/aquatic.dm index 2612b486eb749..26b5deb954346 100644 --- a/modular_doppler/modular_species/species_types/aquatic/aquatic.dm +++ b/modular_doppler/modular_species/species_types/aquatic/aquatic.dm @@ -5,6 +5,7 @@ name = "\improper Aquatic" plural_form = "Aquatic" id = SPECIES_AQUATIC + preview_outfit = /datum/outfit/aquatic_preview inherent_traits = list( TRAIT_MUTANT_COLORS, ) @@ -27,6 +28,28 @@ BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/digitigrade/aquatic, ) +/datum/outfit/aquatic_preview + name = "Aquatic (Species Preview)" + uniform = /obj/item/clothing/under/syndicate/skirt + head = /obj/item/clothing/head/hats/hos/beret/syndicate + +/datum/species/aquatic/prepare_human_for_preview(mob/living/carbon/human/human_for_preview) + human_for_preview.dna.features["lizard_markings"] = "Aquatic Pattern" + human_for_preview.dna.features["body_markings_color_1"] = "#ffffff" + human_for_preview.dna.features["mcolor"] = "#C2756A" + human_for_preview.dna.features["snout"] = "Shark" + human_for_preview.dna.features["snout_color_1"] = "#ffffff" + human_for_preview.dna.features["snout_color_2"] = "#c2756a" + human_for_preview.dna.ear_type = FISH + human_for_preview.dna.features["ears"] = "Shark" + human_for_preview.dna.features["ears_color_1"] = "#C2756A" + human_for_preview.dna.features["ears_color_2"] = "#FCB39F" + human_for_preview.set_haircolor("#221711", update = FALSE) + human_for_preview.set_hairstyle("Blunt Bangs", update = TRUE) + human_for_preview.eye_color_left = "#77B077" + human_for_preview.eye_color_right = "#77B077" + regenerate_organs(human_for_preview) + human_for_preview.update_body(is_creating = TRUE) /datum/species/aquatic/get_species_description() return "Nothing yet." diff --git a/modular_doppler/modular_species/species_types/ethereal/ethereal.dm b/modular_doppler/modular_species/species_types/ethereal/ethereal.dm new file mode 100644 index 0000000000000..9157df9f83d54 --- /dev/null +++ b/modular_doppler/modular_species/species_types/ethereal/ethereal.dm @@ -0,0 +1,14 @@ +/datum/species/ethereal + preview_outfit = /datum/outfit/ethereal_preview + +/datum/outfit/ethereal_preview + name = "Ethereal (Species Preview)" + uniform = /obj/item/clothing/under/frontier_colonist + head = /obj/item/clothing/head/soft/frontier_colonist + +/datum/species/ethereal/prepare_human_for_preview(mob/living/carbon/human/human_for_preview) + human_for_preview.dna.features["ethcolor"] = GLOB.color_list_ethereal["Green"] + refresh_light_color(human_for_preview) + human_for_preview.set_hairstyle("Lila", update = TRUE) + regenerate_organs(human_for_preview) + human_for_preview.update_body(is_creating = TRUE) diff --git a/modular_doppler/modular_species/species_types/golem/golem.dm b/modular_doppler/modular_species/species_types/golem/golem.dm index 863a2d6fcba10..b1f64f05adb04 100644 --- a/modular_doppler/modular_species/species_types/golem/golem.dm +++ b/modular_doppler/modular_species/species_types/golem/golem.dm @@ -1,6 +1,7 @@ //// Doppler Golems - Overwrites and continuiations of // code/modules/mob/living/carbon/human/species_types/golems.dm /datum/species/golem + preview_outfit = /datum/outfit/golem_preview inherent_traits = list( TRAIT_GENELESS, TRAIT_LAVA_IMMUNE, @@ -26,6 +27,10 @@ no_equip_flags = ITEM_SLOT_MASK | ITEM_SLOT_OCLOTHING | ITEM_SLOT_FEET | ITEM_SLOT_ICLOTHING | ITEM_SLOT_SUITSTORE changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN //golem ERT +/datum/outfit/golem_preview + name = "Golem (Species Preview)" + head = /obj/item/food/grown/poppy/geranium/fraxinella + /datum/species/golem/get_species_lore() return list( "@Lobster", diff --git a/modular_doppler/modular_species/species_types/insectoid/insectoid.dm b/modular_doppler/modular_species/species_types/insectoid/insectoid.dm index b17620ad4d014..a7b36b3d2b590 100644 --- a/modular_doppler/modular_species/species_types/insectoid/insectoid.dm +++ b/modular_doppler/modular_species/species_types/insectoid/insectoid.dm @@ -5,6 +5,7 @@ name = "\improper Insectoid" plural_form = "Insectoid" id = SPECIES_INSECTOID + preview_outfit = /datum/outfit/insect_preview inherent_traits = list( TRAIT_MUTANT_COLORS, ) @@ -29,6 +30,24 @@ BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/digitigrade/insectoid, ) +/datum/outfit/insect_preview + name = "Insectoid (Species Preview)" + uniform = /obj/item/clothing/under/rank/cargo/miner/lavaland + +/datum/species/insectoid/prepare_human_for_preview(mob/living/carbon/human/human_for_preview) + human_for_preview.dna.features["lizard_markings"] = "Insectoid Pattern" + human_for_preview.dna.features["body_markings_color_1"] = "#46c346" + human_for_preview.dna.features["body_markings_color_2"] = "#1c1c1c" + human_for_preview.dna.features["mcolor"] = "#383942" + human_for_preview.dna.features["fluff"] = "Insect Fluff" + human_for_preview.dna.features["fluff_color_1"] = "#dae7f7" + human_for_preview.dna.ear_type = BUG + human_for_preview.dna.features["ears"] = "Straight" + human_for_preview.dna.features["ears_color_1"] = "#ffffff" + human_for_preview.eye_color_left = "#46C346" + human_for_preview.eye_color_right = "#46C346" + regenerate_organs(human_for_preview) + human_for_preview.update_body(is_creating = TRUE) /datum/species/insectoid/get_species_description() return "Nothing yet." diff --git a/modular_doppler/modular_species/species_types/lizardpeople/lizardpeople.dm b/modular_doppler/modular_species/species_types/lizardpeople/lizardpeople.dm new file mode 100644 index 0000000000000..5e6bab9c58a01 --- /dev/null +++ b/modular_doppler/modular_species/species_types/lizardpeople/lizardpeople.dm @@ -0,0 +1,15 @@ +/datum/species/lizard + preview_outfit = /datum/outfit/lizard_preview + +/datum/outfit/lizard_preview + name = "Lizardperson (Species Preview)" + head = /obj/item/clothing/head/beret/doppler_command/medical + neck = /obj/item/clothing/neck/doppler_mantle/medical + +/datum/species/lizard/prepare_human_for_preview(mob/living/carbon/human/lizard_for_preview) + lizard_for_preview.dna.features["mcolor"] = "#4A81A1" + lizard_for_preview.dna.features["frills"] = "Short" + lizard_for_preview.dna.features["frills_color_1"] = "#4a81a1" + lizard_for_preview.dna.features["frills_color_2"] = "#c6c7d3" + regenerate_organs(lizard_for_preview) + lizard_for_preview.update_body(is_creating = TRUE) diff --git a/modular_doppler/modular_species/species_types/mothmen/mothmen.dm b/modular_doppler/modular_species/species_types/mothmen/mothmen.dm new file mode 100644 index 0000000000000..5386fab58c448 --- /dev/null +++ b/modular_doppler/modular_species/species_types/mothmen/mothmen.dm @@ -0,0 +1,18 @@ +/datum/species/moth + preview_outfit = /datum/outfit/moth_preview + +/datum/outfit/moth_preview + name = "Moth (Species Preview)" + head = /obj/item/clothing/head/costume/garland/poppy + suit = /obj/item/clothing/suit/hooded/wintercoat/hydro + uniform = /obj/item/clothing/under/rank/civilian/hydroponics/skirt + +/datum/species/moth/prepare_human_for_preview(mob/living/carbon/human/moth_for_preview) + moth_for_preview.dna.wing_type = "Moth Wings" + moth_for_preview.dna.features["moth_wings"] = "Royal" + moth_for_preview.dna.features["moth_antennae"] = "Royal" + moth_for_preview.dna.features["moth_markings"] = "Royal" + moth_for_preview.set_haircolor("#CCECFF", update = FALSE) + moth_for_preview.set_hairstyle("Cotton (Alt)", update = TRUE) + regenerate_organs(moth_for_preview) + moth_for_preview.update_body(is_creating = TRUE) diff --git a/modular_doppler/modular_species/species_types/plasmamen/plasmamen.dm b/modular_doppler/modular_species/species_types/plasmamen/plasmamen.dm new file mode 100644 index 0000000000000..f396429e367f2 --- /dev/null +++ b/modular_doppler/modular_species/species_types/plasmamen/plasmamen.dm @@ -0,0 +1,7 @@ +/datum/species/plasmaman + preview_outfit = /datum/outfit/plasmaman_preview + +/datum/outfit/plasmaman_preview + name = "Plasmaman (Species Preview)" + uniform = /obj/item/clothing/under/plasmaman + head = /obj/item/clothing/head/helmet/space/plasmaman diff --git a/modular_doppler/modular_species/species_types/primitive_demihuman/primitive_demihuman.dm b/modular_doppler/modular_species/species_types/primitive_demihuman/primitive_demihuman.dm index b4c8d68125980..cd8d8faf05283 100644 --- a/modular_doppler/modular_species/species_types/primitive_demihuman/primitive_demihuman.dm +++ b/modular_doppler/modular_species/species_types/primitive_demihuman/primitive_demihuman.dm @@ -15,6 +15,7 @@ /datum/species/human/felinid/primitive name = "Primitive Demihuman" id = SPECIES_FELINE_PRIMITIVE + preview_outfit = /datum/outfit/demihuman_preview mutantlungs = /obj/item/organ/internal/lungs/icebox_adapted mutanteyes = /obj/item/organ/internal/eyes/low_light_adapted @@ -35,6 +36,12 @@ TRAIT_USES_SKINTONES, ) +/datum/outfit/demihuman_preview + name = "Demihuman (Species Preview)" + uniform = /obj/item/clothing/under/dress/skirt/primitive_catgirl_body_wraps + neck = /obj/item/clothing/neck/scarf/primitive_catgirl_scarf + back = /obj/item/forging/reagent_weapon/axe/fake_copper + /datum/species/human/felinid/primitive/on_species_gain(mob/living/carbon/new_primitive, datum/species/old_species, pref_load) . = ..() var/mob/living/carbon/human/hearthkin = new_primitive @@ -65,16 +72,6 @@ human_for_preview.set_hairstyle("Fluffy long", update = TRUE) human_for_preview.skin_tone = "albino" regenerate_organs(human_for_preview) - - var/obj/item/organ/internal/ears/cat/cat_ears = human_for_preview.get_organ_by_type(/obj/item/organ/internal/ears/cat) - var/obj/item/organ/external/tail/cat/cat_tail = human_for_preview.get_organ_by_type(/obj/item/organ/external/tail/cat) - if (cat_ears) - cat_ears.color = human_for_preview.hair_color - if (cat_tail) - cat_tail.color = human_for_preview.hair_color - if (cat_ears || cat_tail) - human_for_preview.update_body() - human_for_preview.update_body(is_creating = TRUE) /datum/species/human/felinid/primitive/get_species_description() diff --git a/modular_doppler/modular_species/species_types/slugcats/slugcat.dm b/modular_doppler/modular_species/species_types/slugcats/slugcat.dm index 0f1d2ad04c434..843ab3079c92c 100644 --- a/modular_doppler/modular_species/species_types/slugcats/slugcat.dm +++ b/modular_doppler/modular_species/species_types/slugcats/slugcat.dm @@ -15,6 +15,7 @@ name = "\improper Slugcat" plural_form = "Slugcats" id = SPECIES_SLUGCAT + preview_outfit = /datum/outfit/scug_preview inherent_traits = list( TRAIT_MUTANT_COLORS, TRAIT_TACKLING_TAILED_DEFENDER, @@ -47,6 +48,29 @@ BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/digitigrade/slugcat, ) +/datum/outfit/scug_preview + name = "Slugcat (Species Preview)" + head = /obj/item/clothing/head/beret/doppler_command/science + neck = /obj/item/clothing/neck/doppler_mantle/science + +/datum/species/slugcat/prepare_human_for_preview(mob/living/carbon/human/scug_for_preview) + scug_for_preview.dna.features["lizard_markings"] = "Slugcat Underbelly" + scug_for_preview.dna.features["body_markings_color_1"] = "#ccecff" + scug_for_preview.dna.features["mcolor"] = "#FFFFFF" + scug_for_preview.dna.features["frills"] = "Slugcat" + scug_for_preview.dna.features["frills_color_1"] = "#ccecff" + scug_for_preview.dna.features["snout"] = "Slugcat" + scug_for_preview.dna.features["snout_color_1"] = "#ffffff" + scug_for_preview.dna.features["snout_color_2"] = "#dddddd" + scug_for_preview.dna.features["snout_color_3"] = "#9a9b9e" + scug_for_preview.dna.features["horns"] = "Slugcat" + scug_for_preview.dna.features["horns_color_1"] = "#ffffff" + scug_for_preview.dna.features["horns_color_2"] = "#dddddd" + scug_for_preview.eye_color_left = "#CCECFF" + scug_for_preview.eye_color_right = "#CCECFF" + regenerate_organs(scug_for_preview) + scug_for_preview.update_body(is_creating = TRUE) + /// SOUNDS BREAKER /datum/species/slugcat/get_scream_sound(mob/living/carbon/human/scug) return pick( diff --git a/tgstation.dme b/tgstation.dme index 883d00980663d..5a02a606638b5 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6709,10 +6709,14 @@ #include "modular_doppler\modular_species\species_types\anthromorph\anthromorph_bodyparts.dm" #include "modular_doppler\modular_species\species_types\aquatic\aquatic.dm" #include "modular_doppler\modular_species\species_types\aquatic\aquatic_bodyparts.dm" +#include "modular_doppler\modular_species\species_types\ethereal\ethereal.dm" #include "modular_doppler\modular_species\species_types\golem\golem.dm" #include "modular_doppler\modular_species\species_types\insectoid\insectoid.dm" #include "modular_doppler\modular_species\species_types\insectoid\insectoid_bodyparts.dm" +#include "modular_doppler\modular_species\species_types\lizardpeople\lizardpeople.dm" #include "modular_doppler\modular_species\species_types\monkey\monkeys.dm" +#include "modular_doppler\modular_species\species_types\mothmen\mothmen.dm" +#include "modular_doppler\modular_species\species_types\plasmamen\plasmamen.dm" #include "modular_doppler\modular_species\species_types\primitive_demihuman\primitive_demihuman.dm" #include "modular_doppler\modular_species\species_types\slugcats\slugcat.dm" #include "modular_doppler\modular_species\species_types\slugcats\slugcat_bodyparts.dm"