From dba38d5508314cffd7f8e0e99a8f35563ab95aac Mon Sep 17 00:00:00 2001 From: Cael_Aislinn Date: Sat, 3 Nov 2012 23:46:41 +1000 Subject: [PATCH] made helmets etc properly hide hair Signed-off-by: Cael_Aislinn --- code/modules/mob/living/carbon/human/update_icons.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 8e4d2e6ee27..16c740f6dc8 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -332,13 +332,13 @@ proc/get_damage_icon_part(damage_state, body_part) overlays_lying[HAIR_LAYER] = null overlays_standing[HAIR_LAYER] = null - var/datum/organ/external/head/head = get_organ("head") - if( !head || (head.status & ORGAN_DESTROYED) ) + var/datum/organ/external/head/head_organ = get_organ("head") + if( !head_organ || (head_organ.status & ORGAN_DESTROYED) ) if(update_icons) update_icons() return //masks and helmets can obscure our hair. - if( (head && (head.status & BLOCKHAIR)) || (wear_mask && (wear_mask.flags & BLOCKHAIR))) + if( (head && (head.flags & BLOCKHAIR)) || (wear_mask && (wear_mask.flags & BLOCKHAIR))) if(update_icons) update_icons() return