diff --git a/code/datums/elements/watery_tile.dm b/code/datums/elements/watery_tile.dm
new file mode 100644
index 00000000000..797eda39135
--- /dev/null
+++ b/code/datums/elements/watery_tile.dm
@@ -0,0 +1,21 @@
+/datum/element/watery_tile
+	element_flags = ELEMENT_DETACH_ON_HOST_DESTROY
+
+/datum/element/watery_tile/Attach(turf/target)
+	. = ..()
+	if(!isturf(target))
+		return ELEMENT_INCOMPATIBLE
+
+	RegisterSignal(target, COMSIG_ATOM_ENTERED, PROC_REF(extinguish_atom))
+
+/datum/element/watery_tile/Detach(turf/source)
+	UnregisterSignal(source, COMSIG_ATOM_ENTERED)
+	return ..()
+
+/datum/element/watery_tile/proc/extinguish_atom(atom/source, atom/movable/entered)
+	SIGNAL_HANDLER
+
+	entered.extinguish()
+	if(isliving(entered))
+		var/mob/living/our_mob = entered
+		our_mob.adjust_wet_stacks(3)
diff --git a/code/datums/status_effects/debuffs/fire_stacks.dm b/code/datums/status_effects/debuffs/fire_stacks.dm
index 5bf8269bbbf..62f8c9ca24e 100644
--- a/code/datums/status_effects/debuffs/fire_stacks.dm
+++ b/code/datums/status_effects/debuffs/fire_stacks.dm
@@ -261,6 +261,7 @@
 /datum/status_effect/fire_handler/fire_stacks/on_apply()
 	. = ..()
 	RegisterSignal(owner, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(add_fire_overlay))
+	RegisterSignal(owner, COMSIG_ATOM_EXTINGUISH, PROC_REF(extinguish))
 	owner.update_appearance(UPDATE_OVERLAYS)
 
 /datum/status_effect/fire_handler/fire_stacks/proc/add_fire_overlay(mob/living/source, list/overlays)
diff --git a/code/game/turfs/open/water.dm b/code/game/turfs/open/water.dm
index debf5c0f6b1..55ca23beead 100644
--- a/code/game/turfs/open/water.dm
+++ b/code/game/turfs/open/water.dm
@@ -23,6 +23,7 @@
 /turf/open/water/Initialize(mapload)
 	. = ..()
 	AddElement(/datum/element/immerse, icon, icon_state, "immerse", immerse_overlay_color)
+	AddElement(/datum/element/watery_tile)
 
 /turf/open/water/jungle
 
diff --git a/tgstation.dme b/tgstation.dme
index d0d1b3677f8..5894f02310c 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1614,6 +1614,7 @@
 #include "code\datums\elements\wall_smasher.dm"
 #include "code\datums\elements\wall_tearer.dm"
 #include "code\datums\elements\wall_walker.dm"
+#include "code\datums\elements\watery_tile.dm"
 #include "code\datums\elements\weapon_description.dm"
 #include "code\datums\elements\weather_listener.dm"
 #include "code\datums\elements\web_walker.dm"