From d22704b37ce6b92480403db60b727f61b0b296c7 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 5 Jun 2017 04:04:22 -0500 Subject: [PATCH] Fixes roundstart spawning --- code/controllers/subsystem/job.dm.rej | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 code/controllers/subsystem/job.dm.rej diff --git a/code/controllers/subsystem/job.dm.rej b/code/controllers/subsystem/job.dm.rej new file mode 100644 index 0000000000..ccece5044e --- /dev/null +++ b/code/controllers/subsystem/job.dm.rej @@ -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)