From 7c8ebf7d88e02badf63742de1521294377f68202 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed, 10 Jul 2024 09:29:45 +0200
Subject: [PATCH] [MIRROR] Makes docked shuttle departure timer reset when a
 hostile environment threat is stopped (#28760)

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

## 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
:cl:
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.
/:cl:

* Makes docked shuttle departure timer reset when a hostile environment threat is stopped

---------

Co-authored-by: GoblinBackwards <22856555+GoblinBackwards@users.noreply.github.com>
---
 code/controllers/subsystem/shuttle.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm
index 938321c5cd9..de9de30a87b 100644
--- a/code/controllers/subsystem/shuttle.dm
+++ b/code/controllers/subsystem/shuttle.dm
@@ -543,7 +543,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(