Merge pull request #5284 from boopcat/happydrones

more fixes!

code/game/objects/effects/effect_system.dm

@@ -27,24 +27,6 @@ would spawn and follow the beaker, even if it is carried or thrown.
 		reagents.delete()
 	return
 
-
-/obj/effect/effect/water/New()
-	..()
-	//var/turf/T = src.loc
-	//if (istype(T, /turf))
-	//	T.firelevel = 0 //TODO: FIX
-	spawn( 70 )
-		delete()
-		return
-	return
-
-/obj/effect/effect/water/Del()
-	//var/turf/T = src.loc
-	//if (istype(T, /turf))
-	//	T.firelevel = 0 //TODO: FIX
-	..()
-	return
-
 /obj/effect/effect/water/Move(turf/newloc)
 	//var/turf/T = src.loc
 	//if (istype(T, /turf))

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

@@ -123,6 +123,7 @@
 						W.reagents.reaction(atm)
 					if(W.loc == my_target) break
 					sleep(2)
+				W.delete()
 
 		if((istype(usr.loc, /turf/space)) || (usr.lastarea.has_gravity == 0))
 			user.inertia_dir = get_dir(target, user)