diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 893c8f47e54..14f250ebafa 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -63,18 +63,18 @@ //Medical /obj/item/clothing/head/surgery name = "surgical cap" - desc = "A cap surgeons wear during operations. Keeps thier hair from tickling your internal organs." + desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs." icon_state = "surgcap_blue" - flags = FPRINT | TABLEPASS | BLOCKHAIR + flags = FPRINT | TABLEPASS | BLOCKHEADHAIR /obj/item/clothing/head/surgery/purple - desc = "A cap surgeons wear during operations. Keeps thier hair from tickling your internal organs. This one is deep purple." + desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is deep purple." icon_state = "surgcap_purple" /obj/item/clothing/head/surgery/blue - desc = "A cap surgeons wear during operations. Keeps thier hair from tickling your internal organs. This one is baby blue" + desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is baby blue." icon_state = "surgcap_blue" /obj/item/clothing/head/surgery/green - desc = "A cap surgeons wear during operations. Keeps thier hair from tickling your internal organs. This one is dark green" + desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is dark green." icon_state = "surgcap_green" diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 1fa82e5778d..3bdf798a6bd 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -88,7 +88,7 @@ update_inv_glasses() else if (W == head) head = null - if(W.flags & BLOCKHAIR) + if((W.flags & BLOCKHAIR) || (W.flags & BLOCKHEADHAIR)) update_hair(0) //rebuild hair success = 1 update_inv_head() @@ -107,7 +107,7 @@ else if (W == wear_mask) wear_mask = null success = 1 - if(W.flags & BLOCKHAIR) + if((W.flags & BLOCKHAIR) || (W.flags & BLOCKHEADHAIR)) update_hair(0) //rebuild hair if(internal) if(internals) @@ -188,7 +188,7 @@ update_inv_back(redraw_mob) if(slot_wear_mask) src.wear_mask = W - if(wear_mask.flags & BLOCKHAIR) + if((wear_mask.flags & BLOCKHAIR) || (wear_mask.flags & BLOCKHEADHAIR)) update_hair(redraw_mob) //rebuild hair W.equipped(src, slot) update_inv_wear_mask(redraw_mob) @@ -229,7 +229,7 @@ update_inv_gloves(redraw_mob) if(slot_head) src.head = W - if(head.flags & BLOCKHAIR) + if((head.flags & BLOCKHAIR) || (head.flags & BLOCKHEADHAIR)) update_hair(redraw_mob) //rebuild hair if(istype(W,/obj/item/clothing/head/kitty)) W.update_icon(src) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 9d29d317c80..fea13b8bc10 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -350,7 +350,6 @@ proc/get_damage_icon_part(damage_state, body_part) //masks and helmets can obscure our hair. if( (head && (head.flags & BLOCKHAIR)) || (wear_mask && (wear_mask.flags & BLOCKHAIR))) if(update_icons) update_icons() - return //base icons @@ -367,7 +366,7 @@ proc/get_damage_icon_part(damage_state, body_part) face_standing.Blend(facial_s, ICON_OVERLAY) face_lying.Blend(facial_l, ICON_OVERLAY) - if(h_style) + if(h_style && !(head && (head.flags & BLOCKHEADHAIR))) var/datum/sprite_accessory/hair_style = hair_styles_list[h_style] if(hair_style) var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s") diff --git a/code/setup.dm b/code/setup.dm index c72f57f8805..f4b8d35e2ff 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -175,8 +175,7 @@ var/MAX_EXPLOSION_RANGE = 14 //FLAGS BITMASK #define STOPSPRESSUREDMAGE 1 //This flag is used on the flags variable for SUIT and HEAD items which stop pressure damage. Note that the flag 1 was previous used as ONBACK, so it is possible for some code to use (flags & 1) when checking if something can be put on your back. Replace this code with (inv_flags & SLOT_BACK) if you see it anywhere -//To successfully stop you taking all pressure damage you must have both a suit and head item with this flag. - + //To successfully stop you taking all pressure damage you must have both a suit and head item with this flag. #define TABLEPASS 2 // can pass by a table or rack #define MASKINTERNALS 8 // mask allows internals @@ -205,7 +204,8 @@ var/MAX_EXPLOSION_RANGE = 14 #define NOREACT 16384 //Reagents dont' react inside this container. -#define BLOCKHAIR 32768 // temporarily removes the user's hair icon +#define BLOCKHEADHAIR 4 // temporarily removes the user's hair overlay. Leaves facial hair. +#define BLOCKHAIR 32768 // temporarily removes the user's hair, facial and otherwise. //flags for pass_flags #define PASSTABLE 1