From ced1e2437e823da419f9cc66cb7263816eede013 Mon Sep 17 00:00:00 2001
From: ShizCalev <ShizCalev@users.noreply.github.com>
Date: Sat, 30 Sep 2017 01:58:40 -0400
Subject: [PATCH] Corrected shuttle refuel time (#31108)

---
 code/controllers/subsystem/shuttle.dm |  2 +-
 tgstation.dme                         | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm
index 93ccb750070..0ec7c11f1d2 100644
--- a/code/controllers/subsystem/shuttle.dm
+++ b/code/controllers/subsystem/shuttle.dm
@@ -176,7 +176,7 @@ SUBSYSTEM_DEF(shuttle)
 		emergency = backup_shuttle
 	var/srd = CONFIG_GET(number/shuttle_refuel_delay)
 	if(world.time - SSticker.round_start_time < srd)
-		to_chat(user, "The emergency shuttle is refueling. Please wait [DisplayTimeText((world.time - SSticker.round_start_time) - srd)] before trying again.")
+		to_chat(user, "The emergency shuttle is refueling. Please wait [DisplayTimeText(srd - (world.time - SSticker.round_start_time))] before trying again.")
 		return
 
 	switch(emergency.mode)
diff --git a/tgstation.dme b/tgstation.dme
index d9d5c95e27b..7b833509372 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -158,18 +158,18 @@
 #include "code\_onclick\hud\robot.dm"
 #include "code\_onclick\hud\screen_objects.dm"
 #include "code\_onclick\hud\swarmer.dm"
-#include "code\controllers\configuration\entries\comms.dm"
-#include "code\controllers\configuration\entries\config.dm"
-#include "code\controllers\configuration\entries\dbconfig.dm"
-#include "code\controllers\configuration\entries\game_options.dm"
-#include "code\controllers\configuration\config_entry.dm"
-#include "code\controllers\configuration\configuration.dm"
 #include "code\controllers\admin.dm"
 #include "code\controllers\controller.dm"
 #include "code\controllers\failsafe.dm"
 #include "code\controllers\globals.dm"
 #include "code\controllers\master.dm"
 #include "code\controllers\subsystem.dm"
+#include "code\controllers\configuration\config_entry.dm"
+#include "code\controllers\configuration\configuration.dm"
+#include "code\controllers\configuration\entries\comms.dm"
+#include "code\controllers\configuration\entries\config.dm"
+#include "code\controllers\configuration\entries\dbconfig.dm"
+#include "code\controllers\configuration\entries\game_options.dm"
 #include "code\controllers\subsystem\acid.dm"
 #include "code\controllers\subsystem\air.dm"
 #include "code\controllers\subsystem\assets.dm"
@@ -2068,8 +2068,8 @@
 #include "code\modules\ruins\spaceruin_code\TheDerelict.dm"
 #include "code\modules\security_levels\keycard_authentication.dm"
 #include "code\modules\security_levels\security_levels.dm"
-#include "code\modules\server_tools\st_interface.dm"
 #include "code\modules\server_tools\st_commands.dm"
+#include "code\modules\server_tools\st_interface.dm"
 #include "code\modules\shuttle\arrivals.dm"
 #include "code\modules\shuttle\assault_pod.dm"
 #include "code\modules\shuttle\computer.dm"