cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 04:28:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6756 from VOREStation/vplk-shuttles

Browse Source 
Landmark Shuttles
This commit is contained in:
Aronai Sieyes
2020-03-05 13:34:56 -05:00
committed by GitHub
parent 4c8e0b0d73 ff92e661c7
commit 42dc591215
100 changed files with 11379 additions and 9894 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/PDA/cart.dm
+1 -1
View File
@@ -425,7 +425,7 @@ var/list/civilian_cartridges = list(
if(mode==47)
var/supplyData[0]
var/datum/shuttle/ferry/supply/shuttle = supply_controller.shuttle
var/datum/shuttle/autodock/ferry/supply/shuttle = supply_controller.shuttle
if (shuttle)
supplyData["shuttle_moving"] = shuttle.has_arrive_time()
supplyData["shuttle_eta"] = shuttle.eta_minutes()
code/game/objects/items/devices/communicator/helper.dm
+3 -3
View File
@@ -394,7 +394,7 @@
// code\game\machinery\computer\supply.dm, starting at line 55
/obj/item/weapon/commcard/proc/get_supply_shuttle_status()
var/shuttle_status[0]
var/datum/shuttle/ferry/supply/shuttle = supply_controller.shuttle
var/datum/shuttle/autodock/ferry/supply/shuttle = supply_controller.shuttle
if(shuttle)
if(shuttle.has_arrive_time())
shuttle_status["location"] = "In transit"
@@ -404,8 +404,8 @@
else
shuttle_status["time"] = 0
if(shuttle.at_station())
if(shuttle.docking_controller)
switch(shuttle.docking_controller.get_docking_status())
if(shuttle.shuttle_docking_controller)
switch(shuttle.shuttle_docking_controller.get_docking_status())
if("docked")
shuttle_status["location"] = "Docked"
shuttle_status["mode"] = SUP_SHUTTLE_DOCKED