diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm
index 72f2acb48ca..7c43e3c8e62 100644
--- a/code/game/machinery/status_display.dm
+++ b/code/game/machinery/status_display.dm
@@ -1,5 +1,6 @@
 #define FONT_SIZE "5pt"
 #define FONT_COLOR "#09f"
+#define WARNING_FONT_COLOR "#f90"
 #define FONT_STYLE "Arial Black"
 #define SCROLL_SPEED 2
 
@@ -21,7 +22,7 @@
 					// 1 = Shuttle timer
 					// 2 = Arbitrary message(s)
 					// 3 = alert picture
-					// 4 = Supply shuttle timer
+					// 4 = Station time
 
 	var/picture_state	// icon_state of alert picture
 	var/message1 = ""	// message line 1
@@ -88,25 +89,25 @@
 			return 1
 		if(STATUS_DISPLAY_TRANSFER_SHUTTLE_TIME)				//emergency shuttle timer
 			if(shuttle_master.emergency.timer)
-				var/line1
-				var/line2 = get_shuttle_timer()
+				message2 = get_shuttle_timer()
 				switch(shuttle_master.emergency.mode)
-					if(SHUTTLE_RECALL)
-						line1 = "-RCL-"
+					if(SHUTTLE_RECALL, SHUTTLE_ESCAPE)
+						message1 = "-ETR-"
 					if(SHUTTLE_CALL)
-						line1 = "-ETA-"
+						message1 = "-ETA-"
 					if(SHUTTLE_DOCKED)
-						line1 = "-ETD-"
-					if(SHUTTLE_ESCAPE)
-						line1 = "-ESC-"
-					if(SHUTTLE_STRANDED)
-						line1 = "-ERR-"
-						line2 = "??:??"
-				if(length(line2) > CHARS_PER_LINE)
-					line2 = "Error!"
-				update_display(line1, line2)
+						message1 = "-ETD-"
+					else
+						message1 = "-ERR-"
+						message2 = "??:??"
+				if(length(message2) > CHARS_PER_LINE)
+					message2 = "Error!"
+				update_display(message1, message2, 1)
 			else
-				remove_display()
+				message1 = "TIME"
+				message2 = worldtime2text()
+				update_display(message1, message2)
+			return 1
 		if(STATUS_DISPLAY_MESSAGE)	//custom messages
 			var/line1
 			var/line2
@@ -162,8 +163,8 @@
 	remove_display()
 	overlays += image('icons/obj/status_display.dmi', icon_state=picture_state)
 
-/obj/machinery/status_display/proc/update_display(line1, line2)
-	var/new_text = {"<div style="font-size:[FONT_SIZE];color:[FONT_COLOR];font:'[FONT_STYLE]';text-align:center;" valign="top">[line1]<br>[line2]</div>"}
+/obj/machinery/status_display/proc/update_display(line1, line2, warning = 0)
+	var/new_text = {"<div style="font-size:[FONT_SIZE];color:[warning ? WARNING_FONT_COLOR : FONT_COLOR];font:'[FONT_STYLE]';text-align:center;" valign="top">[line1]<br>[line2]</div>"}
 	if(maptext != new_text)
 		maptext = new_text
 
@@ -291,7 +292,8 @@
 	overlays += image('icons/obj/status_display.dmi', icon_state=picture_state)
 
 #undef CHARS_PER_LINE
-#undef FOND_SIZE
+#undef FONT_SIZE
 #undef FONT_COLOR
+#undef WARNING_FONT_COLOR
 #undef FONT_STYLE
 #undef SCROLL_SPEED
\ No newline at end of file
diff --git a/code/game/machinery/supply_display.dm b/code/game/machinery/supply_display.dm
index 13cf95708b8..2bc51b495f3 100644
--- a/code/game/machinery/supply_display.dm
+++ b/code/game/machinery/supply_display.dm
@@ -4,19 +4,20 @@
 
 /obj/machinery/status_display/supply_display/update()
 	if(!..() && mode == STATUS_DISPLAY_CUSTOM)
-		var/line1
-		var/line2
 		if(shuttle_master.supply.mode == SHUTTLE_IDLE)
 			if(shuttle_master.supply.z == ZLEVEL_STATION)
-				line1 = "CARGO"
-				line2 = "Docked"
+				message1 = "CARGO"
+				message2 = "Docked"
+			else
+				message1 = "TIME"
+				message2 = worldtime2text()
 		else
-			line1 = "CARGO"
-			line2 = get_supply_shuttle_timer()
-			if(lentext(line2) > CHARS_PER_LINE)
-				line2 = "Error"
+			message1 = "CARGO"
+			message2 = get_supply_shuttle_timer()
+			if(lentext(message2) > CHARS_PER_LINE)
+				message2 = "Error"
 
-		update_display(line1, line2)
+		update_display(message1, message2)
 		return 1
 	return 0