From 18c0bf7e164b90e759af33231c0c7d6fe472f7ef Mon Sep 17 00:00:00 2001 From: Miniature Date: Fri, 23 Mar 2012 19:21:32 +1030 Subject: [PATCH] Added restricted job checking to autotraitor --- code/game/gamemodes/autotraitor/autotraitor.dm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/code/game/gamemodes/autotraitor/autotraitor.dm b/code/game/gamemodes/autotraitor/autotraitor.dm index f0ecb88ddc..2459e87bc7 100644 --- a/code/game/gamemodes/autotraitor/autotraitor.dm +++ b/code/game/gamemodes/autotraitor/autotraitor.dm @@ -15,6 +15,12 @@ /datum/game_mode/traitor/autotraitor/pre_setup() possible_traitors = get_players_for_role(BE_TRAITOR) + for(var/datum/mind/player in possible_traitors) + for(var/job in restricted_jobs) + if(player.assigned_role == job) + possible_traitors -= player + + for(var/mob/new_player/P in world) if(P.client && P.ready) num_players++ @@ -78,6 +84,11 @@ traitorcount += 1 if (player.client && player.mind && !player.mind.special_role && player.stat != 2 && (player.be_syndicate & BE_TRAITOR) && !jobban_isbanned(player, "Syndicate")) possible_traitors += player + for(var/datum/mind/player in possible_traitors) + for(var/job in restricted_jobs) + if(player.assigned_role == job) + possible_traitors -= player + //message_admins("Live Players: [playercount]") //message_admins("Live Traitors: [traitorcount]") // message_admins("Potential Traitors:")