diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index c37e10b28c..eabc49f0db 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -378,6 +378,8 @@ 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]") S = get_turf(pick(GLOB.latejoin)) diff --git a/code/controllers/subsystem/job.dm.rej b/code/controllers/subsystem/job.dm.rej deleted file mode 100644 index ccece5044e..0000000000 --- a/code/controllers/subsystem/job.dm.rej +++ /dev/null @@ -1,24 +0,0 @@ -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)