From 85d4f59cafbf503352ae29263285fe205f0f9b86 Mon Sep 17 00:00:00 2001
From: Tigercat2000 <nick.pilant2@gmail.com>
Date: Fri, 4 Dec 2015 22:32:38 -0800
Subject: [PATCH] Wow. Soft merge conflicts, in a way. Merging not causing a
 git error, but

instead, a compile error. Congrats TRAVIS, you are smarter than your
average CI.
---
 code/modules/mob/living/carbon/brain/brain.dm | 9 +++++----
 paradise.dme                                  | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm
index 4e9e7c4c63d..ea350268792 100644
--- a/code/modules/mob/living/carbon/brain/brain.dm
+++ b/code/modules/mob/living/carbon/brain/brain.dm
@@ -85,10 +85,11 @@ I'm using this for Stat to give it a more nifty interface to work with
 		statpanel("Status")
 		stat(null, "Station Time: [worldtime2text()]")
 
-		if(emergency_shuttle)
-			var/eta_status = emergency_shuttle.get_status_panel_eta()
-			if(eta_status)
-				stat(null, eta_status)
+		if(shuttle_master.emergency.mode >= SHUTTLE_RECALL)
+			var/timeleft = shuttle_master.emergency.timeLeft()
+			if(timeleft > 0)
+				stat(null, "[add_zero(num2text((timeleft / 60) % 60),2)]:[add_zero(num2text(timeleft % 60), 2)]")
+
 		if(client.statpanel == "Status")
 			//Knowing how well-off your mech is doing is really important as an MMI
 			if(istype(src.loc, /obj/mecha))
diff --git a/paradise.dme b/paradise.dme
index 99261c31d09..b0ee64dccd8 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -10,7 +10,7 @@
 #define DEBUG
 // END_PREFERENCES
 // BEGIN_INCLUDE
-#include "_maps\metastation.dm"
+#include "_maps\cyberiad.dm"
 #include "code\_compile_options.dm"
 #include "code\hub.dm"
 #include "code\stylesheet.dm"