diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_aquatic.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_aquatic.png index 42617894672..dd035eb1236 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_aquatic.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_aquatic.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_hemophage.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_hemophage.png index a10ac2d72ef..bd60070bdfb 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_hemophage.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_hemophage.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_felinid_primitive.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_felinid_primitive.png index c5e4fa2d14d..8e9046285be 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_felinid_primitive.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_felinid_primitive.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_lizard_ashwalker.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_lizard_ashwalker.png index 6fa25ad9159..e7c9e401678 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_lizard_ashwalker.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_lizard_ashwalker.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_lizard_silverscale.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_lizard_silverscale.png index 78c2cd7d1dc..a032bc16fe8 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_lizard_silverscale.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_lizard_silverscale.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_pod.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_pod.png index 82f06aabc25..11eefe1794b 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_pod.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_pod.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_pod_podweak.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_pod_podweak.png index 82f06aabc25..11eefe1794b 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_pod_podweak.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_pod_podweak.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_shadekin.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_shadekin.png index 042884e8d57..ee2b815cac8 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_shadekin.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_shadekin.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_skrell.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_skrell.png index 80748226faa..41f08e5656d 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_skrell.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_skrell.png differ diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/aquatic.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/aquatic.dm index 89c955a08fb..833ea22dbe7 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/aquatic.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/aquatic.dm @@ -1,5 +1,5 @@ /datum/species/aquatic - name = "Akula (Generic)" + name = "Aquatic" id = SPECIES_AQUATIC inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, @@ -68,6 +68,18 @@ features["mcolor3"] = second_color return features +/datum/species/aquatic/prepare_human_for_preview(mob/living/carbon/human/aquatic) + var/main_color = "#1CD3E5" + var/secondary_color = "#6AF1D6" + var/tertiary_color = "#CCF6E2" + aquatic.dna.features["mcolor"] = main_color + aquatic.dna.features["mcolor2"] = secondary_color + aquatic.dna.features["mcolor3"] = tertiary_color + aquatic.dna.mutant_bodyparts["tail"] = list(MUTANT_INDEX_NAME = "Akula", MUTANT_INDEX_COLOR_LIST = list(main_color, secondary_color, tertiary_color)) + aquatic.dna.features["legs"] = "Normal Legs" + regenerate_organs(aquatic, src, visual_only = TRUE) + aquatic.update_body(TRUE) + /datum/species/aquatic/get_random_body_markings(list/passed_features) var/name = "Shark" var/datum/body_marking_set/BMS = GLOB.body_marking_sets[name] diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_species.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_species.dm index 616e298f83d..2313f79957e 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_species.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_species.dm @@ -103,13 +103,13 @@ /datum/species/hemophage/prepare_human_for_preview(mob/living/carbon/human/human) - human.skin_tone = "albino" + human.dna.features["mcolor"] = "#fff4e6" + human.set_eye_color(COLOR_RED) human.hair_color = "#1d1d1d" - human.hairstyle = "Pompadour (Big)" + human.hairstyle = "Royal Curls" regenerate_organs(human, src, visual_only = TRUE) human.update_body(TRUE) - /datum/species/hemophage/create_pref_unique_perks() var/list/to_add = list() diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/insect.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/insect.dm index 8cc6243658a..74d877c38dd 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/insect.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/insect.dm @@ -1,5 +1,5 @@ /datum/species/insect - name = "Anthromorphic Insect" + name = "Insectoid" id = SPECIES_INSECT inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/podweak.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/podweak.dm index 6e4615f99a5..b2f84094240 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/podweak.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/podweak.dm @@ -51,7 +51,7 @@ /datum/species/pod/prepare_human_for_preview(mob/living/carbon/human/human) - human.dna.mutant_bodyparts["pod_hair"] = list(MUTANT_INDEX_NAME = "Ivy", MUTANT_INDEX_COLOR_LIST = list(COLOR_VIBRANT_LIME, COLOR_VIBRANT_LIME, COLOR_VIBRANT_LIME)) + human.dna.features["mcolor"] = COLOR_OLIVE_GREEN + human.dna.mutant_bodyparts["pod_hair"] = list(MUTANT_INDEX_NAME = "Ivy", MUTANT_INDEX_COLOR_LIST = list("#9E4141")) regenerate_organs(human, src, visual_only = TRUE) - human.update_body(TRUE) - + human.update_body(is_creating = TRUE) diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm index 6e451078183..9b48c815950 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm @@ -54,6 +54,13 @@ return perk_descriptions +/datum/species/jelly/roundstartslime/prepare_human_for_preview(mob/living/carbon/human/slime) + slime.dna.features["mcolor"] = "#AA07DE" + regenerate_organs(slime, src, visual_only = TRUE) + slime.hairstyle = "Bob Hair 2" + slime.hair_color = COLOR_PINK + slime.update_body(is_creating = TRUE) + /datum/species/jelly/roundstartslime/apply_supplementary_body_changes(mob/living/carbon/human/target, datum/preferences/preferences, visuals_only = FALSE) if(preferences.read_preference(/datum/preference/toggle/allow_mismatched_hair_color)) target.dna.species.hair_color_mode = null diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/skrell.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/skrell.dm index 3c4ac27721d..e4622bde0e0 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/skrell.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/skrell.dm @@ -72,7 +72,7 @@ skrell.dna.features["mcolor"] = skrell_color skrell.dna.features["mcolor2"] = skrell_color skrell.dna.features["mcolor3"] = skrell_color - skrell.dna.mutant_bodyparts["skrell_hair"] = list(MUTANT_INDEX_NAME = "Female", MUTANT_INDEX_COLOR_LIST = list(skrell_color, skrell_color, skrell_color)) + skrell.dna.mutant_bodyparts["skrell_hair"] = list(MUTANT_INDEX_NAME = "Female (Long)", MUTANT_INDEX_COLOR_LIST = list(skrell_color, skrell_color, skrell_color)) regenerate_organs(skrell, src, visual_only = TRUE) skrell.update_body(TRUE) diff --git a/modular_skyrat/modules/primitive_catgirls/code/species.dm b/modular_skyrat/modules/primitive_catgirls/code/species.dm index 51052eed19f..99b73e2ef2c 100644 --- a/modular_skyrat/modules/primitive_catgirls/code/species.dm +++ b/modular_skyrat/modules/primitive_catgirls/code/species.dm @@ -13,7 +13,7 @@ selected_language = /datum/language/primitive_catgirl /datum/species/human/felinid/primitive - name = "Primitive Demihuman" + name = "Hearthkin" id = SPECIES_FELINE_PRIMITIVE mutantlungs = /obj/item/organ/lungs/icebox_adapted @@ -55,15 +55,15 @@ hearthkin.dna.remove_mutation(/datum/mutation/olfaction, MUTATION_SOURCE_SPECIES) /datum/species/human/felinid/primitive/prepare_human_for_preview(mob/living/carbon/human/human_for_preview) - human_for_preview.hairstyle = "Blunt Bangs Alt" - human_for_preview.hair_color = "#323442" - human_for_preview.skin_tone = "mediterranean" - - human_for_preview.update_body_parts() + human_for_preview.hairstyle = "Slightly Messy" + human_for_preview.hair_color = "#954535" + human_for_preview.skin_tone = "albino" + human_for_preview.set_eye_color("#6ca580") human_for_preview.dna.species.mutant_bodyparts["tail"] = list(MUTANT_INDEX_NAME = "Cat", MUTANT_INDEX_COLOR_LIST = list(human_for_preview.hair_color)) - human_for_preview.dna.species.mutant_bodyparts["ears"] = list(MUTANT_INDEX_NAME = "Cat", MUTANT_INDEX_COLOR_LIST = list(human_for_preview.hair_color)) + human_for_preview.dna.mutant_bodyparts["ears"] = list(MUTANT_INDEX_NAME = "Lynx", MUTANT_INDEX_COLOR_LIST = list(human_for_preview.hair_color)) + regenerate_organs(human_for_preview, src, visual_only = TRUE) human_for_preview.update_body_parts() human_for_preview.update_body(is_creating = TRUE) diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index c197509c7f3..abf7c99ba8c 100644 --- a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -29,3 +29,16 @@ They generally grow higher than humans, being six to seven feet tall on average, and tend to grow tall before they grow wide. \ This means younger Tizirans are typically thinner than their human counterparts, and stop growing later in life." ) + +/datum/species/lizard/prepare_human_for_preview(mob/living/carbon/human/lizard, lizard_color = "#FFA756") + lizard.dna.features["mcolor"] = lizard_color + lizard.dna.features["mcolor2"] = "#DE893A" + lizard.dna.features["mcolor3"] = "#DE893A" + lizard.dna.mutant_bodyparts["tail"] = list(MUTANT_INDEX_NAME = "Light Tiger", MUTANT_INDEX_COLOR_LIST = list(lizard_color, "#DE893A", "#DE893A")) + lizard.dna.mutant_bodyparts["snout"] = list(MUTANT_INDEX_NAME = "Sharp + Light", MUTANT_INDEX_COLOR_LIST = list(lizard_color, "#DE893A", "#DE893A")) + lizard.dna.mutant_bodyparts["horns"] = list(MUTANT_INDEX_NAME = "Drake", MUTANT_INDEX_COLOR_LIST = list(lizard_color, "#DE893A", "#DE893A")) + lizard.dna.mutant_bodyparts["frills"] = list(MUTANT_INDEX_NAME = "Neck Frills (New)", MUTANT_INDEX_COLOR_LIST = list(lizard_color, "#DE893A", "#DE893A")) + lizard.dna.features["legs"] = "Normal Legs" + lizard.set_facial_hairstyle("Lizard Tongue Flick") + regenerate_organs(lizard, src, visual_only = TRUE) + lizard.update_body(TRUE) diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/shadekin.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/shadekin.dm index 2076f430ee9..29f4736ef64 100644 --- a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/shadekin.dm +++ b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/shadekin.dm @@ -96,8 +96,7 @@ shadekin.dna.mutant_bodyparts["ears"] = list(MUTANT_INDEX_NAME = "Shadekin", MUTANT_INDEX_COLOR_LIST = list(main_color, secondary_color, tertiary_color)) shadekin.dna.mutant_bodyparts["snout"] = list(MUTANT_INDEX_NAME = "None", MUTANT_INDEX_COLOR_LIST = list(main_color, secondary_color, tertiary_color)) shadekin.dna.mutant_bodyparts["tail"] = list(MUTANT_INDEX_NAME = "Shadekin", MUTANT_INDEX_COLOR_LIST = list(main_color, secondary_color, tertiary_color)) - shadekin.eye_color_left = "#c4c400" - shadekin.eye_color_right = "#c4c400" + shadekin.set_eye_color("#5ec7e4") regenerate_organs(shadekin, src, visual_only = TRUE) shadekin.update_body(TRUE)