Fixes runtimes when you talk with a cig butt in your mouth (#28250)

* Minor fixes

* Oops

* Funnyman review
This commit is contained in:
DGamerL
2025-02-05 22:26:20 +01:00
committed by GitHub
parent fdc37eae63
commit 1c4a5180ed
9 changed files with 35 additions and 23 deletions
@@ -1253,8 +1253,9 @@ 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(istype(wear_mask))
. += wear_mask.tint
if(ismask(wear_mask))
var/obj/item/clothing/mask/worn_mask = wear_mask
. += worn_mask.tint
var/obj/item/organ/internal/eyes/E = get_organ_slot("eyes")
if(E)
@@ -90,9 +90,11 @@
to_chat(user, "<span class='warning'>Your throat hurts too much to do it right now. Wait [round((cooldown - world.time) / 10)] seconds and try again.</span>")
return
if(!welding_fuel_used || user.reagents.has_reagent("fuel", welding_fuel_used))
if((user.head?.flags_cover & HEADCOVERSMOUTH) || (user.wear_mask?.flags_cover & MASKCOVERSMOUTH) && !user.wear_mask?.up)
to_chat(user, "<span class='warning'>Your mouth is covered.</span>")
return
if(ismask(user.wear_mask))
var/obj/item/clothing/mask/worn_mask = user.wear_mask
if((user.head?.flags_cover & HEADCOVERSMOUTH) || (worn_mask.flags_cover & MASKCOVERSMOUTH) && !worn_mask.up)
to_chat(user, "<span class='warning'>Your mouth is covered.</span>")
return
var/obj/item/match/unathi/fire = new(user.loc, src)
if(user.put_in_hands(fire))
to_chat(user, "<span class='notice'>You ignite a small flame in your mouth.</span>")
+3 -2
View File
@@ -80,8 +80,9 @@
var/obj/item/back = null //Human
var/obj/item/tank/internal = null //Human
/// Active storage container
var/obj/item/storage/s_active = null //Carbon
var/obj/item/clothing/mask/wear_mask = null //Carbon
var/obj/item/storage/s_active
/// The currently worn mask
var/obj/item/wear_mask
/// The instantiated version of the mob's hud.
var/datum/hud/hud_used = null