Comments

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!")

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

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)