More fixes?
This commit is contained in:
@@ -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, "<span class='bold large_brass'>You are a servant of Ratvar, the Clockwork Justiciar!</span>")
|
||||
|
||||
@@ -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()
|
||||
. = "<b><i>Central Command Status Summary</i></b><hr>"
|
||||
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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user