diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 8bef29bd283..ebb5159b98a 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -374,6 +374,8 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(hair_color) if(hair_color == "mutcolor") facial_overlay.color = "#" + H.dna.features["mcolor"] + else if(hair_color == "fixedmutcolor") + facial_overlay.color = "#[fixed_mut_color]" else facial_overlay.color = "#" + hair_color else @@ -435,6 +437,8 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(hair_color) if(hair_color == "mutcolor") hair_overlay.color = "#" + H.dna.features["mcolor"] + else if(hair_color == "fixedmutcolor") + hair_overlay.color = "#[fixed_mut_color]" else hair_overlay.color = "#" + hair_color else @@ -685,6 +689,8 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(HAIR) if(hair_color == "mutcolor") accessory_overlay.color = "#[H.dna.features["mcolor"]]" + else if(hair_color == "fixedmutcolor") + accessory_overlay.color = "#[fixed_mut_color]" else accessory_overlay.color = "#[H.hair_color]" if(FACEHAIR) 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 f8f8f2ab8b1..2fcbf38ff01 100644 --- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm +++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm @@ -14,7 +14,7 @@ brutemod = 1.25 //They're weak to punches attack_type = BURN //burn bish damage_overlay_type = "" //We are too cool for regular damage overlays - species_traits = list(DYNCOLORS, AGENDER, NO_UNDERWEAR) + species_traits = list(DYNCOLORS, AGENDER, NO_UNDERWEAR, HAIR) changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT species_language_holder = /datum/language_holder/ethereal inherent_traits = list(TRAIT_NOHUNGER) @@ -25,6 +25,8 @@ bodytemp_heat_damage_limit = FIRE_MINIMUM_TEMPERATURE_TO_SPREAD // about 150C // Cold temperatures hurt faster as it is harder to move with out the heat energy bodytemp_cold_damage_limit = (T20C - 10) // about 10c + hair_color = "fixedmutcolor" + hair_alpha = 140 var/current_color var/EMPeffect = FALSE var/emageffect = FALSE diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm index 53c1c926060..928216af50f 100644 --- a/code/modules/surgery/bodyparts/head.dm +++ b/code/modules/surgery/bodyparts/head.dm @@ -147,6 +147,8 @@ if(S.hair_color) if(S.hair_color == "mutcolor") facial_hair_color = H.dna.features["mcolor"] + else if(hair_color == "fixedmutcolor") + facial_hair_color = "#[S.fixed_mut_color]" else facial_hair_color = S.hair_color else @@ -162,6 +164,8 @@ if(S.hair_color) if(S.hair_color == "mutcolor") hair_color = H.dna.features["mcolor"] + else if(hair_color == "fixedmutcolor") + hair_color = "#[S.fixed_mut_color]" else hair_color = S.hair_color else