Merge pull request #4108 from Citadel-Station-13/upstream-merge-33026

[MIRROR] Fixed mobs getting rotated by shuttles even if they are not moved
2017-11-24 23:14:14 +00:00
parent a93c69614f 4b14695885
commit ed9b99a166
1 changed files with 2 additions and 0 deletions
@@ -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"])