From bbcf91f88c2b3e6ec8d601f849009ab661b638ca Mon Sep 17 00:00:00 2001 From: Putnam Date: Tue, 12 Nov 2019 23:02:59 -0800 Subject: [PATCH] blacklisted blob from clock cult, latejoin revs now higher req threat --- code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm | 4 ++-- code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm | 1 + config/dynamic_config.txt | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm index 3b01136ebd..5810fd0ae0 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm @@ -90,8 +90,8 @@ weight = 2 delay = 1 MINUTES // Prevents rule start while head is offstation. cost = 20 - requirements = list(101,101,70,40,30,20,20,20,20,20) - high_population_requirement = 50 + requirements = list(101,101,70,40,40,40,40,40,40,40) + high_population_requirement = 40 flags = HIGHLANDER_RULESET var/required_heads_of_staff = 3 var/finished = FALSE diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm index 4e5406e2db..cc94408c80 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -366,6 +366,7 @@ enemy_roles = list("Security Officer", "Detective", "Head of Security", "Captain") required_enemies = list(3,3,2,2,2,1,1,1,1,0) required_candidates = 1 + blocking_rules = list(/datum/dynamic_ruleset/roundstart/clockcult) weight = 4 cost = 10 requirements = list(101,101,101,80,60,50,50,50,50,50) diff --git a/config/dynamic_config.txt b/config/dynamic_config.txt index 0d43e67636..921a630564 100644 --- a/config/dynamic_config.txt +++ b/config/dynamic_config.txt @@ -204,7 +204,7 @@ DYNAMIC_REQUIREMENTS RADIATION_STORM 5 5 5 5 5 5 5 5 5 5 ## Latejoin antags DYNAMIC_REQUIREMENTS LATEJOIN_TRAITOR 40 30 20 15 15 15 15 15 15 15 -DYNAMIC_REQUIREMENTS LATEJOIN_REVOLUTION 101 101 70 40 30 20 20 20 20 20 +DYNAMIC_REQUIREMENTS LATEJOIN_REVOLUTION 101 101 70 40 40 40 40 40 40 40 ## An alternative, static requirement used instead when pop is over mode's high_pop_limit. DYNAMIC_HIGH_POPULATION_REQUIREMENT TRAITOR 50