diff --git a/baystation12.dme b/baystation12.dme index 0abf32bf78..43733732a0 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -1293,6 +1293,7 @@ #include "code\modules\shuttles\shuttle.dm" #include "code\modules\shuttles\shuttle_console.dm" #include "code\modules\shuttles\shuttle_specops.dm" +#include "code\modules\shuttles\shuttle_supply.dm" #include "code\modules\shuttles\shuttles_multi.dm" #include "code\modules\supermatter\supermatter.dm" #include "code\modules\surgery\appendix.dm" diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index c62f1a236a..ab1eb364b7 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -110,13 +110,22 @@ update_display(line1, line2) if(4) // supply shuttle timer var/line1 = "SUPPLY" - var/line2 - if(supply_shuttle.moving) + var/line2 = "" + + var/datum/shuttle/ferry/supply/shuttle = supply_shuttle.get_shuttle() + if (!shuttle) + line2 = "Error" + else if(shuttle.has_eta()) line2 = get_supply_shuttle_timer() if(lentext(line2) > CHARS_PER_LINE) line2 = "Error" + else if (shuttle.moving_status == SHUTTLE_WARMUP) + if (shuttle.at_station()) + line2 = "Launch" + else + line2 = "ETA" else - if(supply_shuttle.at_station) + if(shuttle.at_station()) line2 = "Docked" else line1 = "" @@ -162,8 +171,12 @@ return "" proc/get_supply_shuttle_timer() - if(supply_shuttle.moving) - var/timeleft = round((supply_shuttle.eta_timeofday - world.timeofday) / 10,1) + var/datum/shuttle/ferry/supply/shuttle = supply_shuttle.get_shuttle() + if (!shuttle) + return "Error" + + if(shuttle.has_eta()) + var/timeleft = round((shuttle.arrive_time - world.time) / 10,1) if(timeleft < 0) return "Late" return "[add_zero(num2text((timeleft / 60) % 60),2)]:[add_zero(num2text(timeleft % 60), 2)]" diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index 499bbef25f..679b54f6d9 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -411,9 +411,11 @@ if(mode==47) var/supplyData[0] - supplyData["shuttle_moving"] = supply_shuttle.moving - supplyData["shuttle_eta"] = supply_shuttle.eta - supplyData["shuttle_loc"] = supply_shuttle.at_station ? "Station" : "Dock" + var/datum/shuttle/ferry/supply/shuttle = supply_shuttle.get_shuttle() + if (shuttle) + supplyData["shuttle_moving"] = shuttle.has_eta() + supplyData["shuttle_eta"] = shuttle.eta_minutes() + supplyData["shuttle_loc"] = shuttle.at_station() ? "Station" : "Dock" var/supplyOrderCount = 0 var/supplyOrderData[0] for(var/S in supply_shuttle.shoppinglist) diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 63f69b5bec..acb21b2b05 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -142,15 +142,23 @@ var/list/mechtoys = list( var/list/requestlist = list() var/list/supply_packs = list() //shuttle movement - var/at_station = 0 var/movetime = 1200 - var/moving = 0 - var/eta_timeofday - var/eta + var/shuttle_tag = "Supply" New() ordernum = rand(1,9000) + proc/get_shuttle() + if (!shuttles || !(shuttle_tag in shuttles)) + return null + + var/datum/shuttle/ferry/supply/shuttle = shuttles[shuttle_tag] + + if (!istype(shuttle)) + return null + + return shuttle + //Supply shuttle ticker - handles supply point regenertion and shuttle travelling between centcomm and the station proc/process() for(var/typepath in (typesof(/datum/supply_packs) - /datum/supply_packs)) @@ -163,32 +171,13 @@ var/list/mechtoys = list( if(processing) iteration++ points += points_per_process - - if(moving == 1) - var/ticksleft = (eta_timeofday - world.timeofday) - if(ticksleft > 0) - eta = round(ticksleft/600,1) - else - eta = 0 - var/datum/shuttle/S = shuttles["Supply"] - if (istype(S)) S.move() - moving = 0 - at_station = !at_station + + var/datum/shuttle/ferry/supply/shuttle = get_shuttle() + if (shuttle) + shuttle.process_shuttle() sleep(processing_interval) - //Check whether the shuttle is allowed to move - proc/can_move() - if(moving) return 0 - - var/area/shuttle = locate(/area/supply/station) - if(!shuttle) return 0 - - if(forbidden_atoms_check(shuttle)) - return 0 - - return 1 - //To stop things being sent to centcomm which should not be sent to centcomm. Recursively checks for these types. proc/forbidden_atoms_check(atom/A) if(istype(A,/mob/living)) @@ -207,11 +196,10 @@ var/list/mechtoys = list( //Sellin proc/sell() - var/shuttle_at - if(at_station) shuttle_at = SUPPLY_STATION_AREATYPE - else shuttle_at = SUPPLY_DOCK_AREATYPE + var/datum/shuttle/ferry/supply/shuttle_datum = get_shuttle() + if (!shuttle_datum) return - var/area/shuttle = locate(shuttle_at) + var/area/shuttle = shuttle_datum.get_location_area() if(!shuttle) return var/phoron_count = 0 @@ -259,11 +247,10 @@ var/list/mechtoys = list( proc/buy() if(!shoppinglist.len) return - var/shuttle_at - if(at_station) shuttle_at = SUPPLY_STATION_AREATYPE - else shuttle_at = SUPPLY_DOCK_AREATYPE + var/datum/shuttle/ferry/supply/shuttle_datum = get_shuttle() + if (!shuttle_datum) return - var/area/shuttle = locate(shuttle_at) + var/area/shuttle = shuttle_datum.get_location_area() if(!shuttle) return var/list/clear_turfs = list() @@ -290,7 +277,7 @@ var/list/mechtoys = list( slip.info = "

[command_name()] Shipping Manifest


" slip.info +="Order #[SO.ordernum]
" slip.info +="Destination: [station_name]
" - slip.info +="[supply_shuttle.shoppinglist.len] PACKAGES IN THIS SHIPMENT
" + slip.info +="[shoppinglist.len] PACKAGES IN THIS SHIPMENT
" slip.info +="CONTENTS: