From d9cd96810728a6abc9d428587cc65245ac981f3b Mon Sep 17 00:00:00 2001 From: Neerti Date: Tue, 7 May 2019 17:06:36 -0400 Subject: [PATCH 1/2] Merge pull request #6157 from Heroman3003/landmarkening Makes roundstart spawn spots choose random one --- code/game/jobs/job_controller.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index b6251dc281..e454c93b18 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -342,11 +342,13 @@ var/global/datum/controller/occupations/job_master if(!joined_late) var/obj/S = null + var/list/possible_spawns = list() for(var/obj/effect/landmark/start/sloc in landmarks_list) if(sloc.name != rank) continue if(locate(/mob/living) in sloc.loc) continue - S = sloc - break + possible_spawns.Add(sloc) + if(possible_spawns.len) + S = pick(possible_spawns) if(!S) S = locate("start*[rank]") // use old stype if(istype(S, /obj/effect/landmark/start) && istype(S.loc, /turf))