cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 14:37:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1297 from CIB/master

Browse Source 
No more involuntary and jobbanned antags
This commit is contained in:
Mloc
2012-06-15 07:48:38 -07:00
parent e9c3cba9da 8e17e28dd4
commit 9064a15bca
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/game_mode.dm
+2 -2
View File
@@ -241,7 +241,7 @@ Badassery;
set_security_level(SEC_LEVEL_BLUE)*/
/datum/game_mode/proc/get_players_for_role(var/role, override_jobbans=1)
/datum/game_mode/proc/get_players_for_role(var/role, draft_people=0, override_jobbans=0)
var/list/candidates = list()
var/list/drafted = list()
var/datum/mind/applicant = null
@@ -269,7 +269,7 @@ Badassery;
if(player.assigned_role == job)
candidates -= player
if(candidates.len < recommended_enemies)
if(candidates.len < recommended_enemies && draft_people)
for(var/mob/new_player/player in world)
if (player.client && player.ready)
if(!(player.preferences.be_special & role)) // We don't have enough people who want to be antagonist, make a seperate list of people who don't want to be one