From c11596d7005f69d8d5225b3a6115cc090371c908 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 11 May 2022 02:37:57 +0200 Subject: [PATCH] [MIRROR] Fixes mulligan not randomizing ethereal color, removes default_color for every race except ethereals [MDB IGNORE] (#13492) * Fixes mulligan not randomizing ethereal color, removes default_color for every race except ethereals * Fixing a merge conflict * f * e Co-authored-by: wesoda25 <37246588+wesoda25@users.noreply.github.com> Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com> --- code/modules/admin/create_mob.dm | 71 +++++++++---------- .../mob/living/carbon/human/species.dm | 2 - .../carbon/human/species_types/dullahan.dm | 1 - .../carbon/human/species_types/ethereal.dm | 15 ++-- .../carbon/human/species_types/humans.dm | 1 - .../carbon/human/species_types/jellypeople.dm | 2 - .../human/species_types/lizardpeople.dm | 1 - .../carbon/human/species_types/mothmen.dm | 1 - .../carbon/human/species_types/podpeople.dm | 1 - .../carbon/human/species_types/snail.dm | 1 - .../carbon/human/species_types/vampire.dm | 1 - .../chemistry/reagents/other_reagents.dm | 2 +- .../mob/living/carbon/human/species/akula.dm | 1 - .../living/carbon/human/species/aquatic.dm | 1 - .../mob/living/carbon/human/species/dwarf.dm | 1 - .../mob/living/carbon/human/species/ghoul.dm | 2 - .../living/carbon/human/species/hemophage.dm | 1 - .../living/carbon/human/species/humanoid.dm | 1 - .../mob/living/carbon/human/species/insect.dm | 1 - .../mob/living/carbon/human/species/mammal.dm | 1 - .../carbon/human/species/robotic/_robotic.dm | 1 - .../human/species/robotic/synthetic_mammal.dm | 1 - .../carbon/human/species/roundstartslime.dm | 1 - .../mob/living/carbon/human/species/skrell.dm | 1 - .../living/carbon/human/species/tajaran.dm | 1 - .../mob/living/carbon/human/species/unathi.dm | 1 - .../mob/living/carbon/human/species/vox.dm | 1 - .../living/carbon/human/species/vulpkanin.dm | 1 - .../mob/living/carbon/human/species/xeno.dm | 1 - .../modules/mutants/code/mutant_species.dm | 1 - .../modules/teshari/code/_teshari.dm | 1 - 31 files changed, 46 insertions(+), 73 deletions(-) diff --git a/code/modules/admin/create_mob.dm b/code/modules/admin/create_mob.dm index e14bfb2bf67..75b906f12b9 100644 --- a/code/modules/admin/create_mob.dm +++ b/code/modules/admin/create_mob.dm @@ -10,46 +10,45 @@ user << browse(create_panel_helper(create_mob_html), "window=create_mob;size=425x475") -/proc/randomize_human(mob/living/carbon/human/H) - H.gender = pick(MALE, FEMALE) - H.physique = H.gender - H.real_name = random_unique_name(H.gender) - H.name = H.real_name - H.underwear = random_underwear(H.gender) - H.underwear_color = "#[random_color()]" - H.skin_tone = random_skin_tone() - H.hairstyle = random_hairstyle(H.gender) - H.facial_hairstyle = random_facial_hairstyle(H.gender) - H.hair_color = "#[random_color()]" - H.facial_hair_color = H.hair_color +/proc/randomize_human(mob/living/carbon/human/human) + human.gender = pick(MALE, FEMALE) + human.physique = human.gender + human.real_name = random_unique_name(human.gender) + human.name = human.real_name + human.underwear = random_underwear(human.gender) + human.underwear_color = "#[random_color()]" + human.skin_tone = random_skin_tone() + human.hairstyle = random_hairstyle(human.gender) + human.facial_hairstyle = random_facial_hairstyle(human.gender) + human.hair_color = "#[random_color()]" + human.facial_hair_color = human.hair_color var/random_eye_color = random_eye_color() - H.eye_color_left = random_eye_color - H.eye_color_right = random_eye_color - H.dna.blood_type = random_blood_type() + human.eye_color_left = random_eye_color + human.eye_color_right = random_eye_color + human.dna.blood_type = random_blood_type() // Mutant randomizing, doesn't affect the mob appearance unless it's the specific mutant. - //SKYRAT EDIT REMOVAL BEGIN - CUSTOMIZATION - /* - H.dna.features["mcolor"] = "#[random_color()]" - H.dna.features["ethcolor"] = GLOB.color_list_ethereal[pick(GLOB.color_list_ethereal)] - H.dna.features["tail_lizard"] = pick(GLOB.tails_list_lizard) - H.dna.features["snout"] = pick(GLOB.snouts_list) - H.dna.features["horns"] = pick(GLOB.horns_list) - H.dna.features["frills"] = pick(GLOB.frills_list) - H.dna.features["spines"] = pick(GLOB.spines_list) - H.dna.features["body_markings"] = pick(GLOB.body_markings_list) - H.dna.features["moth_wings"] = pick(GLOB.moth_wings_list) - H.dna.features["moth_antennae"] = pick(GLOB.moth_antennae_list) + /* SKYRAT EDIT REMOVAL + human.dna.features["mcolor"] = "#[random_color()]" + human.dna.features["ethcolor"] = GLOB.color_list_ethereal[pick(GLOB.color_list_ethereal)] + human.dna.features["tail_lizard"] = pick(GLOB.tails_list_lizard) + human.dna.features["snout"] = pick(GLOB.snouts_list) + human.dna.features["horns"] = pick(GLOB.horns_list) + human.dna.features["frills"] = pick(GLOB.frills_list) + human.dna.features["spines"] = pick(GLOB.spines_list) + human.dna.features["body_markings"] = pick(GLOB.body_markings_list) + human.dna.features["moth_wings"] = pick(GLOB.moth_wings_list) + human.dna.features["moth_antennae"] = pick(GLOB.moth_antennae_list) + human.dna.features["pod_hair"] = pick(GLOB.pod_hair_list) */ - //SKYRAT EDIT REMOVAL END //SKYRAT EDIT ADDITION BEGIN - CUSTOMIZATION - H.dna.features = H.dna.species.get_random_features() - H.dna.mutant_bodyparts = H.dna.species.get_random_mutant_bodyparts(H.dna.features) - H.dna.body_markings = H.dna.species.get_random_body_markings(H.dna.features) - H.dna.species.mutant_bodyparts = H.dna.mutant_bodyparts.Copy() - H.dna.species.body_markings = H.dna.body_markings.Copy() + human.dna.features = human.dna.species.get_random_features() + human.dna.mutant_bodyparts = human.dna.species.get_random_mutant_bodyparts(human.dna.features) + human.dna.body_markings = human.dna.species.get_random_body_markings(human.dna.features) + human.dna.species.mutant_bodyparts = human.dna.mutant_bodyparts.Copy() + human.dna.species.body_markings = human.dna.body_markings.Copy() //SKYRAT EDIT ADDITION END - H.dna.features["pod_hair"] = pick(GLOB.pod_hair_list) - H.update_body(is_creating = TRUE) - H.update_hair(is_creating = TRUE) + human.update_body(is_creating = TRUE) + human.update_hair(is_creating = TRUE) + human.dna.species.spec_updatehealth(human) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 1fbb0110efb..3a74e1c133b 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -20,8 +20,6 @@ GLOBAL_LIST_EMPTY(features_by_species) /// The formatting of the name of the species in plural context. Defaults to "[name]\s" if unset. /// Ex "[Plasmamen] are weak", "[Mothmen] are strong", "[Lizardpeople] don't like", "[Golems] hate" var/plural_form - // Default color. If mutant colors are disabled, this is the color that will be used by that race. - var/default_color = "#FFFFFF" ///Whether or not the race has sexual characteristics (biological genders). At the moment this is only FALSE for skeletons and shadows var/sexes = TRUE diff --git a/code/modules/mob/living/carbon/human/species_types/dullahan.dm b/code/modules/mob/living/carbon/human/species_types/dullahan.dm index 2004b5c4675..c8600e3ec7b 100644 --- a/code/modules/mob/living/carbon/human/species_types/dullahan.dm +++ b/code/modules/mob/living/carbon/human/species_types/dullahan.dm @@ -1,7 +1,6 @@ /datum/species/dullahan name = "Dullahan" id = SPECIES_DULLAHAN - default_color = "FFFFFF" species_traits = list(EYECOLOR, HAIR, FACEHAIR, LIPS, HAS_FLESH, HAS_BONE) inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, diff --git a/code/modules/mob/living/carbon/human/species_types/ethereal.dm b/code/modules/mob/living/carbon/human/species_types/ethereal.dm index 0e4176a5266..d3e1398d897 100644 --- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm +++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm @@ -48,6 +48,7 @@ var/static/g2 = 164 var/static/b2 = 149 var/obj/effect/dummy/lighting_obj/ethereal_light + var/default_color @@ -99,13 +100,17 @@ return randname -/datum/species/ethereal/spec_updatehealth(mob/living/carbon/human/H) +/datum/species/ethereal/spec_updatehealth(mob/living/carbon/human/ethereal) . = ..() if(!ethereal_light) return - - if(H.stat != DEAD && !EMPeffect) - var/healthpercent = max(H.health, 0) / 100 + if(default_color != ethereal.dna.features["ethcolor"]) + var/new_color = ethereal.dna.features["ethcolor"] + r1 = GETREDPART(new_color) + g1 = GETGREENPART(new_color) + b1 = GETBLUEPART(new_color) + if(ethereal.stat != DEAD && !EMPeffect) + var/healthpercent = max(ethereal.health, 0) / 100 if(!emageffect) current_color = rgb(r2 + ((r1-r2)*healthpercent), g2 + ((g1-g2)*healthpercent), b2 + ((b1-b2)*healthpercent)) ethereal_light.set_light_range_power_color(1 + (2 * healthpercent), 1 + (1 * healthpercent), current_color) @@ -114,7 +119,7 @@ else ethereal_light.set_light_on(FALSE) fixed_mut_color = rgb(128,128,128) - H.update_body(is_creating = TRUE) + ethereal.update_body(is_creating = TRUE) /datum/species/ethereal/proc/on_emp_act(mob/living/carbon/human/H, severity) SIGNAL_HANDLER diff --git a/code/modules/mob/living/carbon/human/species_types/humans.dm b/code/modules/mob/living/carbon/human/species_types/humans.dm index 85f66b89c6f..060b948c0e4 100644 --- a/code/modules/mob/living/carbon/human/species_types/humans.dm +++ b/code/modules/mob/living/carbon/human/species_types/humans.dm @@ -1,7 +1,6 @@ /datum/species/human name = "\improper Human" id = SPECIES_HUMAN - default_color = "FFFFFF" species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,HAS_FLESH,HAS_BONE) inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index b41a9349c9c..dc5f7b133ba 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -3,7 +3,6 @@ name = "\improper Jellyperson" plural_form = "Jellypeople" id = SPECIES_JELLYPERSON - default_color = "00FF90" say_mod = "chirps" species_traits = list(MUTCOLORS,EYECOLOR,NOBLOOD) inherent_traits = list( @@ -159,7 +158,6 @@ name = "\improper Slimeperson" plural_form = "Slimepeople" id = SPECIES_SLIMEPERSON - default_color = "00FFFF" species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,NOBLOOD) hair_color = "mutcolor" hair_alpha = 150 diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index 3695c5e9640..5d0b1a28258 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -4,7 +4,6 @@ plural_form = "Lizardfolk" id = SPECIES_LIZARD say_mod = "hisses" - default_color = COLOR_VIBRANT_LIME species_traits = list(MUTCOLORS, EYECOLOR, LIPS, HAS_FLESH, HAS_BONE) inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, diff --git a/code/modules/mob/living/carbon/human/species_types/mothmen.dm b/code/modules/mob/living/carbon/human/species_types/mothmen.dm index abb1fb4e85c..90146c724c5 100644 --- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm +++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm @@ -3,7 +3,6 @@ plural_form = "Mothmen" id = SPECIES_MOTH say_mod = "flutters" - default_color = "00FF00" species_traits = list(LIPS, HAS_FLESH, HAS_BONE, HAS_MARKINGS, TRAIT_ANTENNAE) inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm index 3e7bf1a6e32..0f04d63a1fb 100644 --- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm @@ -3,7 +3,6 @@ name = "\improper Podperson" plural_form = "Podpeople" id = SPECIES_PODPERSON - default_color = "59CE00" species_traits = list(MUTCOLORS, EYECOLOR, HAS_FLESH, HAS_BONE) inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, diff --git a/code/modules/mob/living/carbon/human/species_types/snail.dm b/code/modules/mob/living/carbon/human/species_types/snail.dm index 90681d420bf..5e4e624e02f 100644 --- a/code/modules/mob/living/carbon/human/species_types/snail.dm +++ b/code/modules/mob/living/carbon/human/species_types/snail.dm @@ -1,7 +1,6 @@ /datum/species/snail name = "Snailperson" id = SPECIES_SNAIL - default_color = "336600" //vomit green species_traits = list(MUTCOLORS, EYECOLOR, HAS_FLESH, HAS_BONE, HAIR, FACEHAIR) //SKYRAT EDIT - Roundstart Snails - Customization inherent_traits = list( TRAIT_ADVANCEDTOOLUSER, diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm index d80a3c08595..ec4a11ad709 100644 --- a/code/modules/mob/living/carbon/human/species_types/vampire.dm +++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm @@ -7,7 +7,6 @@ /datum/species/vampire name = "Vampire" id = SPECIES_VAMPIRE - default_color = "FFFFFF" species_traits = list( EYECOLOR, HAIR, diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index bf2b1e8ac49..8ce4296aa32 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -733,7 +733,7 @@ /datum/reagent/mulligan name = "Mulligan Toxin" - description = "This toxin will rapidly change the DNA of human beings. Commonly used by Syndicate spies and assassins in need of an emergency ID change." + description = "This toxin will rapidly change the DNA of humanoid beings. Commonly used by Syndicate spies and assassins in need of an emergency ID change." color = "#5EFF3B" //RGB: 94, 255, 59 metabolization_rate = INFINITY taste_description = "slime" diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/akula.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/akula.dm index 597660a95f7..7a595dd24ef 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/akula.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/akula.dm @@ -1,7 +1,6 @@ /datum/species/akula name = "Akula" id = SPECIES_AKULA - default_color = "#4B4B4B" species_traits = list( MUTCOLORS, EYECOLOR, 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 30c7559e007..2a05e4244d4 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,7 +1,6 @@ /datum/species/aquatic name = "Aquatic" id = SPECIES_AQUATIC - default_color = "#4B4B4B" species_traits = list( MUTCOLORS, EYECOLOR, diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/dwarf.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/dwarf.dm index 3348f9417e9..9ac5e08becd 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/dwarf.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/dwarf.dm @@ -2,7 +2,6 @@ name = "Dwarf" id = SPECIES_DWARF examine_limb_id = SPECIES_HUMAN - default_color = "#FFFFFF" say_mod = "bellows" species_traits = list( EYECOLOR, diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/ghoul.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/ghoul.dm index 21eb247ea59..11eff8af3dc 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/ghoul.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/ghoul.dm @@ -3,7 +3,6 @@ id = SPECIES_GHOUL examine_limb_id = "ghoul" say_mod = "rasps" - default_color = "#c4af7c" species_traits = list(NOEYESPRITES, DYNCOLORS, HAS_FLESH, HAS_BONE, HAIR, FACEHAIR) can_have_genitals = FALSE //WHY WOULD YOU WANT TO FUCK ONE OF THESE THINGS? mutant_bodyparts = list("ghoulcolor" = "Tan Necrotic") @@ -89,7 +88,6 @@ /datum/species/ghoul/set_ghoul_color(mob/living/carbon/human/H) // Called on Assign, or on Color Change (or any time proof_ghoul_features() is used) fixed_mut_color = H.dna.features["ghoulcolor"] - default_color = fixed_mut_color /mob/living/carbon/proc/ReassignForeignBodyparts() var/obj/item/bodypart/head = get_bodypart(BODY_ZONE_HEAD) diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm index e4657690262..7d22bea7e38 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm @@ -1,7 +1,6 @@ /datum/species/hemophage name = "Hemophage" id = SPECIES_HEMOPHAGE - default_color = "FFFFFF" species_traits = list( EYECOLOR, HAIR, diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/humanoid.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/humanoid.dm index 1f1cae35a2a..4cca2d720f1 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/humanoid.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/humanoid.dm @@ -1,7 +1,6 @@ /datum/species/humanoid name = "Humanoid" id = SPECIES_HUMANOID - default_color = "#4B4B4B" species_traits = list(MUTCOLORS, EYECOLOR, LIPS, 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 fec33a06917..6daaf8ab2dd 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 @@ -2,7 +2,6 @@ name = "Anthromorphic Insect" id = SPECIES_INSECT say_mod = "chitters" - default_color = "#4B4B4B" species_traits = list( MUTCOLORS, EYECOLOR, diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/mammal.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/mammal.dm index d9ac6dfd730..8cb59304180 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/mammal.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/mammal.dm @@ -1,7 +1,6 @@ /datum/species/mammal name = "Anthromorph" //Called so because the species is so much more universal than just mammals id = SPECIES_MAMMAL - default_color = "#4B4B4B" species_traits = list( MUTCOLORS, EYECOLOR, diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/robotic/_robotic.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/robotic/_robotic.dm index bb7aa968c8c..220ded659c0 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/robotic/_robotic.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/robotic/_robotic.dm @@ -1,6 +1,5 @@ /datum/species/robotic say_mod = "beeps" - default_color = "#00FF00" inherent_biotypes = MOB_ROBOTIC|MOB_HUMANOID inherent_traits = list( TRAIT_CAN_STRIP, diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/robotic/synthetic_mammal.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/robotic/synthetic_mammal.dm index 5fada96a99b..52c4f2f31c9 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/robotic/synthetic_mammal.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/robotic/synthetic_mammal.dm @@ -3,7 +3,6 @@ id = SPECIES_SYNTHMAMMAL say_mod = "states" inherent_biotypes = MOB_ROBOTIC|MOB_HUMANOID - default_color = "#4B4B4B" species_traits = list( ROBOTIC_DNA_ORGANS, MUTCOLORS,EYECOLOR, 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 abc5d80e0ac..4b2a495a356 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 @@ -17,7 +17,6 @@ name = "Xenobiological Slime Hybrid" id = SPECIES_SLIMESTART examine_limb_id = SPECIES_SLIMEPERSON - default_color = "#00FFFF" say_mod = "says" coldmod = 3 heatmod = 1 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 6d64df72463..d9cb0298d5c 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 @@ -1,7 +1,6 @@ /datum/species/skrell name = "Skrell" id = SPECIES_SKRELL - default_color = "#4B4B4B" species_traits = list( MUTCOLORS, EYECOLOR, diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/tajaran.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/tajaran.dm index 8279daf6328..7fa53ad7a4a 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/tajaran.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/tajaran.dm @@ -1,7 +1,6 @@ /datum/species/tajaran name = "Tajaran" id = SPECIES_TAJARAN - default_color = "#4B4B4B" say_mod = "meows" species_traits = list( MUTCOLORS, diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/unathi.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/unathi.dm index d0a978f358b..43d7fb2ddac 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/unathi.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/unathi.dm @@ -1,7 +1,6 @@ /datum/species/unathi name = "Unathi" id = SPECIES_UNATHI - default_color = "#4B4B4B" species_traits = list( MUTCOLORS, EYECOLOR, diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vox.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vox.dm index f0fb14c6858..a40520600f1 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vox.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vox.dm @@ -4,7 +4,6 @@ id = SPECIES_VOX eyes_icon = 'modular_skyrat/master_files/icons/mob/species/vox_eyes.dmi' say_mod = "skrees" - default_color = "#00FF00" can_augment = FALSE species_traits = list( MUTCOLORS, diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vulpkanin.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vulpkanin.dm index 0ff6d3c9f26..45c538146d2 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vulpkanin.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vulpkanin.dm @@ -1,7 +1,6 @@ /datum/species/vulpkanin name = "Vulpkanin" id = SPECIES_VULP - default_color = "#4B4B4B" species_traits = list( MUTCOLORS, EYECOLOR, diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/xeno.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/xeno.dm index 3a5cd4fad38..3039aa0ea92 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/xeno.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/xeno.dm @@ -3,7 +3,6 @@ name = "Xenomorph Hybrid" id = SPECIES_XENO say_mod = "hisses" - default_color = "#00FF00" family_heirlooms = list(/obj/item/toy/plush/rouny, /obj/item/toy/toy_xeno,) species_traits = list( MUTCOLORS, diff --git a/modular_skyrat/modules/mutants/code/mutant_species.dm b/modular_skyrat/modules/mutants/code/mutant_species.dm index 9232e200c55..b9e42728743 100644 --- a/modular_skyrat/modules/mutants/code/mutant_species.dm +++ b/modular_skyrat/modules/mutants/code/mutant_species.dm @@ -6,7 +6,6 @@ say_mod = "moans" meat = /obj/item/food/meat/slab/human/mutant/zombie eyes_icon = 'modular_skyrat/modules/mutants/icons/mutant_eyes.dmi' - default_color = "#ffffff" species_traits = list( NOBLOOD, NOZOMBIE, diff --git a/modular_skyrat/modules/teshari/code/_teshari.dm b/modular_skyrat/modules/teshari/code/_teshari.dm index 0f5b34ee070..34df8a73a2b 100644 --- a/modular_skyrat/modules/teshari/code/_teshari.dm +++ b/modular_skyrat/modules/teshari/code/_teshari.dm @@ -9,7 +9,6 @@ /datum/species/teshari name = "Teshari" id = SPECIES_TESHARI - default_color = "6060FF" eyes_icon = 'modular_skyrat/master_files/icons/mob/species/teshari_eyes.dmi' species_traits = list(MUTCOLORS, EYECOLOR,