From d22704b37ce6b92480403db60b727f61b0b296c7 Mon Sep 17 00:00:00 2001
From: CitadelStationBot <CitadelStationBot>
Date: Mon, 5 Jun 2017 04:04:22 -0500
Subject: [PATCH 1/2] 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)

From 5b6907c9e85f7640c7f45602ad8a782f5fbc07ef Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Mon, 5 Jun 2017 04:24:57 -0500
Subject: [PATCH 2/2] yeeehaaaww

---
 code/controllers/subsystem/job.dm     |  2 ++
 code/controllers/subsystem/job.dm.rej | 24 ------------------------
 2 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 code/controllers/subsystem/job.dm.rej

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)