From 38b066f0537de706beac00abd98b58312c67ce7e Mon Sep 17 00:00:00 2001
From: warriorstar-orion <orion@snowfrost.garden>
Date: Wed, 12 Feb 2025 17:22:09 -0500
Subject: [PATCH] fix lighting objects being moved from their turfs on shuttle
 move (#28360)

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

diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm
index 865349748eb..9d5bd209404 100644
--- a/code/modules/shuttle/on_move.dm
+++ b/code/modules/shuttle/on_move.dm
@@ -10,6 +10,10 @@
 	abstract_move(T1)
 	return 1
 
+/atom/movable/lighting_object/onShuttleMove(turf/oldT, turf/T1, rotation, mob/caller)
+	// lighting objects should not be moved from their parent turfs
+	return 0
+
 /obj/effect/landmark/shuttle_import/onShuttleMove()
 	// Used for marking where to preview/load shuttles
 	return 0