From dee7f063c13c5a97cb34e331ebaa18a997095f04 Mon Sep 17 00:00:00 2001 From: Charlie Nolan Date: Sat, 23 Aug 2025 09:37:54 -0700 Subject: [PATCH] Fix roundstart antags with dynamic. (#30233) --- code/game/gamemodes/dynamic/antag_rulesets.dm | 5 ++++- data/mode.txt | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/dynamic/antag_rulesets.dm b/code/game/gamemodes/dynamic/antag_rulesets.dm index f37f2a59383..531b27767a2 100644 --- a/code/game/gamemodes/dynamic/antag_rulesets.dm +++ b/code/game/gamemodes/dynamic/antag_rulesets.dm @@ -112,7 +112,10 @@ return antag_cost * antag_amount // shitty refund for now /datum/ruleset/proc/roundstart_can_apply(datum/mind/antag) - if(EXCLUSIVE_OR(antag.current.client.prefs.active_character.species in banned_species, banned_species_only)) + var/client/antag_client = GLOB.directory[ckey(antag.key)] + if(!antag_client) + CRASH("Null client for key [antag.key] during dynamic antag assignment.") + if(EXCLUSIVE_OR(antag_client.prefs.active_character.species in banned_species, banned_species_only)) SEND_SIGNAL(src, COMSIG_RULESET_FAILED_SPECIES) return FALSE if(antag.special_role) // You can only have 1 antag roll at a time, sorry diff --git a/data/mode.txt b/data/mode.txt index ef18df98db4..380a834a99b 100644 --- a/data/mode.txt +++ b/data/mode.txt @@ -1 +1 @@ -extended +dynamic