Merge remote-tracking branch 'upstream/dev-freeze' into dev

Conflicts:
	code/modules/nano/modules/human_appearance.dm

code/game/objects/effects/chem/water.dm

@@ -3,6 +3,7 @@
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "extinguish"
 	mouse_opacity = 0
+	pass_flags = PASSTABLE | PASSGRILLE
 
 /obj/effect/effect/water/New(loc)
 	..()
@@ -30,7 +31,7 @@
 				else if(ismob(A) && !M)
 					M = A
 			if(M)
-				reagents.trans_to(M, reagents.total_volume)
+				reagents.splash(M, reagents.total_volume)
 				break
 			if(T == get_turf(target))
 				break
@@ -53,4 +54,3 @@
 	name = "chemicals"
 	icon = 'icons/obj/chempuff.dmi'
 	icon_state = ""
-	pass_flags = PASSTABLE | PASSGRILLE

code/game/objects/effects/landmarks.dm

@@ -88,16 +88,7 @@
 
 	return 1
 
-/obj/effect/landmark/start/ninja
-	name = "ninja"
-
-/obj/effect/landmark/start/ninja/New()
-	..()
-	ninjastart += loc
-	qdel(src)
-
 //Costume spawner landmarks
-
 /obj/effect/landmark/costume/New() //costume spawner, selects a random subclass and disappears
 
 	var/list/options = typesof(/obj/effect/landmark/costume)