Merge pull request #8416 from PsiOmegaDelta/Ninjas

Fixes ninja spawn logic.

code/game/gamemodes/ninja/ninja.dm

@@ -32,15 +32,15 @@
 			if(L.name == "carpspawn")
 				ninjastart.Add(L)
 
-	if(ninjastart.len == 0 && latejoin.len > 0)
-		ninja.current << "<B>\red No spawneable locations could be found. Defaulting to latejoin.</B>"
+	if(ninjastart.len)
 		return 1
-	else
-		ninja.current << "<B>\red No spawneable locations could be found. Aborting.</B>"
-		return 0
-
+	if(ninjastart.len == 0 && latejoin.len > 0)
+		ninja.current << "<B>\red No spawn locations could be found. Defaulting to late-join locations.</B>"
 	return 1
 
+	ninja.current << "<B>\red No spawn locations could be found. Aborting.</B>"
+	return 0
+
 /datum/game_mode/ninja/pre_setup()
 	for(var/datum/mind/ninja in ninjas)
 		ninja.current << browse(null, "window=playersetup")

code/game/objects/effects/landmarks.dm

@@ -117,7 +117,7 @@
 
 /obj/effect/landmark/start/ninja/New()
 	..()
-	ninjastart += loc
+	ninjastart += src
 
 //Costume spawner landmarks