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

Fix shuttle timers

Browse Source
This commit is contained in:
Couls
2019-08-27 00:28:10 -04:00
parent 07f57fdc6e
commit 15ea543566
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/stat.dm
+8 -8
View File
@@ -34,14 +34,14 @@
#define WAIT_FINISH 3
//shuttle mode defines
#define SHUTTLE_IDLE 0
#define SHUTTLE_RECALL 1
#define SHUTTLE_CALL 2
#define SHUTTLE_DOCKED 3
#define SHUTTLE_STRANDED 4
#define SHUTTLE_ESCAPE 5
#define SHUTTLE_ENDGAME 6
#define SHUTTLE_IGNITING 7
#define SHUTTLE_IGNITING 0
#define SHUTTLE_IDLE 1
#define SHUTTLE_RECALL 2
#define SHUTTLE_CALL 3
#define SHUTTLE_DOCKED 4
#define SHUTTLE_STRANDED 5
#define SHUTTLE_ESCAPE 6
#define SHUTTLE_ENDGAME 7
// Shuttle return values
#define SHUTTLE_CAN_DOCK "can_dock"
code/modules/shuttle/shuttle.dm
+4 -3
View File
@@ -349,7 +349,7 @@
if(mode != SHUTTLE_CALL)
return
invertTimer()
timer = world.time - timeLeft(1)
mode = SHUTTLE_RECALL
/obj/docking_port/mobile/proc/enterTransit()
@@ -650,8 +650,9 @@
create_ripples(destination)
/obj/docking_port/mobile/proc/setTimer(wait)
timer = world.time + wait
last_timer_length = wait
if(timer <= 0)
timer = world.time
timer += wait - timeLeft(1)
/obj/docking_port/mobile/proc/modTimer(multiple)
var/time_remaining = timer - world.time