From f7361c205947159e2f1d593eb62c44d9f399ae67 Mon Sep 17 00:00:00 2001 From: Putnam Date: Tue, 19 Nov 2019 21:58:55 -0800 Subject: [PATCH 1/2] Made sure every dynamic-controlled event doesn't randomly trigger on dynamic. --- code/game/gamemodes/dynamic/dynamic_rulesets_events.dm | 2 +- code/modules/events/major_dust.dm | 1 + code/modules/events/meteor_wave.dm | 1 + code/modules/events/processor_overload.dm | 1 + 4 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 a20022cb71..4299bc0ad5 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm @@ -270,7 +270,7 @@ repeatable = TRUE /datum/dynamic_ruleset/event/processor_overload - name = "Processer Overload" + name = "Processor Overload" config_tag = "processor_overload" typepath = /datum/round_event/processor_overload cost = 4 diff --git a/code/modules/events/major_dust.dm b/code/modules/events/major_dust.dm index d7d8f1aec8..c594d7b3c0 100644 --- a/code/modules/events/major_dust.dm +++ b/code/modules/events/major_dust.dm @@ -2,6 +2,7 @@ name = "Major Space Dust" typepath = /datum/round_event/meteor_wave/major_dust weight = 8 + gamemode_blacklist = list("dynamic") /datum/round_event/meteor_wave/major_dust wave_name = "space dust" diff --git a/code/modules/events/meteor_wave.dm b/code/modules/events/meteor_wave.dm index 31ea9dcb03..9ae7262d15 100644 --- a/code/modules/events/meteor_wave.dm +++ b/code/modules/events/meteor_wave.dm @@ -10,6 +10,7 @@ min_players = 15 max_occurrences = 3 earliest_start = 25 MINUTES + dynamic_blacklist = list("dynamic") /datum/round_event/meteor_wave startWhen = 6 diff --git a/code/modules/events/processor_overload.dm b/code/modules/events/processor_overload.dm index 74d9bb273e..67848bf941 100644 --- a/code/modules/events/processor_overload.dm +++ b/code/modules/events/processor_overload.dm @@ -3,6 +3,7 @@ typepath = /datum/round_event/processor_overload weight = 15 min_players = 20 + gamemode_blacklist = list("dynamic") /datum/round_event/processor_overload announceWhen = 1 From 0d297e92c71cca9cd321dcc652779be3d8fc3c40 Mon Sep 17 00:00:00 2001 From: Putnam Date: Tue, 19 Nov 2019 22:02:06 -0800 Subject: [PATCH 2/2] read words --- code/modules/events/meteor_wave.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/events/meteor_wave.dm b/code/modules/events/meteor_wave.dm index 9ae7262d15..26591547c0 100644 --- a/code/modules/events/meteor_wave.dm +++ b/code/modules/events/meteor_wave.dm @@ -10,7 +10,7 @@ min_players = 15 max_occurrences = 3 earliest_start = 25 MINUTES - dynamic_blacklist = list("dynamic") + gamemode_blacklist = list("dynamic") /datum/round_event/meteor_wave startWhen = 6