From d715e0645fada6bfe067fc93b2d4cb863053b00b Mon Sep 17 00:00:00 2001 From: HarpyEagle Date: Sun, 11 Oct 2015 11:48:04 -0400 Subject: [PATCH] Removes unused latejoin template list --- code/game/gamemodes/game_mode.dm | 3 --- code/game/gamemodes/game_mode_latespawn.dm | 6 ++---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 57a936f581..b8a99badf1 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -22,7 +22,6 @@ var/global/list/additional_antag_types = list() var/list/antag_tags = list() // Core antag templates to spawn. var/list/antag_templates // Extra antagonist types to include. - var/list/latejoin_templates = list() var/round_autoantag = 0 // Will this round attempt to periodically spawn more antagonists? var/antag_scaling_coeff = 5 // Coefficient for scaling max antagonists to player count. var/require_all_templates = 0 // Will only start if all templates are checked and can spawn. @@ -291,8 +290,6 @@ var/global/list/additional_antag_types = list() if(!(antag.flags & ANTAG_OVERRIDE_JOB)) antag.attempt_spawn() //select antags to be spawned antag.finalize_spawn() //actually spawn antags - if(antag.is_latejoin_template()) - latejoin_templates |= antag if(emergency_shuttle && auto_recall_shuttle) emergency_shuttle.auto_recall = 1 diff --git a/code/game/gamemodes/game_mode_latespawn.dm b/code/game/gamemodes/game_mode_latespawn.dm index f2bce2d871..28db276b49 100644 --- a/code/game/gamemodes/game_mode_latespawn.dm +++ b/code/game/gamemodes/game_mode_latespawn.dm @@ -27,7 +27,7 @@ try_latespawn(character.mind) return 0 -/datum/game_mode/proc/try_latespawn(var/datum/mind/player, var/latejoin_only) +/datum/game_mode/proc/try_latespawn(var/datum/mind/player) if(emergency_shuttle.departed || !round_autoantag) return @@ -38,9 +38,7 @@ message_admins("AUTO[uppertext(name)]: Attempting spawn.") var/list/usable_templates - if(latejoin_only && latejoin_templates.len) - usable_templates = get_usable_templates(latejoin_templates) - else if (antag_templates && antag_templates.len) + if (antag_templates && antag_templates.len) usable_templates = get_usable_templates(antag_templates) else message_admins("AUTO[uppertext(name)]: Failed to find configured mode spawn templates, please disable auto-antagonists until one is added.")