From 7b52afcb851bc485559d7e0cf7b692cde987563b Mon Sep 17 00:00:00 2001
From: CitadelStationBot <CitadelStationBot>
Date: Fri, 21 Apr 2017 17:22:50 -0500
Subject: [PATCH] Fixes proximity checkers being moved by shuttles

---
 code/modules/shuttle/on_move.dm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm
index 1cf42135d6..2f80291a0e 100644
--- a/code/modules/shuttle/on_move.dm
+++ b/code/modules/shuttle/on_move.dm
@@ -58,6 +58,10 @@
 	if(!buckled)
 		Weaken(3)
 
+/obj/effect/abstract/proximity_checker/onShuttleMove()
+	//timer so it only happens once
+	addtimer(CALLBACK(monitor, /datum/proximity_monitor/proc/SetRange, monitor.current_range, TRUE), 0, TIMER_UNIQUE)
+
 // Shuttle Rotation //
 
 /atom/proc/shuttleRotate(rotation)
@@ -76,4 +80,4 @@
 			var/oldPX = pixel_x
 			var/oldPY = pixel_y
 			pixel_x = oldPY
-			pixel_y = (oldPX*(-1))
+			pixel_y = (oldPX*(-1))
\ No newline at end of file