diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm index 3fb8ac55..715e11a2 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm @@ -14,18 +14,15 @@ var/list/dead_players = list() var/list/list_observers = list() -/datum/dynamic_ruleset/event/acceptable(population=0, threat=0) - if(istype(controller, /datum/round_event_control)) - var/datum/round_event_control/R = controller - if(R.map_blacklist.len && (SSmapping.config.map_file in R.map_blacklist)) //Apparently dynamic doesn't call a controller's canSpawnEvent :> - return FALSE - if(R.map_whitelist.len && !(SSmapping.config.map_file in R.map_whitelist)) - return FALSE - return ..() - /datum/dynamic_ruleset/event/ready(forced = 0) if (!forced) var/job_check = 0 + if (istype(controller, /datum/round_event_control)) + var/datum/round_event_control/R = controller + if (R.map_blacklist.len && (SSmapping.config.map_file in R.map_blacklist)) + return FALSE + if (R.map_whitelist.len && !(SSmapping.config.map_file in R.map_whitelist)) + return FALSE if (enemy_roles.len > 0) for (var/mob/M in mode.current_players[CURRENT_LIVING_PLAYERS]) if (M.stat == DEAD)