From 0c9557c2d29773687a37c90e595e53b5c873c8a4 Mon Sep 17 00:00:00 2001 From: DragonTrance Date: Wed, 5 May 2021 20:52:41 -0700 Subject: [PATCH] Update dynamic_rulesets_events.dm --- .../game/gamemodes/dynamic/dynamic_rulesets_events.dm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm index d4ba88e5..851dc856 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm @@ -16,13 +16,16 @@ var/list/map_blacklist = list() //Determines if a map, "BoxStation.dmm" for example, will spawn. Has to be case-sensitive var/list/map_whitelist = list() //Blacklist/Whitelist does not check round event controllers, they are separate vars +/datum/dynamic_ruleset/event/acceptable(population=0, threat_level=0) + if (map_blacklist.len && (map_blacklist.Find(SSmapping.config.map_file))) + return FALSE + if (map_whitelist.len && !(map_whitelist.Find(SSmapping.config.map_file))) + return FALSE + return ..() + /datum/dynamic_ruleset/event/ready(forced = 0) if (!forced) var/job_check = 0 - if (map_blacklist.len && (map_blacklist.Find(SSmapping.config.map_file))) - return FALSE - if (map_whitelist.len && !(map_whitelist.Find(SSmapping.config.map_file))) - return FALSE if (enemy_roles.len > 0) for (var/mob/M in mode.current_players[CURRENT_LIVING_PLAYERS]) if (M.stat == DEAD)