From 0c2d0aa88a76f0f437869446443a83d4f66d733a Mon Sep 17 00:00:00 2001
From: Bloop <13398309+vinylspiders@users.noreply.github.com>
Date: Sat, 6 Jan 2024 07:18:27 -0500
Subject: [PATCH] [MISSED MIRROR] [NO GBP] Fix hub shuttle time (#80819) (#334)

[NO GBP] Fix hub shuttle time (#80819)

Was showing a constant "Shuttle: 00:10" in hub
hopefully should no longer show shuttle info if it hasn't actually been
called yet

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
fix: Hub shuttle time works correctly
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

Co-authored-by: 13spacemen <46101244+13spacemen@users.noreply.github.com>
---
 code/game/world.dm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/game/world.dm b/code/game/world.dm
index e1a7a8ccab3..504055da7f2 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -382,6 +382,8 @@ GLOBAL_VAR(restart_counter)
 		new_status += ": [jointext(features, ", ")]"
 
 	new_status += "<br>Time: <b>[gameTimestamp("hh:mm")]</b>"
+	if(SSshuttle?.emergency && SSshuttle?.emergency?.mode != (SHUTTLE_IDLE || SHUTTLE_ENDGAME))
+		new_status += " | Shuttle: <b>[SSshuttle.emergency.getModeStr()] [SSshuttle.emergency.getTimerStr()]</b>"
 	if(SSmapping.config)
 		new_status += "<br>Map: <b>[SSmapping.config.map_path == CUSTOM_MAP_PATH ? "Uncharted Territory" : SSmapping.config.map_name]</b>"
 	var/alert_text = SSsecurity_level.get_current_level_as_text()