From a29d4a5d113dc7d0189893f292190381b6f03962 Mon Sep 17 00:00:00 2001 From: Cruix Date: Fri, 24 Nov 2017 04:47:11 -0600 Subject: [PATCH 1/2] Fixed mobs getting rotated by shuttles even if they are not moved (#33026) --- code/modules/shuttle/on_move.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm index 2c48d18e6e..51c62029e0 100644 --- a/code/modules/shuttle/on_move.dm +++ b/code/modules/shuttle/on_move.dm @@ -270,6 +270,8 @@ All ShuttleMove procs go here . = ..() /mob/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation) + if(!move_on_shuttle) + return . = ..() if(client && movement_force) var/shake_force = max(movement_force["THROW"], movement_force["KNOCKDOWN"])