From f74182680c5999300efa617f85f3db11c64045ae Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 5 Sep 2015 13:15:30 +0930 Subject: [PATCH] Fixes autotraitor. --- code/game/antagonist/antagonist.dm | 8 +++++++- code/modules/admin/admin.dm | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/code/game/antagonist/antagonist.dm b/code/game/antagonist/antagonist.dm index e98d74823ae..3be89beba17 100644 --- a/code/game/antagonist/antagonist.dm +++ b/code/game/antagonist/antagonist.dm @@ -109,7 +109,13 @@ /datum/antagonist/proc/attempt_late_spawn(var/datum/mind/player) if(!can_late_spawn()) return 0 - if(!istype(player)) player = get_candidates(is_latejoin_template()) + if(!istype(player)) + var/list/players = get_candidates(is_latejoin_template()) + if(players && players.len) + player = pick(players) + if(!istype(player)) + message_admins("AUTO[uppertext(ticker.mode.name)]: Failed to find a candidate for [role_text].") + return 0 player.current << "You have been selected this round as an antagonist!" message_admins("AUTO[uppertext(ticker.mode.name)]: Selected [player] as a [role_text].") if(istype(player.current, /mob/dead)) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index df25042045b..5b373f2bf2e 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -1380,6 +1380,7 @@ proc/admin_notice(var/message, var/rights) var/antag_type = input("Choose a template.","Force Latespawn") as null|anything in all_antag_types if(!antag_type || !all_antag_types[antag_type]) + usr << "Aborting." return var/datum/antagonist/antag = all_antag_types[antag_type]