From 8c4e9d6a023b64ae5d8dfcbf0918bdd339f347c0 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sun, 8 Oct 2017 02:48:26 -0400 Subject: [PATCH 1/2] Merge pull request #31409 from ninjanomnom/buckled-mobs Buckled mobs rotation fix --- code/modules/shuttle/shuttle_rotate.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/shuttle/shuttle_rotate.dm b/code/modules/shuttle/shuttle_rotate.dm index 389a2406ed..1979ca1c3b 100644 --- a/code/modules/shuttle/shuttle_rotate.dm +++ b/code/modules/shuttle/shuttle_rotate.dm @@ -32,7 +32,8 @@ All shuttleRotate procs go here //override to avoid rotating pixel_xy on mobs /mob/shuttleRotate(rotation) - setDir(angle2dir(rotation+dir2angle(dir))) + if(!buckled) + setDir(angle2dir(rotation+dir2angle(dir))) /************************************Structure rotate procs************************************/