cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #737 from Miniature/master

Browse Source 
Added restricted job checking to autotraitor
This commit is contained in:
CIB
2012-03-23 02:33:41 -07:00
parent cada2f4242 18c0bf7e16
commit c0bc942d34
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/game/gamemodes/autotraitor/autotraitor.dm
View File

@@ -15,6 +15,12 @@
/datum/game_mode/traitor/autotraitor/pre_setup() /datum/game_mode/traitor/autotraitor/pre_setup()
possible_traitors = get_players_for_role(BE_TRAITOR) 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) for(var/mob/new_player/P in world)
if(P.client && P.ready) if(P.client && P.ready)
num_players++ num_players++
@@ -78,6 +84,11 @@
traitorcount += 1 traitorcount += 1
if (player.client && player.mind && !player.mind.special_role && player.stat != 2 && (player.be_syndicate & BE_TRAITOR) && !jobban_isbanned(player, "Syndicate")) if (player.client && player.mind && !player.mind.special_role && player.stat != 2 && (player.be_syndicate & BE_TRAITOR) && !jobban_isbanned(player, "Syndicate"))
possible_traitors += player 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 Players: [playercount]")
//message_admins("Live Traitors: [traitorcount]") //message_admins("Live Traitors: [traitorcount]")
// message_admins("Potential Traitors:") // message_admins("Potential Traitors:")