diff --git a/Resources/Maps/cargo_shuttle.yml b/Resources/Maps/cargo_shuttle.yml
index f6c0b005f4..5de1daa43e 100644
--- a/Resources/Maps/cargo_shuttle.yml
+++ b/Resources/Maps/cargo_shuttle.yml
@@ -870,26 +870,26 @@ entities:
     type: Transform
   - outputs:
       Left:
+      - port: Forward
+        uid: 51
       - port: Forward
         uid: 46
       - port: Forward
-        uid: 45
-      - port: Forward
-        uid: 44
+        uid: 167
       Right:
+      - port: Reverse
+        uid: 51
       - port: Reverse
         uid: 46
       - port: Reverse
-        uid: 45
-      - port: Reverse
-        uid: 44
+        uid: 167
       Middle:
+      - port: Off
+        uid: 51
       - port: Off
         uid: 46
       - port: Off
-        uid: 45
-      - port: Off
-        uid: 44
+        uid: 167
     type: SignalTransmitter
 - uid: 36
   type: TwoWayLever
@@ -1058,46 +1058,49 @@ entities:
         uid: 34
     type: SignalReceiver
 - uid: 44
-  type: ConveyorBelt
+  type: PlasticFlapsAirtightClear
   components:
-  - rot: -1.5707963267948966 rad
-    pos: -1.5,0.5
+  - pos: 0.5,0.5
     parent: 0
     type: Transform
-  - inputs:
-      Reverse:
-      - port: Right
-        uid: 35
-      Forward:
-      - port: Left
-        uid: 35
-      Off:
-      - port: Middle
-        uid: 35
-    type: SignalReceiver
 - uid: 45
-  type: ConveyorBelt
+  type: AirlockExternalGlassShuttleEmergencyLocked
   components:
-  - rot: -1.5707963267948966 rad
-    pos: -0.5,0.5
+  - rot: 1.5707963267948966 rad
+    pos: 0.5,1.5
     parent: 0
     type: Transform
-  - inputs:
-      Reverse:
-      - port: Right
-        uid: 35
-      Forward:
-      - port: Left
-        uid: 35
-      Off:
-      - port: Middle
-        uid: 35
-    type: SignalReceiver
+  - fixtures:
+    - shape: !type:PolygonShape
+        vertices:
+        - 0.49,-0.49
+        - 0.49,0.49
+        - -0.49,0.49
+        - -0.49,-0.49
+      mask:
+      - Impassable
+      - MidImpassable
+      - HighImpassable
+      - LowImpassable
+      - InteractImpassable
+      layer:
+      - MidImpassable
+      - HighImpassable
+      - BulletImpassable
+      - InteractImpassable
+      - Opaque
+      mass: 100
+    - shape: !type:PhysShapeCircle
+        position: 0,-0.5
+        radius: 0.2
+      hard: False
+      id: docking
+    type: Fixtures
 - uid: 46
   type: ConveyorBelt
   components:
   - rot: -1.5707963267948966 rad
-    pos: 0.5,0.5
+    pos: -0.5,0.5
     parent: 0
     type: Transform
   - inputs:
@@ -1199,38 +1202,23 @@ entities:
       id: docking
     type: Fixtures
 - uid: 51
-  type: AirlockExternalGlassShuttleLocked
+  type: ConveyorBelt
   components:
-  - rot: 1.5707963267948966 rad
-    pos: 0.5,1.5
+  - rot: -1.5707963267948966 rad
+    pos: -1.5,0.5
     parent: 0
     type: Transform
-  - fixtures:
-    - shape: !type:PolygonShape
-        vertices:
-        - 0.49,-0.49
-        - 0.49,0.49
-        - -0.49,0.49
-        - -0.49,-0.49
-      mask:
-      - Impassable
-      - MidImpassable
-      - HighImpassable
-      - LowImpassable
-      - InteractImpassable
-      layer:
-      - MidImpassable
-      - HighImpassable
-      - BulletImpassable
-      - InteractImpassable
-      - Opaque
-      mass: 100
-    - shape: !type:PhysShapeCircle
-        position: 0,-0.5
-        radius: 0.2
-      hard: False
-      id: docking
-    type: Fixtures
+  - inputs:
+      Reverse:
+      - port: Right
+        uid: 35
+      Forward:
+      - port: Left
+        uid: 35
+      Off:
+      - port: Middle
+        uid: 35
+    type: SignalReceiver
 - uid: 52
   type: AirlockExternalGlassShuttleLocked
   components:
@@ -2108,11 +2096,23 @@ entities:
     parent: 0
     type: Transform
 - uid: 167
-  type: PlasticFlapsAirtightClear
+  type: ConveyorBelt
   components:
-  - pos: 0.5,0.5
+  - rot: -1.5707963267948966 rad
+    pos: 0.5,0.5
     parent: 0
     type: Transform
+  - inputs:
+      Reverse:
+      - port: Right
+        uid: 35
+      Forward:
+      - port: Left
+        uid: 35
+      Off:
+      - port: Middle
+        uid: 35
+    type: SignalReceiver
 - uid: 168
   type: AtmosDeviceFanTiny
   components:
@@ -2138,7 +2138,7 @@ entities:
   type: AtmosDeviceFanTiny
   components:
   - anchored: True
-    pos: 0.5,0.5
+    pos: 0.5,1.5
     parent: 0
     type: Transform
 - uid: 172