Merge pull request #11670 from VOREStation/upstream-merge-8329

[MIRROR] Unequipping mask slot won't disable internals when wearing airtight hats

code/game/objects/items/weapons/cigs_lighters.dm

@@ -207,8 +207,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 				to_chat(M, "<span class='notice'>Your [name] goes out.</span>")
 			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)]"

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