From f4a050e9fa5630d4387da506862c015a1f518f25 Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Sun, 10 Oct 2021 20:35:11 +1100 Subject: [PATCH 1/2] Merge pull request #8329 from Atermonera/smoking_in_space Unequipping mask slot won't disable internals when wearing airtight hats --- code/game/objects/items/weapons/cigs_lighters.dm | 4 ---- code/modules/mob/living/carbon/human/inventory.dm | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index ade55cbecaf..5a751e35277 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -207,8 +207,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM to_chat(M, "Your [name] goes out.") M.remove_from_mob(src) //un-equip it so the overlays can update M.update_inv_wear_mask(0) - M.update_inv_l_hand(0) - M.update_inv_r_hand(1) qdel(src) else new /obj/effect/decal/cleanable/ash(T) @@ -221,8 +219,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM icon_state = initial(icon_state) item_state = initial(item_state) M.update_inv_wear_mask(0) - M.update_inv_l_hand(0) - M.update_inv_r_hand(1) smoketime = 0 reagents.clear_reagents() name = "empty [initial(name)]" diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 119d349105f..d5311f79a53 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -173,7 +173,8 @@ This saves us from having to call add_fingerprint() any time something is put in if(I.flags_inv & (BLOCKHAIR|BLOCKHEADHAIR)) update_hair(0) //rebuild hair update_inv_ears(0) - if(internal) + // If this is how the internals are connected, disable them + if(internal && !(head?.item_flags & AIRTIGHT)) if(internals) internals.icon_state = "internal0" internal = null