From dfca7bf9937c070cb1e3507ebd252a45839466ca Mon Sep 17 00:00:00 2001 From: Mitchs98 Date: Thu, 23 Jun 2022 13:24:34 -0500 Subject: [PATCH] Antag-Banned Players No Longer Selected In 'Everyone Is a traitor' (#18048) * antagdenied * faeriechanges --- code/modules/admin/topic.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 6325036d4b8..ee49230406e 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -2868,9 +2868,12 @@ SSblackbox.record_feedback("tally", "admin_secrets_fun_used", 1, "Traitor All ([objective])") for(var/mob/living/carbon/human/H in GLOB.player_list) - if(H.stat == 2 || !H.client || !H.mind) continue - if(is_special_character(H)) continue - //traitorize(H, objective, 0) + if(H.stat == DEAD || !H.client || !H.mind) + continue + if(is_special_character(H)) + continue + if(jobban_isbanned(H, ROLE_TRAITOR) || jobban_isbanned(H, ROLE_SYNDICATE)) + continue H.mind.add_antag_datum(/datum/antagonist/traitor) for(var/mob/living/silicon/A in GLOB.player_list)