Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
2 changes: 2 additions & 0 deletions code/datums/mutations/hulk.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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)

Expand Down
6 changes: 3 additions & 3 deletions code/modules/mob/dead/new_player/sprite_accessories.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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"
Expand All @@ -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"
Expand Down
6 changes: 4 additions & 2 deletions code/modules/mob/living/carbon/human/species.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Binary file modified icons/mob/mutant_bodyparts.dmi
Binary file not shown.