Buffs Dihydrogen monoxide

code/game/objects/items/weapons/extinguisher.dm

@@ -145,12 +145,9 @@
 					step_towards(W,my_target)
 					if(!W || !W.reagents) return
 					W.reagents.reaction(get_turf(W))
-					for(var/atom/atm in get_turf(W))
+					for(var/A in get_turf(W))
 						if(!W) return
-						W.reagents.reaction(atm)
-						if(isliving(atm)) //For extinguishing mobs on fire
-							var/mob/living/M = atm
-							M.ExtinguishMob()
+						W.reagents.reaction(A)
 					if(W.loc == my_target) break
 					sleep(2)
 

code/modules/reagents/chemistry/reagents/other_reagents.dm

@@ -162,10 +162,11 @@
  */
 
 /datum/reagent/water/reaction_mob(mob/living/M, method=TOUCH, reac_volume)//Splashing people with water can help put them out!
-	if(!istype(M, /mob/living))
+	if(!istype(M))
 		return
 	if(method == TOUCH)
 		M.adjust_fire_stacks(-(reac_volume / 10))
+		M.ExtinguishMob()
 	..()
 
 /datum/reagent/water/holywater