From 0ad54794fc5c86537bee985b8cb59dacc34491cb Mon Sep 17 00:00:00 2001
From: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date: Tue, 24 Sep 2019 19:39:12 -0400
Subject: [PATCH] Fixes Extinguishing Some Fires (#12410)

---
 code/game/objects/items.dm | 4 ----
 code/game/objects/objs.dm  | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 7acaf887828..25c39c3e9f1 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -154,10 +154,6 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 /obj/item/blob_act()
 	qdel(src)
 
-/obj/item/water_act(volume, temperature, source, method = TOUCH)
-	. = ..()
-	extinguish()
-
 /obj/item/verb/move_to_top()
 	set name = "Move To Top"
 	set category = null
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index ded21767fe6..2dec47151ac 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -272,6 +272,10 @@ a {
 	user.set_machine(src)
 	onclose(user, "mtcomputer")
 
+/obj/water_act(volume, temperature, source, method = TOUCH)
+	. = ..()
+	extinguish()
+
 /obj/singularity_pull(S, current_size)
 	if(anchored)
 		if(current_size >= STAGE_FIVE)