mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-18 10:33:30 +01:00
Alt head tweaks
Todo: CMA/morph support for alt heads. Known issues: Can't change alt head on the fly, icon won't update properly
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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]" : ""]")
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user