From b432248f46370ef3447e49c67b4335c9e0136bfe Mon Sep 17 00:00:00 2001 From: Archie Date: Sun, 30 May 2021 20:20:14 -0300 Subject: [PATCH] Autotraitor piggyback --- code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm index 06b6e80e..240ef54d 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -259,11 +259,13 @@ if(is_centcom_level(player.z)) living_players -= player // We don't autotator people in CentCom continue - if(is_away_level(player.z)) - living_players -= player //We also don't autotator people in exiled roles / VR - continue if(player.mind && (player.mind.special_role || player.mind.antag_datums?.len > 0)) living_players -= player // We don't autotator people with roles already + continue + if(ishuman(player)) + var/mob/living/carbon/human/H = player + if(HAS_TRAIT(H,GHOSTROLE_TRAIT)) + living_players -= player //We also don't fucking give ghost roles traitor /datum/dynamic_ruleset/midround/autotraitor/ready(forced = FALSE) if (required_candidates > living_players.len)