From cf05d11854caead50a4070f9f7771d730c4a2e9e Mon Sep 17 00:00:00 2001 From: mwerezak Date: Tue, 1 Jul 2014 22:18:04 -0400 Subject: [PATCH] Status displays now won't blank when undocking, too --- code/game/machinery/status_display.dm | 8 ++++---- code/game/objects/items/devices/PDA/cart.dm | 2 +- code/game/supplyshuttle.dm | 8 ++++---- code/modules/shuttles/shuttle_ferry.dm | 4 ++++ code/modules/shuttles/shuttle_supply.dm | 4 ---- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index a2d49758537..f965cad7be7 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -82,7 +82,7 @@ if(emergency_shuttle.waiting_to_leave()) var/line1 = "-ETD-" var/line2 - if (emergency_shuttle.shuttle.moving_status == SHUTTLE_WARMUP) + if (emergency_shuttle.shuttle.is_launching()) line2 = "Launch" else line2 = get_shuttle_timer_departure() @@ -126,11 +126,11 @@ var/datum/shuttle/ferry/supply/shuttle = supply_controller.shuttle if (!shuttle) line2 = "Error" - else if(shuttle.has_eta()) + else if(shuttle.has_arrive_time()) line2 = get_supply_shuttle_timer() if(lentext(line2) > CHARS_PER_LINE) line2 = "Error" - else if (shuttle.moving_status == SHUTTLE_WARMUP) + else if (shuttle.is_launching()) if (shuttle.at_station()) line2 = "Launch" else @@ -192,7 +192,7 @@ if (!shuttle) return "Error" - if(shuttle.has_eta()) + if(shuttle.has_arrive_time()) var/timeleft = round((shuttle.arrive_time - world.time) / 10,1) if(timeleft < 0) return "Late" diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index da729b14e9d..c97c7b975ce 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -414,7 +414,7 @@ var/supplyData[0] var/datum/shuttle/ferry/supply/shuttle = supply_controller.shuttle if (shuttle) - supplyData["shuttle_moving"] = shuttle.has_eta() + supplyData["shuttle_moving"] = shuttle.has_arrive_time() supplyData["shuttle_eta"] = shuttle.eta_minutes() supplyData["shuttle_loc"] = shuttle.at_station() ? "Station" : "Dock" var/supplyOrderCount = 0 diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 3dfe8208f66..f4ef6aa732f 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -317,7 +317,7 @@ var/list/mechtoys = list( var/datum/shuttle/ferry/supply/shuttle = supply_controller.shuttle if (shuttle) dat += {"
Supply shuttle
- Location: [shuttle.has_eta() ? "Moving to station ([shuttle.eta_minutes()] Mins.)":shuttle.at_station() ? "Docked":"Away"]
+ Location: [shuttle.has_arrive_time() ? "Moving to station ([shuttle.eta_minutes()] Mins.)":shuttle.at_station() ? "Docked":"Away"]
Supply points: [supply_controller.points]

\nRequest items

View approved orders

@@ -445,7 +445,7 @@ var/list/mechtoys = list( if (shuttle) dat += "
Supply shuttle
" dat += "\nLocation: " - if (shuttle.has_eta()) + if (shuttle.has_arrive_time()) dat += "In transit ([shuttle.eta_minutes()] Mins.)
" else if (shuttle.at_station()) @@ -453,8 +453,8 @@ var/list/mechtoys = list( switch(shuttle.docking_controller.get_docking_status()) if ("docked") dat += "Docked at station
" if ("undocked") dat += "Undocked from station
" - if ("docking") dat += "Docking with station [shuttle.can_force()? "OVERRIDE" : ""]
" - if ("undocking") dat += "Undocking from station [shuttle.can_force()? "OVERRIDE" : ""]
" + if ("docking") dat += "Docking with station [shuttle.can_force()? "Force Launch" : ""]
" + if ("undocking") dat += "Undocking from station [shuttle.can_force()? "Force Launch" : ""]
" else dat += "Station
" diff --git a/code/modules/shuttles/shuttle_ferry.dm b/code/modules/shuttles/shuttle_ferry.dm index 6cbff98a5c2..8d6d1594279 100644 --- a/code/modules/shuttles/shuttle_ferry.dm +++ b/code/modules/shuttles/shuttle_ferry.dm @@ -154,6 +154,10 @@ return 1 return 0 +//returns 1 if the shuttle is getting ready to move, but is not in transit yet +/datum/shuttle/ferry/proc/is_launching() + return (moving_status == SHUTTLE_WARMUP || process_state == WAIT_LAUNCH) + //This gets called when the shuttle finishes arriving at it's destination //This can be used by subtypes to do things when the shuttle arrives. /datum/shuttle/ferry/proc/arrived() diff --git a/code/modules/shuttles/shuttle_supply.dm b/code/modules/shuttles/shuttle_supply.dm index 70901a513f9..a9e240c5e96 100644 --- a/code/modules/shuttles/shuttle_supply.dm +++ b/code/modules/shuttles/shuttle_supply.dm @@ -67,10 +67,6 @@ /datum/shuttle/ferry/supply/proc/at_station() return (!location) -//returns 1 if the shuttle is moving and we can show valid ETAs -/datum/shuttle/ferry/supply/proc/has_eta() - return (moving_status == SHUTTLE_INTRANSIT) - //returns 1 if the shuttle is idle and we can still mess with the cargo shopping list /datum/shuttle/ferry/supply/proc/idle() return (moving_status == SHUTTLE_IDLE)