diff --git a/code/WorkInProgress/computer3/computers/communications.dm b/code/WorkInProgress/computer3/computers/communications.dm
index 23b2540ade..20c29aaec4 100644
--- a/code/WorkInProgress/computer3/computers/communications.dm
+++ b/code/WorkInProgress/computer3/computers/communications.dm
@@ -124,7 +124,7 @@
 				return
 			if(authenticated)
 				call_shuttle_proc(usr)
-				if(emergency_shuttle.online)
+				if(emergency_shuttle.online())
 					post_status("shuttle")
 			state = STATE_DEFAULT
 		if("cancelshuttle" in href_list)
@@ -269,8 +269,8 @@
 	proc/main_menu()
 		var/dat = ""
 		if (computer.radio.subspace)
-			if(emergency_shuttle.online && emergency_shuttle.location==0)
-				var/timeleft = emergency_shuttle.timeleft()
+			if(emergency_shuttle.online() && emergency_shuttle.location())
+				var/timeleft = emergency_shuttle.estimate_arrival_time()
 				dat += "<B>Emergency shuttle</B>\n<BR>\nETA: [timeleft / 60 % 60]:[add_zero(num2text(timeleft % 60), 2)]<BR>"
 				refresh = 1
 			else
@@ -286,8 +286,8 @@
 					dat += "<BR>\[ <A HREF='?src=\ref[src];RestoreBackup'>Restore Backup Routing Data</A> \]"
 
 				dat += "<BR>\[ <A HREF='?src=\ref[src];changeseclevel'>Change alert level</A> \]"
-			if(emergency_shuttle.location==0)
-				if (emergency_shuttle.online)
+			if(emergency_shuttle.location())
+				if (emergency_shuttle.online())
 					dat += "<BR>\[ <A HREF='?src=\ref[src];cancelshuttle'>Cancel Shuttle Call</A> \]"
 				else
 					dat += "<BR>\[ <A HREF='?src=\ref[src];callshuttle'>Call Emergency Shuttle</A> \]"