From 620721e89e17efe586b1147b3f0298931517bd60 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Sat, 23 Oct 2021 19:59:12 -0700 Subject: [PATCH] No more "WE NEED ANTAGS" rolls --- code/game/gamemodes/dynamic/dynamic.dm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/code/game/gamemodes/dynamic/dynamic.dm b/code/game/gamemodes/dynamic/dynamic.dm index a102994328..9eb563895d 100644 --- a/code/game/gamemodes/dynamic/dynamic.dm +++ b/code/game/gamemodes/dynamic/dynamic.dm @@ -669,14 +669,15 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) return 100 var/chance = 0 var/max_pop_per_antag = max(5,15 - round(threat_level/10) - round(current_players[CURRENT_LIVING_PLAYERS].len/5)) - if (!current_players[CURRENT_LIVING_ANTAGS].len) - chance += 50 // No antags at all? let's boost those odds! - else - var/current_pop_per_antag = current_players[CURRENT_LIVING_PLAYERS].len / current_players[CURRENT_LIVING_ANTAGS].len - if (current_pop_per_antag > max_pop_per_antag) - chance += min(50, 25+10*(current_pop_per_antag-max_pop_per_antag)) + if(!GLOB.dynamic_extended) //we're allowed to spend a long time with no antags if extended is voted + if (!current_players[CURRENT_LIVING_ANTAGS].len) + chance += 50 // No antags at all? let's boost those odds! else - chance += 25-10*(max_pop_per_antag-current_pop_per_antag) + var/current_pop_per_antag = current_players[CURRENT_LIVING_PLAYERS].len / current_players[CURRENT_LIVING_ANTAGS].len + if (current_pop_per_antag > max_pop_per_antag) + chance += min(50, 25+10*(current_pop_per_antag-max_pop_per_antag)) + else + chance += 25-10*(max_pop_per_antag-current_pop_per_antag) if (current_players[CURRENT_DEAD_PLAYERS].len > current_players[CURRENT_LIVING_PLAYERS].len) chance -= 30 // More than half the crew died? ew, let's calm down on antags if (mid_round_budget > higher_injection_chance_minimum_threat)