From 4938774f5aafe41ec4efb7ea52b24132b2642fa0 Mon Sep 17 00:00:00 2001 From: DragonTrance Date: Sat, 8 May 2021 17:47:00 -0700 Subject: [PATCH] Blacklist Space Pirates and Swarmers from layenia --- code/game/gamemodes/dynamic/dynamic_rulesets_events.dm | 4 +++- code/modules/events/pirates.dm | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm index 851dc856..195b9ec3 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm @@ -14,7 +14,7 @@ var/list/dead_players = list() var/list/list_observers = list() 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 + var/list/map_whitelist = list() //Blacklist/Whitelist does not check round event controllers, they are separate vars and are handled outside of dynamic mode /datum/dynamic_ruleset/event/acceptable(population=0, threat_level=0) if (map_blacklist.len && (map_blacklist.Find(SSmapping.config.map_file))) @@ -119,6 +119,7 @@ high_population_requirement = 15 occurances_max = 1 chaos_min = 2.0 + map_blacklist = list("LayeniaStation.dmm") /datum/dynamic_ruleset/event/pirates/ready(forced = FALSE) if (!SSmapping.empty_space) @@ -563,6 +564,7 @@ //property_weights = list("extended" = -2) occurances_max = 1 chaos_min = 1.5 + map_blacklist = list("LayeniaStation.dmm") /datum/dynamic_ruleset/event/sentient_disease name = "Sentient Disease" diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm index 9639a2de..df5e85a3 100644 --- a/code/modules/events/pirates.dm +++ b/code/modules/events/pirates.dm @@ -6,6 +6,7 @@ min_players = 15 earliest_start = 50 MINUTES gamemode_blacklist = list("nuclear") + map_blacklist = list("LayeniaStation.dmm") /datum/round_event_control/pirates/preRunEvent() if (!SSmapping.empty_space)