From f2b7dba99006392cc795ee6d2e6fa651357ed583 Mon Sep 17 00:00:00 2001 From: keronshb Date: Wed, 15 Sep 2021 18:52:24 -0400 Subject: [PATCH] More fixes? --- code/game/gamemodes/clock_cult/clock_cult.dm | 2 +- code/game/gamemodes/dynamic/dynamic.dm | 7 +++++-- code/game/gamemodes/dynamic/dynamic_rulesets.dm | 2 +- code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm | 2 +- code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm | 3 ++- code/modules/antagonists/traitor/classes/human.dm | 2 -- code/modules/events/pirates.dm | 3 +++ code/modules/unit_tests/_unit_tests.dm | 2 +- tgstation.dme | 1 - 9 files changed, 14 insertions(+), 10 deletions(-) diff --git a/code/game/gamemodes/clock_cult/clock_cult.dm b/code/game/gamemodes/clock_cult/clock_cult.dm index 64ca226c2a..68d9f1f1b9 100644 --- a/code/game/gamemodes/clock_cult/clock_cult.dm +++ b/code/game/gamemodes/clock_cult/clock_cult.dm @@ -196,7 +196,7 @@ Credit where due: ..() return 1 -/datum/game_mode/clockwork_cult/proc/greet_servant(mob/M) //Description of their role +/datum/game_mode/proc/greet_servant(mob/M) //Description of their role if(!M) return 0 to_chat(M, "You are a servant of Ratvar, the Clockwork Justiciar!") diff --git a/code/game/gamemodes/dynamic/dynamic.dm b/code/game/gamemodes/dynamic/dynamic.dm index 9a50eae3cc..36932dd651 100644 --- a/code/game/gamemodes/dynamic/dynamic.dm +++ b/code/game/gamemodes/dynamic/dynamic.dm @@ -247,7 +247,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) return rule.round_result() return ..() -/datum/game_mode/dynamic/proc/send_intercept() +/datum/game_mode/dynamic/proc/send_intercept_dynamic() . = "Central Command Status Summary
" switch(round(shown_threat)) if(0 to 19) @@ -396,7 +396,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) addtimer(CALLBACK(src, /datum/game_mode/dynamic/.proc/execute_roundstart_rule, rule), rule.delay) if (!CONFIG_GET(flag/no_intercept_report)) - addtimer(CALLBACK(src, .proc/send_intercept), rand(waittime_l, waittime_h)) + addtimer(CALLBACK(src, .proc/send_intercept_dynamic), rand(waittime_l, waittime_h)) ..() @@ -584,7 +584,10 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) for (var/datum/dynamic_ruleset/rule in current_rules) if(rule.rule_process() == RULESET_STOP_PROCESSING) // If rule_process() returns 1 (RULESET_STOP_PROCESSING), stop processing. current_rules -= rule + midround_rule_draft() +/datum/game_mode/dynamic/proc/midround_rule_draft() + set waitfor = FALSE if (midround_injection_cooldown < world.time) if (GLOB.dynamic_forced_extended) return diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets.dm b/code/game/gamemodes/dynamic/dynamic_rulesets.dm index ef3773b7b6..1ab26a2566 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets.dm @@ -199,7 +199,7 @@ candidates.Remove(candidate_player) continue - else if(!mode.check_age(client, minimum_required_age)) + else if(!mode.check_age(candidate_client, minimum_required_age)) candidates.Remove(candidate_player) continue diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm index c41cd00aba..16fc4e5ef2 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -43,7 +43,7 @@ if (!M.client) // Are they connected? trimmed_list.Remove(M) continue - if(M.client.check_age(minimum_required_age) > 0) + if(!mode.check_age(M.client, minimum_required_age)) trimmed_list.Remove(M) continue if(antag_flag_override) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm index 54c24bee5b..a74f9c4eb3 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm @@ -470,7 +470,8 @@ for(var/datum/mind/M in assigned) var/datum/antagonist/clockcult/new_cultist = new antag_datum() new_cultist.clock_team = main_clockcult - new_cultist.SSticker.mode.equip_servant() + SSticker.mode.equip_servant(new_cultist) + SSticker.mode.greet_servant(new_cultist) M.add_antag_datum(new_cultist) return TRUE diff --git a/code/modules/antagonists/traitor/classes/human.dm b/code/modules/antagonists/traitor/classes/human.dm index 203ed37336..49881630f0 100644 --- a/code/modules/antagonists/traitor/classes/human.dm +++ b/code/modules/antagonists/traitor/classes/human.dm @@ -28,11 +28,9 @@ /datum/traitor_class/human/forge_single_objective(datum/antagonist/traitor/T) .=1 var/assassin_prob = 50 - var/is_dynamic = FALSE var/datum/game_mode/dynamic/mode if(istype(SSticker.mode,/datum/game_mode/dynamic)) mode = SSticker.mode - is_dynamic = TRUE assassin_prob = max(0,mode.threat_level-20) if(prob(assassin_prob)) var/list/active_ais = active_ais() diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm index d284146ea3..2d848ed4e3 100644 --- a/code/modules/events/pirates.dm +++ b/code/modules/events/pirates.dm @@ -83,6 +83,9 @@ priority_announce("Too late to beg for mercy!",sender_override = ship_name) /datum/round_event/pirates/start() + send_pirate_threat() + +/datum/round_event/pirates/proc/send_pirate_threat() if(threat_msg && !threat_msg.answered) threat_msg.possible_answers = list("Too late") threat_msg.answered = 1 diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm index 705b0aea4f..c7f69fcaf1 100644 --- a/code/modules/unit_tests/_unit_tests.dm +++ b/code/modules/unit_tests/_unit_tests.dm @@ -57,7 +57,7 @@ // #include "crayons.dm" // #include "create_and_destroy.dm" // #include "designs.dm" -// #include "dynamic_ruleset_sanity.dm" +#include "dynamic_ruleset_sanity.dm" // #include "egg_glands.dm" // #include "dynamic_ruleset_sanity.dm" // #include "emoting.dm" diff --git a/tgstation.dme b/tgstation.dme index b8f852aa53..0f53705172 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3630,7 +3630,6 @@ #include "code\modules\tgui_panel\tgui_panel.dm" #include "code\modules\tooltip\tooltip.dm" #include "code\modules\unit_tests\_unit_tests.dm" -#include "code\modules\unit_tests\dynamic_ruleset_sanity.dm" #include "code\modules\uplink\uplink_devices.dm" #include "code\modules\uplink\uplink_items.dm" #include "code\modules\uplink\uplink_purchase_log.dm"