Fixes roundstart spawning

2017-06-05 04:04:22 -05:00
parent 1690ac291b
commit d22704b37c
1 changed files with 24 additions and 0 deletions
@@ -0,0 +1,24 @@
+diff a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm	(rejected hunks)
+@@ -379,10 +379,13 @@ SUBSYSTEM_DEF(job)
+ 				continue
+ 			S = sloc
+ 			break
+		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
+ 			log_world("Couldn't find a round start spawn point for [rank]")
+ 			SendToLateJoin(H)
+ 
+
+ 	if(H.mind)
+ 		H.mind.assigned_role = rank
+ 
+@@ -531,7 +534,7 @@ SUBSYSTEM_DEF(job)
+ 				if(avail.len)
+ 					SendToAtom(M, pick(avail), FALSE)
+ 					return
+-		
+
+ 		//pick an open spot on arrivals and dump em
+ 		var/list/arrivals_turfs = shuffle(get_area_turfs(/area/shuttle/arrival))
+ 		if(arrivals_turfs.len)