cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-19 20:23:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10731 from VOREStation/Fixes/10728

Browse Source 
Probably fixes #10728
This commit is contained in:
Novacat
2021-06-22 19:24:13 -04:00
committed by Chompstation Bot
parent 968067d0e7
commit 59239bb51b
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/supply.dm
+1 -1
View File
@@ -65,7 +65,7 @@
if(shuttle.has_arrive_time())
shuttle_status["location"] = "In transit"
shuttle_status["mode"] = SUP_SHUTTLE_TRANSIT
shuttle_status["time"] = shuttle.eta_seconds()
shuttle_status["time"] = shuttle.eta_deciseconds() // tgui expects time for it's formatTime() in DS
else
shuttle_status["time"] = 0
code/modules/shuttles/shuttle_supply.dm
+6 -1
View File
@@ -84,8 +84,13 @@
//returns the ETA in minutes
/datum/shuttle/autodock/ferry/supply/proc/eta_minutes()
return round((arrive_time - world.time) / (1 MINUTE), 1) // Floor, so it's an actual timer
return round((arrive_time - world.time) / (1 MINUTE)) // Floor, so it's an actual timer
// returns the ETA in seconds
/datum/shuttle/autodock/ferry/supply/proc/eta_seconds()
return round((arrive_time - world.time) / (1 SECOND)) // Floor, so it's an actual timer
//returns the ETA in deciseconds
/datum/shuttle/autodock/ferry/supply/proc/eta_deciseconds()
return round(arrive_time - world.time)