From 40dd37a85800df60421bb0e3e463a740d6276044 Mon Sep 17 00:00:00 2001 From: Putnam Date: Sun, 10 Nov 2019 19:00:24 -0800 Subject: [PATCH] all roundstarts are delayed now --- .../gamemodes/dynamic/dynamic_rulesets_roundstart.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm index aed9995f0a..bd7619d9cb 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm @@ -47,7 +47,7 @@ // // ////////////////////////////////////////////// -/datum/dynamic_ruleset/roundstart/delayed/malf_ai +/datum/dynamic_ruleset/roundstart/malf_ai name = "Malfunctioning AI" config_tag = "malf_ai" antag_datum = /datum/antagonist/traitor @@ -61,9 +61,10 @@ requirements = list(101,101,101,100,90,80,70,60,50,50) high_population_requirement = 50 required_type = /mob/living/silicon/ai + delay = 30 SECONDS var/autotraitor_cooldown = 450 // 15 minutes (ticks once per 2 sec) -/datum/dynamic_ruleset/roundstart/delayed/malf_ai/trim_candidates() +/datum/dynamic_ruleset/roundstart/malf_ai/trim_candidates() ..() candidates = candidates[CURRENT_LIVING_PLAYERS] for(var/mob/living/player in candidates) @@ -76,7 +77,7 @@ if(player.mind && (player.mind.special_role || player.mind.antag_datums?.len > 0)) candidates -= player -/datum/dynamic_ruleset/roundstart/delayed/malf_ai/execute() +/datum/dynamic_ruleset/roundstart/malf_ai/execute() if(!candidates || !candidates.len) return FALSE var/mob/living/silicon/ai/M = pick(candidates) @@ -87,7 +88,7 @@ M.mind.add_antag_datum(AI) return TRUE -/datum/dynamic_ruleset/roundstart/delayed/malf_ai/rule_process() +/datum/dynamic_ruleset/roundstart/malf_ai/rule_process() if (autotraitor_cooldown > 0) autotraitor_cooldown-- else