From 30345725d21ff32eca361826bd305d83d5819bdf Mon Sep 17 00:00:00 2001 From: harryob Date: Sat, 9 Nov 2024 15:57:45 +0000 Subject: [PATCH] fixes some dynamic rulesets purging their candidate pools (#87760) ## About The Pull Request autotator, malf and blob's candidates would all get wiped out by this, as `can_roll_midround()` returns TRUE if they can roll midround ## Why It's Good For The Game seems like we want candidates in these roles, given the game is trying to get some ## Changelog :cl: fix: dynamic rulesets can get candidates for their roles /:cl: fixes #87535 --- .../subsystem/dynamic/dynamic_rulesets_midround.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/controllers/subsystem/dynamic/dynamic_rulesets_midround.dm b/code/controllers/subsystem/dynamic/dynamic_rulesets_midround.dm index e50794aa6d3..8d054026768 100644 --- a/code/controllers/subsystem/dynamic/dynamic_rulesets_midround.dm +++ b/code/controllers/subsystem/dynamic/dynamic_rulesets_midround.dm @@ -261,7 +261,7 @@ candidates -= player else if(is_centcom_level(player.z)) candidates -= player // We don't autotator people in CentCom - else if(player.mind && (player.mind.special_role || player.mind.can_roll_midround())) + else if(player.mind && (player.mind.special_role || !player.mind.can_roll_midround())) candidates -= player // We don't autotator people with roles already /datum/dynamic_ruleset/midround/from_living/autotraitor/execute() @@ -310,7 +310,7 @@ continue if(isnull(player.mind)) continue - if(player.mind.special_role || player.mind.can_roll_midround()) + if(player.mind.special_role || !player.mind.can_roll_midround()) continue candidates += player @@ -479,7 +479,7 @@ candidates -= player continue - if(player.mind && (player.mind.special_role || player.mind.can_roll_midround())) + if(player.mind && (player.mind.special_role || !player.mind.can_roll_midround())) candidates -= player /datum/dynamic_ruleset/midround/from_living/blob_infection/execute()