Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix auto recall warnings not made during combat #2673

Merged
merged 1 commit into from
Aug 16, 2024
Merged

fix auto recall warnings not made during combat #2673

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions nsv13/code/controllers/subsystem/overmap_mode.dm
View file
Open in desktop
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
Loading