Hardsuit Helmets can now be used as internals masks. Rejoice, CE mains.

Also reworks internals code a little to be much more friendly. Any head or mask item with the flag should now function as an internals mask if it has the ALLOWSINTERNALS flag.
This commit is contained in:
Chayse Ramsay
2019-07-28 17:31:59 +01:00
parent 39dea966ae
commit 5055cd73b9
14 changed files with 62 additions and 37 deletions
+13 -10
View File
@@ -280,7 +280,7 @@
/obj/screen/internals/Click()
if(!iscarbon(usr))
return
var/mob/living/carbon/C = usr
var/mob/living/carbon/human/C = usr
if(C.incapacitated())
return
@@ -290,16 +290,19 @@
icon_state = "internal0"
else
if(!C.getorganslot(ORGAN_SLOT_BREATHING_TUBE))
if(!istype(C.wear_mask, /obj/item/clothing/mask))
var/obj/item/clothing/check
var/internals = FALSE
for(check in C.get_internal_slots())
if(istype(check, /obj/item/clothing/mask))
var/obj/item/clothing/mask/M = check
if(M.mask_adjusted)
M.adjustmask(C)
if(CHECK_BITFIELD(check.clothing_flags, ALLOWINTERNALS))
internals = TRUE
if(!internals)
to_chat(C, "<span class='warning'>You are not wearing an internals mask!</span>")
return 1
else
var/obj/item/clothing/mask/M = C.wear_mask
if(M.mask_adjusted) // if mask on face but pushed down
M.adjustmask(C) // adjust it back
if( !(M.clothing_flags & MASKINTERNALS) )
to_chat(C, "<span class='warning'>You are not wearing an internals mask!</span>")
return
return
var/obj/item/I = C.is_holding_item_of_type(/obj/item/tank)
if(I)