cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes docked shuttle departure timer reset when a hostile environment threat is stopped (#84771)

Browse Source 
## About The Pull Request
Changes hostile environments so that if the shuttle is docked then the
ETD timer will be reset when the threat is stopped.
## Why It's Good For The Game
Right now, if you end a hostile environment threat before the shuttle
timer goes to ERR the timer won't reset, which often leaves the people
who went to deal with the threat unable to get back to the shuttle in
time, which really sucks. People shouldn't be punished for stopping a
threat.
## Changelog
🆑
qol: Docked emergency shuttles will always reset their departure timer
when a hostile environment is stopped, regardless of if the timer
displays ETD or ERR.
/🆑
This commit is contained in:
GoblinBackwards
2024-07-09 16:04:05 -06:00
committed by GitHub
parent e4015a6f7f
commit 9f7d165d6f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/shuttle.dm
+1 -1
View File
@@ -527,7 +527,7 @@ SUBSYSTEM_DEF(shuttle)
sender_override = "Emergency Shuttle Uplink Alert",
color_override = "grey",
)
if(!emergency_no_escape && (emergency.mode == SHUTTLE_STRANDED))
if(!emergency_no_escape && (emergency.mode == SHUTTLE_STRANDED || emergency.mode == SHUTTLE_DOCKED))
emergency.mode = SHUTTLE_DOCKED
emergency.setTimer(emergency_dock_time)
priority_announce(