cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes players being double-traitored, double-agent'd and otherwise. (#9865)

Browse Source
This commit is contained in:
sood
2016-05-03 09:15:19 -07:00
parent 416f345e90
commit 51f2dadfdd
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/game/gamemodes/game_mode.dm
View File

@@ -265,9 +265,10 @@
if(candidates.len < recommended_enemies) if(candidates.len < recommended_enemies)
for(var/mob/new_player/player in players) for(var/mob/new_player/player in players)
if(player.client && player.ready) if(player.client && player.ready)
if(player.client.desires_role(role, display_to_user=poll)) // We don't have enough people who want to be antagonist, make a seperate list of people who don't want to be one if(!player.mind in drafted || !player.mind in candidates) // Players were getting placed in candidates AND drafted lists.
if(!jobban_isbanned(player, "Syndicate") && !jobban_isbanned(player, role)) //Nodrak/Carn: Antag Job-bans if(player.client.desires_role(role, display_to_user=poll)) // We don't have enough people who want to be antagonist, make a seperate list of people who don't want to be one
drafted += player.mind if(!jobban_isbanned(player, "Syndicate") && !jobban_isbanned(player, role)) //Nodrak/Carn: Antag Job-bans
drafted += player.mind
if(restricted_jobs) if(restricted_jobs)
for(var/datum/mind/player in drafted) // Remove people who can't be an antagonist for(var/datum/mind/player in drafted) // Remove people who can't be an antagonist