diff --git a/code/__DEFINES/stat.dm b/code/__DEFINES/stat.dm
index 6ef269be1c2..b0a74b6c702 100644
--- a/code/__DEFINES/stat.dm
+++ b/code/__DEFINES/stat.dm
@@ -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"
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index bda89160be4..8c96837e9d5 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -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