cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 19:13:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* FINALLY

* Try to fix linters

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
This commit is contained in:
DGamerL
2025-02-04 09:02:39 +01:00
committed by GitHub
parent 1a73339869
commit dfd642799c
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/carbon_procs.dm
+2 -2
View File
@@ -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()
code/modules/mob/living/carbon/carbon_update_icons.dm
+3 -2
View File
@@ -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)])