From 85f2ff116df4ac2e82470501a3cc287766f85834 Mon Sep 17 00:00:00 2001 From: oranges Date: Sat, 26 Oct 2019 07:20:13 +0000 Subject: [PATCH] ERT spawn no longer limited by spawnpoint available --- code/modules/admin/verbs/one_click_antag.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index c9ff5e0b4dc..9c720f2d752 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -363,11 +363,11 @@ ert_team.mission = missionobj var/list/spawnpoints = GLOB.emergencyresponseteamspawn + var/index = 0 while(numagents && candidates.len) - if (numagents > spawnpoints.len) - numagents-- - continue // This guy's unlucky, not enough spawn points, we skip him. - var/spawnloc = spawnpoints[numagents] + var/spawnloc = spawnpoints[index+1] + //loop through spawnpoints one at a time + index = (index + 1) % spawnpoints.len var/mob/dead/observer/chosen_candidate = pick(candidates) candidates -= chosen_candidate if(!chosen_candidate.key)