Cigar(ette) butts now stay in your mask sot when they burn out (#27989)

* FINALLY

* Try to fix linters

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
This commit is contained in:
DGamerL
2025-02-04 08:02:39 +00:00
committed by GitHub
co-authored by Luc
parent 1a73339869
commit dfd642799c
3 changed files with 9 additions and 4 deletions
+4
View File
@@ -290,6 +290,10 @@ LIGHTERS ARE IN LIGHTERS.DM
var/mob/living/M = loc
to_chat(M, "<span class='notice'>Your [name] goes out.</span>")
M.drop_item_to_ground(src, force = TRUE) //Force the un-equip so the overlays update
butt.slot_flags |= ITEM_SLOT_MASK // Temporarily allow it to go on masks
M.equip_to_slot_if_possible(butt, ITEM_SLOT_MASK)
butt.slot_flags &= ~ITEM_SLOT_MASK
STOP_PROCESSING(SSobj, src)
qdel(src)
@@ -1253,7 +1253,7 @@ so that different stomachs can handle things in different ways VB*/
if(istype(head, /obj/item/clothing/head))
var/obj/item/clothing/head/HT = head
. += HT.tint
if(wear_mask)
if(istype(wear_mask))
. += wear_mask.tint
var/obj/item/organ/internal/eyes/E = get_organ_slot("eyes")
@@ -1272,7 +1272,7 @@ so that different stomachs can handle things in different ways VB*/
update_inv_wear_mask()
/mob/living/carbon/wear_mask_update(obj/item/clothing/C, toggle_off = 1)
if(C.tint || initial(C.tint))
if(istype(C) && (C.tint || initial(C.tint)))
update_tint()
update_inv_wear_mask()
@@ -62,8 +62,9 @@
update_observer_view(l_hand)
/mob/living/carbon/update_inv_wear_mask()
if(istype(wear_mask, /obj/item/clothing/mask))
update_hud_wear_mask(wear_mask)
if(!wear_mask)
return
update_hud_wear_mask(wear_mask)
/mob/living/carbon/update_inv_back()
if(client && hud_used && hud_used.inv_slots[ITEM_SLOT_2_INDEX(ITEM_SLOT_BACK)])