From 8f1e330d2eacfaa182ae734aea9b48789ed40bc7 Mon Sep 17 00:00:00 2001 From: Jeremiah <42397676+jlsnow301@users.noreply.github.com> Date: Thu, 2 Nov 2023 18:52:42 -0700 Subject: [PATCH] Fixes observer mind selection [NO GBP] (#79471) ## About The Pull Request Oopsie doopsie: Observers don't have minds, so this excluded them from midround ## Why It's Good For The Game More midround candidates Fixes #79437 ## Changelog :cl: fix: Fixes midround selection for observers /:cl: --- code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm index a18cb3cdad2..6a6ae0a5874 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -61,9 +61,6 @@ if (isnull(creature.client)) // Are they connected? trimmed_list.Remove(creature) continue - if (isnull(creature.mind)) - trimmed_list.Remove(creature) - continue if(creature.client.get_remaining_days(minimum_required_age) > 0) trimmed_list.Remove(creature) continue @@ -73,6 +70,10 @@ if (is_banned_from(creature.ckey, list(antag_flag_override || antag_flag, ROLE_SYNDICATE))) trimmed_list.Remove(creature) continue + + if (isnull(creature.mind)) + continue + if (restrict_ghost_roles && (creature.mind.assigned_role.title in GLOB.exp_specialmap[EXP_TYPE_SPECIAL])) // Are they playing a ghost role? trimmed_list.Remove(creature) continue