Skip to content

Commit

Permalink
fix auto recall warnings not made during combat
Browse files Browse the repository at this point in the history
The reminder stacks were increased but the increase would not be commnunicated to the players if they were in combat during it, leading to auto recall announcements being missable.
  • Loading branch information
Kenionatus committed Jun 3, 2024
1 parent 569df41 commit 3c39584
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions nsv13/code/controllers/subsystem/overmap_mode.dm
Original file line number Diff line number Diff line change
Expand Up @@ -241,12 +241,7 @@ SUBSYSTEM_DEF(overmap_mode)
else // I don't know what happened but let's go around again
objective_reminder_stacks = 0
else
var/obj/structure/overmap/OM = SSstar_system.find_main_overmap()
var/datum/star_system/S = SSstar_system.return_system
if(length(OM.current_system?.enemies_in_system))
if(objective_reminder_stacks == 3)
priority_announce("Auto-recall to [S.name] will occur once you are out of combat.", "[mode.reminder_origin]")
return // Don't send them home while there are enemies to kill
switch(objective_reminder_stacks) //Less Stacks Here, Prevent The Post-Round Stalling
if(1)
priority_announce("Auto-recall to [S.name] will occur in [(mode.objective_reminder_interval * 2) / 600] Minutes.", "[mode.reminder_origin]")
Expand All @@ -255,6 +250,10 @@ SUBSYSTEM_DEF(overmap_mode)
priority_announce("Auto-recall to [S.name] will occur in [(mode.objective_reminder_interval * 1) / 600] Minutes.", "[mode.reminder_origin]")

else
var/obj/structure/overmap/OM = SSstar_system.find_main_overmap()
if(length(OM.current_system?.enemies_in_system))
priority_announce("Auto-recall to [S.name] will occur once you are out of combat.", "[mode.reminder_origin]")
return // Don't send them home while there are enemies to kill
priority_announce("Auto-recall to [S.name] activated, additional objective aborted.", "[mode.reminder_origin]")
mode.victory()

Expand Down

0 comments on commit 3c39584

Please sign in to comment.