diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index bc3439e8992..a1f7058348a 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1584,7 +1584,8 @@ H.g_headacc = 0 H.b_headacc = 0 - reset_markings() + m_styles = initial(m_styles) //Wipes out markings, setting them all to "None". + m_colours = initial(m_styles) //Defaults colour to #00000 for all markings. if(!dna) dna = new /datum/dna(null) diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm index 2beddf0359d..0d9418e3107 100644 --- a/code/modules/mob/living/carbon/human/species/station.dm +++ b/code/modules/mob/living/carbon/human/species/station.dm @@ -122,8 +122,6 @@ reagent_tag = PROCESS_ORG flesh_color = "#AFA59E" base_color = "#333333" - //Default styles for created mobs. - default_headacc = "Tajaran Ears" butt_sprite = "tajaran" has_organ = list( diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index 19768d19430..20d3dc9b573 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -1966,7 +1966,7 @@ /datum/sprite_accessory/body_markings/head/snout_round_lower_una name = "Unathi Round Snout - Lower" species_allowed = list("Unathi") - icon_state = "markings_face_snout_round_lower_una" + icon_state = "markings_face_snout_lower_una" /datum/sprite_accessory/body_markings/head/snout_sharp_una name = "Unathi Sharp Snout" @@ -1977,7 +1977,7 @@ /datum/sprite_accessory/body_markings/head/snout_sharp_lower_una name = "Unathi Sharp Snout - Lower" species_allowed = list("Unathi") - icon_state = "markings_face_snout_sharp_lower_una" + icon_state = "markings_face_snout_lower_una" heads_allowed = list("Unathi Sharp Snout") /datum/sprite_accessory/body_markings/head/optics diff --git a/code/modules/surgery/organs/organ_icon.dm b/code/modules/surgery/organs/organ_icon.dm index e7702426c7f..2f0eb84c1be 100644 --- a/code/modules/surgery/organs/organ_icon.dm +++ b/code/modules/surgery/organs/organ_icon.dm @@ -141,10 +141,7 @@ var/global/list/limb_icon_cache = list() else if(limb_name == "head") var/obj/item/organ/external/head/head_organ = src - if(head_organ.alt_head) - var/datum/sprite_accessory/alt_heads/alternate_head = alt_heads_list[head_organ.alt_head] - if(alternate_head.icon_state) - icon_name = alternate_head.icon_state + head_organ.handle_alt_icon() if(status & ORGAN_MUTATED) mob_icon = new /icon(species.deform, "[icon_name][gender ? "_[gender]" : ""]") diff --git a/code/modules/surgery/organs/subtypes/standard.dm b/code/modules/surgery/organs/subtypes/standard.dm index 182f0875417..060a5ba7dce 100644 --- a/code/modules/surgery/organs/subtypes/standard.dm +++ b/code/modules/surgery/organs/subtypes/standard.dm @@ -194,3 +194,9 @@ disfigure("brute") if(burn_dam > 40) disfigure("burn") + +/obj/item/organ/external/head/proc/handle_alt_icon() + if(alt_head) + var/datum/sprite_accessory/alt_heads/alternate_head = alt_heads_list[alt_head] + if(alternate_head.icon_state) + icon_name = alternate_head.icon_state diff --git a/icons/mob/body_accessory.dmi b/icons/mob/body_accessory.dmi index ee52b20206c..5604e225cd1 100644 Binary files a/icons/mob/body_accessory.dmi and b/icons/mob/body_accessory.dmi differ