Merge pull request #33075 from AnturK/itsnotabusewhenitsassistants

Adds spawn override system

code/controllers/subsystem/job.dm

@@ -393,6 +393,10 @@ SUBSYSTEM_DEF(job)
 				continue
 			S = sloc
 			break
+		if(GLOB.jobspawn_overrides[rank])
+			var/list/special_spawns = GLOB.jobspawn_overrides[rank]
+			if(special_spawns.len)
+				S = pick(special_spawns)
 		if(S)
 			SendToAtom(H, S, buckle = FALSE)
 		if(!S) //if there isn't a spawnpoint send them to latejoin, if there's no latejoin go yell at your mapper
@@ -536,6 +540,12 @@ SUBSYSTEM_DEF(job)
 	M.forceMove(get_turf(A))
 
 /datum/controller/subsystem/job/proc/SendToLateJoin(mob/M, buckle = TRUE)
+	if(M.mind && M.mind.assigned_role) //We're doing something special today.
+		var/list/special_spawns = GLOB.jobspawn_overrides[M.mind.assigned_role]
+		if(special_spawns.len) //just in case someone clears these
+			SendToAtom(M,pick(special_spawns),FALSE)
+			return
+
 	if(latejoin_trackers.len)
 		SendToAtom(M, pick(latejoin_trackers), buckle)
 	else

code/controllers/subsystem/ticker.dm

@@ -319,7 +319,7 @@ SUBSYSTEM_DEF(ticker)
 	//Cleanup some stuff
 	for(var/obj/effect/landmark/start/S in GLOB.landmarks_list)
 		//Deleting Startpoints but we need the ai point to AI-ize people later
-		if(S.name != "AI")
+		if(S.delete_after_roundstart)
 			qdel(S)
 
 	//assign crew objectives and generate miscreants