qol: Water tiles now extinguish burning mobs. (#3814)

ss220-space · Dec 5, 2023 · fa927ea · fa927ea
1 parent f6e2a49
commit fa927ea
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/code/game/machinery/poolcontroller.dm b/code/game/machinery/poolcontroller.dm
@@ -83,6 +83,9 @@
 		handleTemp(M)	//handles pool temp effects on the swimmers
 		if(ishuman(M)) //Only human types will drown, to keep things simple for non-human mobs that live in the water
 			handleDrowning(M)
+		if(isliving(M))
+			var/mob/living/mob = M
+			mob.ExtinguishMob()
 
 /obj/machinery/poolcontroller/proc/cleanPool()
 	for(var/obj/effect/decal/cleanable/decal in decalinpool)		//Cleans up cleanable decals like blood and such

diff --git a/code/game/turfs/simulated/floor/indestructible.dm b/code/game/turfs/simulated/floor/indestructible.dm
@@ -223,6 +223,9 @@
 	if(!linkedcontroller)
 		return
 	if(ismob(AM))
+		if(isliving(AM))
+			var/mob/living/creature = AM
+			creature.ExtinguishMob()
 		linkedcontroller.mobinpool += AM
 
 /turf/simulated/floor/indestructible/beach/water/Exited(atom/movable/AM, atom/newloc)

diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm
@@ -106,6 +106,9 @@
 	if(!linkedcontroller)
 		return
 	if(ismob(AM))
+		if(isliving(AM))
+			var/mob/living/creature = AM
+			creature.ExtinguishMob()
 		linkedcontroller.mobinpool += AM
 
 /turf/simulated/floor/beach/water/Exited(atom/movable/AM, atom/newloc)