Fixed some dynamic bugs (#47763)

This commit is contained in:
skoglol
2019-11-16 18:35:07 +01:00
committed by AnturK
parent f6ee8bc4ae
commit 1d41c026ca
3 changed files with 5 additions and 4 deletions
+1 -1
View File
@@ -531,7 +531,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
if(!rule.repeatable)
if(rule.ruletype == "Latejoin")
latejoin_rules = remove_from_list(latejoin_rules, rule.type)
else if(rule.type == "Midround")
else if(rule.ruletype == "Midround")
midround_rules = remove_from_list(midround_rules, rule.type)
addtimer(CALLBACK(src, /datum/game_mode/dynamic/.proc/execute_midround_latejoin_rule, rule), rule.delay)
@@ -68,9 +68,9 @@
if (!forced)
var/job_check = 0
if (enemy_roles.len > 0)
for (var/mob/M in living_players)
if (M.stat == DEAD)
continue // Dead players cannot count as opponents
for (var/mob/M in mode.current_players[CURRENT_LIVING_PLAYERS])
if (M.stat == DEAD || !M.client)
continue // Dead/disconnected players cannot count as opponents
if (M.mind && M.mind.assigned_role && (M.mind.assigned_role in enemy_roles) && (!(M in candidates) || (M.mind.assigned_role in restricted_roles)))
job_check++ // Checking for "enemies" (such as sec officers). To be counters, they must either not be candidates to that rule, or have a job that restricts them from it
+1
View File
@@ -137,3 +137,4 @@ shizcalev = Game Master
NicBR = Game Master
LoserWasTaken = Game Master
Fikou = Game Master
Skoglol = Game Master