diff --git a/code/datums/mutations/hulk.dm b/code/datums/mutations/hulk.dm index 3fa10e8904bb..36ca5566a75d 100644 --- a/code/datums/mutations/hulk.dm +++ b/code/datums/mutations/hulk.dm @@ -18,6 +18,7 @@ ADD_TRAIT(owner, TRAIT_STUNIMMUNE, TRAIT_HULK) ADD_TRAIT(owner, TRAIT_PUSHIMMUNE, TRAIT_HULK) owner.update_body_parts() + owner.dna.species.handle_mutant_bodyparts(owner) SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "hulk", /datum/mood_event/hulk) RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech) @@ -36,6 +37,7 @@ REMOVE_TRAIT(owner, TRAIT_STUNIMMUNE, TRAIT_HULK) REMOVE_TRAIT(owner, TRAIT_PUSHIMMUNE, TRAIT_HULK) owner.update_body_parts() + owner.dna.species.handle_mutant_bodyparts(owner) SEND_SIGNAL(owner, COMSIG_CLEAR_MOOD_EVENT, "hulk") UnregisterSignal(owner, COMSIG_MOB_SAY) diff --git a/code/modules/mob/dead/new_player/sprite_accessories.dm b/code/modules/mob/dead/new_player/sprite_accessories.dm index 42040ce55a12..e3c9030c6273 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories.dm @@ -2034,7 +2034,7 @@ /datum/sprite_accessory/tails/polysmorph/polys name = "Polys" icon_state = "polys" - color_src = null + color_src = MUTCOLORS /datum/sprite_accessory/teeth icon = 'icons/mob/mutant_bodyparts.dmi' @@ -2054,7 +2054,7 @@ /datum/sprite_accessory/dome icon = 'icons/mob/mutant_bodyparts.dmi' - color_src = null + color_src = MUTCOLORS /datum/sprite_accessory/dome/none name = "None" @@ -2078,7 +2078,7 @@ /datum/sprite_accessory/dorsal_tubes icon = 'icons/mob/mutant_bodyparts.dmi' - color_src = null + color_src = MUTCOLORS /datum/sprite_accessory/dorsal_tubes/none name = "None" diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 68a3d43a6486..110cb7b4f892 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -842,9 +842,11 @@ GLOBAL_LIST_EMPTY(mentor_races) if(!forced_colour) switch(S.color_src) if(MUTCOLORS) - if(fixed_mut_color) + if(H.dna.check_mutation(HULK) || H.dna.check_mutation(ACTIVE_HULK)) //HULK GO FIRST + accessory_overlay.color = "#00aa00" + else if(fixed_mut_color) //Then fixed color if applicable accessory_overlay.color = "#[fixed_mut_color]" - else + else //Then snowflake color accessory_overlay.color = "#[H.dna.features["mcolor"]]" if(HAIR) if(hair_color == "mutcolor") diff --git a/icons/mob/mutant_bodyparts.dmi b/icons/mob/mutant_bodyparts.dmi index a27d82877cf0..8b1a130fad46 100644 Binary files a/icons/mob/mutant_bodyparts.dmi and b/icons/mob/mutant_bodyparts.dmi differ