From c205f2662d1789c868770d474bc9a77ec5ca2b05 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Tue, 15 May 2018 16:51:01 -0400 Subject: [PATCH] Comments --- code/datums/antagonists/antag_datum.dm | 4 ++-- code/datums/antagonists/antag_helpers.dm | 6 +++--- code/datums/mind.dm | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/code/datums/antagonists/antag_datum.dm b/code/datums/antagonists/antag_datum.dm index de6572448ae..51ca4e5d39c 100644 --- a/code/datums/antagonists/antag_datum.dm +++ b/code/datums/antagonists/antag_datum.dm @@ -76,12 +76,12 @@ GLOBAL_LIST_EMPTY(antagonists) /datum/antagonist/proc/is_banned(mob/M) if(!M) return FALSE - . = (jobban_isbanned(M, ROLE_SYNDICATE) || (job_rank && jobban_isbanned(M,job_rank))) + . = (jobban_isbanned(M, ROLE_SYNDICATE) || (job_rank && jobban_isbanned(M, job_rank))) /datum/antagonist/proc/replace_banned_player() set waitfor = FALSE - var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as a [name]?", "[name] the [job_rank]", 0, 100) + var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as a [name]?", job_rank, TRUE, 50) if(LAZYLEN(candidates)) var/mob/dead/observer/C = pick(candidates) to_chat(owner, "Your mob has been taken over by a ghost! Appeal your job ban if you want to avoid this in the future!") diff --git a/code/datums/antagonists/antag_helpers.dm b/code/datums/antagonists/antag_helpers.dm index d99920b9e21..134ba1d7d90 100644 --- a/code/datums/antagonists/antag_helpers.dm +++ b/code/datums/antagonists/antag_helpers.dm @@ -1,10 +1,10 @@ //Returns MINDS of the assigned antags of given type/subtypes -/proc/get_antag_minds(antag_type,specific = FALSE) +/proc/get_antag_minds(antag_type, specific = FALSE) . = list() for(var/datum/antagonist/A in GLOB.antagonists) if(!A.owner) continue - if(!antag_type || !specific && istype(A,antag_type) || specific && A.type == antag_type) + if(!antag_type || !specific && istype(A, antag_type) || specific && A.type == antag_type) . += A.owner //Get all teams [of type team_type] @@ -15,5 +15,5 @@ if(!A.owner) continue var/datum/team/T = A.get_team() - if(!team_type || istype(T,team_type)) + if(!team_type || istype(T, team_type)) . |= T \ No newline at end of file diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 2f4fff38f3b..8bc1034206e 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -1246,6 +1246,7 @@ var/datum/antagonist/A = has_antag_datum(datum_type) if(A) A.on_removal() + return TRUE /datum/mind/proc/remove_all_antag_datums() //For the Lazy amongst us. for(var/a in antag_datums)