diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index 733bdc9220..d1bebb4daa 100644
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -22089,11 +22089,13 @@ entities:
     parent: 852
     type: Transform
 - uid: 1590
-  type: AirlockExternalGlassLocked
+  type: JetpackBlueFilled
   components:
-  - pos: 21.5,22.5
+  - pos: 29.435102,-4.3374166
     parent: 852
     type: Transform
+  - canCollide: False
+    type: Physics
 - uid: 1591
   type: CableApcExtension
   components:
@@ -23263,15 +23265,38 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 1771
-  type: ComputerCargoOrders
+  type: AirlockExternalGlassShuttleLocked
   components:
-  - pos: 27.5,10.5
+  - rot: 3.141592653589793 rad
+    pos: 21.5,22.5
     parent: 852
     type: Transform
-  - containers:
-      board: !type:Container
-        ents: []
-    type: ContainerContainer
+  - 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: 1772
   type: LockerQuarterMasterFilled
   components:
@@ -32617,13 +32642,15 @@ entities:
     parent: 852
     type: Transform
 - uid: 3115
-  type: CargoTelepad
+  type: ComputerCargoShuttle
   components:
-  - pos: 20.5,10.5
+  - pos: 27.5,10.5
     parent: 852
     type: Transform
-  - canCollide: False
-    type: Physics
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 3116
   type: GasVentPump
   components:
@@ -56342,13 +56369,15 @@ entities:
   - color: '#0335FCFF'
     type: AtmosPipeColor
 - uid: 6174
-  type: FireExtinguisher
+  type: ComputerShuttleCargo
   components:
-  - pos: 6.3112955,9.74388
+  - pos: 22.5,13.5
     parent: 852
     type: Transform
-  - canCollide: False
-    type: Physics
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 6175
   type: CableMV
   components:
@@ -56944,16 +56973,13 @@ entities:
     parent: 852
     type: Transform
 - uid: 6251
-  type: ComputerCargoOrders
+  type: JetpackMini
   components:
-  - rot: 1.5707963267948966 rad
-    pos: 21.5,10.5
+  - pos: 6.5050597,9.5957365
     parent: 852
     type: Transform
-  - containers:
-      board: !type:Container
-        ents: []
-    type: ContainerContainer
+  - canCollide: False
+    type: Physics
 - uid: 6252
   type: TableReinforced
   components:
@@ -59180,13 +59206,16 @@ entities:
       Toggle: []
     type: SignalReceiver
 - uid: 6567
-  type: FireExtinguisher
+  type: ComputerCargoShuttle
   components:
-  - pos: 6.6081705,9.71263
+  - rot: -1.5707963267948966 rad
+    pos: 22.5,9.5
     parent: 852
     type: Transform
-  - canCollide: False
-    type: Physics
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 6568
   type: SurveillanceCameraSecurity
   components:
@@ -79857,4 +79886,12 @@ entities:
   - pos: -38.5,-6.5
     parent: 852
     type: Transform
+- uid: 9480
+  type: JetpackMini
+  components:
+  - pos: 6.5050597,9.9238615
+    parent: 852
+    type: Transform
+  - canCollide: False
+    type: Physics
 ...