From 9fa40f4f1d54ddc72248c13f33eab72460352e50 Mon Sep 17 00:00:00 2001 From: Bilbo367 <163439532+Bilbo367@users.noreply.github.com> Date: Sun, 17 Mar 2024 14:49:11 -0600 Subject: [PATCH] DeathMatch Rolling Antag Fix (#82030) ## About The Pull Request Gives Deathmatch players the TRAIT_TEMPORARY_BODY which is checked during antag rolls while trimming candidates. ## Why It's Good For The Game Closes https://github.com/tgstation/tgstation/issues/81725 ## Changelog :cl: fix: Deathmatch players should no longer be able to roll any midround antagonist. /:cl: --------- Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> --- .../subsystem/dynamic/dynamic_rulesets_midround.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/controllers/subsystem/dynamic/dynamic_rulesets_midround.dm b/code/controllers/subsystem/dynamic/dynamic_rulesets_midround.dm index e4c580f535a..5a911d9265b 100644 --- a/code/controllers/subsystem/dynamic/dynamic_rulesets_midround.dm +++ b/code/controllers/subsystem/dynamic/dynamic_rulesets_midround.dm @@ -72,11 +72,9 @@ 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? + if (restrict_ghost_roles && !(creature.mind.assigned_role.job_flags & JOB_CREW_MEMBER)) // Are they not playing a station role? trimmed_list.Remove(creature) continue if (creature.mind.assigned_role.title in restricted_roles) // Does their job allow it?