Merge pull request #8156 from PsiOmegaDelta/CameraMove

Custom ninja spawn points.

code/game/gamemodes/ninja/ninja.dm

@@ -27,18 +27,15 @@
 	ninja.special_role = "Ninja"
 	ninja.original = ninja.current
 
-	/*if(ninjastart.len == 0)
-		ninja.current << "<B>\red A proper starting location for you could not be found, please report this bug!</B>"
-		ninja.current << "<B>\red Attempting to place at a carpspawn.</B>"*/
+	if(ninjastart.len == 0)
+		for(var/obj/effect/landmark/L in landmarks_list)
+			if(L.name == "carpspawn")
+				ninjastart.Add(L)
 
-	//Until such a time as people want to place ninja spawn points, carpspawn will do fine.
-	for(var/obj/effect/landmark/L in landmarks_list)
-		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>"
 		return 1
-	else if (ninjastart.len == 0)
+	else
 		ninja.current << "<B>\red No spawneable locations could be found. Aborting.</B>"
 		return 0
 

code/game/objects/effects/landmarks.dm

@@ -6,7 +6,6 @@
 	unacidable = 1
 
 /obj/effect/landmark/New()
-
 	..()
 	tag = text("landmark*[]", name)
 	invisibility = 101
@@ -113,6 +112,13 @@
 
 	return 1
 
+/obj/effect/landmark/start/ninja
+	name = "ninja"
+
+/obj/effect/landmark/start/ninja/New()
+	..()
+	ninjastart += loc
+
 //Costume spawner landmarks
 
 /obj/effect/landmark/costume/New() //costume spawner, selects a random subclass and disappears