Fixes Boulder Desyncing (tgstation#88775)

ss220club · Dec 31, 2024 · 3f99d65 · 3f99d65
1 parent 2fd8ae1
commit 3f99d65
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/code/modules/recycling/conveyor.dm b/code/modules/recycling/conveyor.dm
@@ -248,8 +248,10 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
 			start_conveying(movable)
 	return TRUE
 
-/obj/machinery/conveyor/proc/conveyable_enter(datum/source, atom/convayable)
+/obj/machinery/conveyor/proc/conveyable_enter(datum/source, atom/movable/convayable)
 	SIGNAL_HANDLER
+	if(convayable.loc != loc) // If we are not on the same turf (order of operations memes) go to hell
+		return
 	if(operating == CONVEYOR_OFF)
 		GLOB.move_manager.stop_looping(convayable, SSconveyors)
 		return