From 49cd785ec5ee455c0776b56f2604e9a252bcefd6 Mon Sep 17 00:00:00 2001 From: SECBATON GRIFFON <87321915+SECBATON-GRIFFON@users.noreply.github.com> Date: Sun, 3 Nov 2024 02:00:22 +0000 Subject: [PATCH 1/3] Blowing on hot things no longer works if dead, unconscious or far away --- code/game/objects/items.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index fc6470a7229b..b4178f6b33a8 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -1773,7 +1773,7 @@ var/global/objects_thrown_when_explode = FALSE extinguish_with_hands(user) /obj/item/proc/extinguish_with_hands(var/mob/user) - if(!isliving(user)) + if(user.stat || !user.Adjacent(src) || !isliving(user)) return if(src.on_fire) extinguish() From 77655cdd9d6b584f55d54c9462f95d4a3ae4d619 Mon Sep 17 00:00:00 2001 From: SECBATON GRIFFON <87321915+SECBATON-GRIFFON@users.noreply.github.com> Date: Sun, 3 Nov 2024 02:06:23 +0000 Subject: [PATCH 2/3] the REAL fix --- code/modules/reagents/reagent_containers.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index 6a24fcce1723..2a7f783af5ff 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -79,7 +79,7 @@ var/list/LOGGED_SPLASH_REAGENTS = list(FUEL, THERMITE) return ..() /obj/item/weapon/reagent_containers/MiddleAltClick(var/mob/living/user) - if(!Adjacent(user, src)) + if(user.stat || !Adjacent(user, src)) return if(!reagents || !reagents.total_volume) to_chat(user, "\The [src] is desperately empty.") From b6c4e27ffbcc884ce3a18059e9d75dfc5a4b26ca Mon Sep 17 00:00:00 2001 From: SECBATON GRIFFON <87321915+SECBATON-GRIFFON@users.noreply.github.com> Date: Sun, 3 Nov 2024 02:08:45 +0000 Subject: [PATCH 3/3] just for consistency --- code/game/objects/items.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index b4178f6b33a8..db4ccebfd6c4 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -1773,7 +1773,7 @@ var/global/objects_thrown_when_explode = FALSE extinguish_with_hands(user) /obj/item/proc/extinguish_with_hands(var/mob/user) - if(user.stat || !user.Adjacent(src) || !isliving(user)) + if(user.stat || !Adjacent(user, src) || !isliving(user)) return if(src.on_fire) extinguish()