Extra jobban checks

code/game/gamemodes/autotraitor/autotraitor.dm

@@ -85,7 +85,7 @@
 				playercount += 1
 			if (player.client && player.mind && player.mind.special_role && player.stat != 2)
 				traitorcount += 1
-			if (player.client && player.mind && !player.mind.special_role && player.stat != 2 && ishuman(player) && (player.client && player.client.prefs.be_special & BE_TRAITOR) && !jobban_isbanned(player, "Syndicate"))
+			if (player.client && player.mind && !player.mind.special_role && player.stat != 2 && ishuman(player) && (player.client && player.client.prefs.be_special & BE_TRAITOR) && !jobban_isbanned(player, "traitor") && !jobban_isbanned(player, "Syndicate"))
 				possible_traitors += player
 		for(var/datum/mind/player in possible_traitors)
 			for(var/job in restricted_jobs)
@@ -152,7 +152,7 @@
 	if(emergency_shuttle.departed)
 		return
 	//message_admins("Late Join Check")
-	if((character.client && character.client.prefs.be_special & BE_TRAITOR) && !jobban_isbanned(character, "Syndicate"))
+	if((character.client && character.client.prefs.be_special & BE_TRAITOR) && !jobban_isbanned(character, "traitor") && !jobban_isbanned(character, "Syndicate"))
 		//message_admins("Late Joiner has Be Syndicate")
 		//message_admins("Checking number of players")
 		var/playercount = 0

code/game/gamemodes/blob/blobs/core.dm

@@ -72,7 +72,7 @@
 		var/list/candidates = list()
 
 		if(!new_overmind)
-			candidates = get_candidates(BE_BLOB,,"alien","Syndicate",1)
+			candidates = get_candidates(BE_BLOB,,"alien","Syndicate")
 			if(candidates.len)
 				C = pick(candidates)
 		else

code/game/gamemodes/events/space_ninja.dm

@@ -153,10 +153,7 @@ Malf AIs/silicons aren't added. Monkeys aren't added. Messes with objective comp
 	else
 
 		var/list/candidates = list()	//list of candidate keys
-		for(var/mob/G in respawnable_list)
-			if(G.client && !G.client.holder && !G.client.is_afk() && G.client.prefs.be_special & BE_NINJA)
-				if(!(G.mind && G.mind.current && G.mind.current.stat != DEAD))
-					candidates += G
+		candidates = get_candidates(BE_NINJA,,"ninja","Syndicate")
 		if(!candidates.len)	return
 		candidates = shuffle(candidates)//Incorporating Donkie's list shuffle
 

code/game/gamemodes/mutiny/mutiny.dm

@@ -81,9 +81,10 @@ datum/game_mode/mutiny
 		var/list/candidates[0]
 		for(var/mob/mutineer in player_list)
 			if(mutineer.client.prefs.be_special & BE_MUTINEER)
-				for(var/job in command_positions - "Captain")
-					if(mutineer.mind && mutineer.mind.assigned_role == job)
-						candidates+=mutineer.mind
+				if(!jobban_isbanned(mutineer, "mutineer") && !jobban_isbanned(mutineer,"Syndicate"))
+					for(var/job in command_positions - "Captain")
+						if(mutineer.mind && mutineer.mind.assigned_role == job)
+							candidates+=mutineer.mind
 		return candidates
 
 	proc/get_directive_candidates()

code/game/gamemodes/wizard/raginmages.dm

@@ -69,14 +69,11 @@
 	if(mages_made >= max_mages)
 		return 0
 	making_mage = 1
-	var/list/mob/dead/observer/candidates = list()
+	var/list/candidates = list()
 	var/mob/dead/observer/theghost = null
 	spawn(rand(200, 600))
 		message_admins("SWF is still pissed, sending another wizard - [max_mages - mages_made] left.")
-		for(var/mob/dead/observer/G in player_list)
-			if(G.client && !G.client.holder && !G.client.is_afk() && G.client.prefs.be_special & BE_WIZARD)
-				if(!jobban_isbanned(G, "wizard") && !jobban_isbanned(G, "Syndicate"))
-					candidates += G
+		candidates = get_candidates(BE_WIZARD,,"wizard","Syndicate")
 		if(!candidates.len)
 			message_admins("No applicable ghosts for the next ragin' mage, asking ghosts instead.")
 			var/time_passed = world.time

code/modules/admin/verbs/randomverbs.dm

@@ -223,7 +223,7 @@ proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0)
 		for(var/mob/M in player_list)
 			if(M.stat != DEAD)		continue	//we are not dead!
 			if(!M.client.prefs.be_special & BE_ALIEN)	continue	//we don't want to be an alium
-			if(jobban_isbanned(M, "alien")) continue //we are jobbanned
+			if(jobban_isbanned(M, "alien") || jobban_isbanned(M, "Syndicate")) continue //we are jobbanned
 			if(M.client.is_afk())	continue	//we are afk
 			if(M.mind && M.mind.current && M.mind.current.stat != DEAD)	continue	//we have a live body we are tied to
 			candidates += M.ckey

code/modules/mob/living/carbon/brain/posibrain.dm

@@ -34,7 +34,7 @@
 
 /obj/item/device/mmi/posibrain/proc/request_player()
 	for(var/mob/dead/observer/O in player_list)
-		if(O.client && O.client.prefs.be_special & BE_PAI)
+		if(O.client && O.client.prefs.be_special & BE_PAI && !jobban_isbanned(O, "Cyborg") && !jobban_isbanned(O,"nonhumandept"))
 			if(check_observer(O))
 				O << "\blue <b>\A [src] has been activated. (<a href='?src=\ref[O];jump=\ref[src]'>Teleport</a> | <a href='?src=\ref[src];signup=\ref[O]'>Sign Up</a>)"
 				//question(O.client)