diff --git a/code/game/objects/effects/effect_system/effect_system.dm b/code/game/objects/effects/effect_system/effect_system.dm
index 1669d9b09d2..fa65008d307 100644
--- a/code/game/objects/effects/effect_system/effect_system.dm
+++ b/code/game/objects/effects/effect_system/effect_system.dm
@@ -9,6 +9,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
 	name = "particle effect"
 	mouse_opacity = 0
 	unacidable = 1//So effects are not targeted by alien acid.
+	pass_flags = PASSTABLE | PASSGRILLE
 
 /obj/effect/particle_effect/New()
 	..()
diff --git a/code/game/objects/effects/effect_system/effects_explosion.dm b/code/game/objects/effects/effect_system/effects_explosion.dm
index 63b3d4d5271..aa3ecd8376b 100644
--- a/code/game/objects/effects/effect_system/effects_explosion.dm
+++ b/code/game/objects/effects/effect_system/effects_explosion.dm
@@ -46,7 +46,7 @@
 /datum/effect_system/explosion/start()
 	new/obj/effect/explosion(location)
 	var/datum/effect_system/expl_particles/P = new/datum/effect_system/expl_particles()
-	P.set_up(10,location)
+	P.set_up(10, 0, location)
 	P.start()
 
 /datum/effect_system/explosion/smoke
diff --git a/code/game/objects/effects/effect_system/effects_water.dm b/code/game/objects/effects/effect_system/effects_water.dm
index a09a00120a9..c4009516f92 100644
--- a/code/game/objects/effects/effect_system/effects_water.dm
+++ b/code/game/objects/effects/effect_system/effects_water.dm
@@ -1,24 +1,17 @@
 //WATER EFFECTS
 /obj/effect/particle_effect/water
 	name = "water"
-	icon = 'icons/effects/effects.dmi'
 	icon_state = "extinguish"
-	var/life = 15.0
+	var/life = 15
 
 /obj/effect/particle_effect/water/New()
 	..()
-	//var/turf/T = src.loc
-	//if(istype(T, /turf))
-	//	T.firelevel = 0 //TODO: FIX
 	QDEL_IN(src, 70)
 
 /obj/effect/particle_effect/water/Move(turf/newloc)
-	//var/turf/T = src.loc
-	//if(istype(T, /turf))
-	//	T.firelevel = 0 //TODO: FIX
 	if(--life < 1)
-		//SN src = null
 		qdel()
+		return 0
 	if(newloc.density)
 		return 0
 	.=..()