Merge remote-tracking branch 'upstream/master' into stupid-triggers

code/game/objects/effects/decals/Cleanable/tracks.dm

@@ -24,9 +24,9 @@ var/global/list/image/fluidtrack_cache=list()
 	var/crusty=0
 	var/image/overlay
 
-	New(_direction,_color,_wet)
+	New(_direction,item_color,_wet)
 		src.direction=_direction
-		src.basecolor=_color
+		src.basecolor=item_color
 		src.wet=_wet
 
 // Footprints, tire trails...

code/game/objects/effects/effect_system.dm

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