diff --git a/code/modules/recycling/conveyor.dm b/code/modules/recycling/conveyor.dm index 44d9631a609..9e03dc98aea 100644 --- 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