diff --git a/Resources/Maps/Shuttles/bocadillo.yml b/Resources/Maps/Shuttles/bocadillo.yml
index 534896bd5a4..32e8fad17f0 100644
--- a/Resources/Maps/Shuttles/bocadillo.yml
+++ b/Resources/Maps/Shuttles/bocadillo.yml
@@ -61,15 +61,13 @@ entities:
           -2,1:
             0: 65535
           -1,0:
-            0: 65484
-            1: 34
+            0: 65518
           -1,1:
             0: 65535
           1,1:
-            0: 17
-            1: 4898
+            0: 4915
           1,0:
-            1: 13072
+            0: 13072
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -86,28 +84,13 @@ entities:
           - 0
           - 0
           - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
         chunkSize: 4
       type: GridAtmosphere
     - type: GasTileOverlay
     - type: RadiationGridResistance
-- proto: AirlockCaptainLocked
+- proto: AirlockCaptainGlassLocked
   entities:
-  - uid: 140
+  - uid: 137
     components:
     - pos: -7.5,5.5
       parent: 2
@@ -746,57 +729,18 @@ entities:
       pos: -2.5,7.5
       parent: 2
       type: Transform
-  - uid: 70
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -6.5,7.5
-      parent: 2
-      type: Transform
-  - uid: 71
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -7.5,7.5
-      parent: 2
-      type: Transform
   - uid: 72
     components:
     - rot: -1.5707963267948966 rad
       pos: -8.5,7.5
       parent: 2
       type: Transform
-  - uid: 73
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -6.5,2.5
-      parent: 2
-      type: Transform
-  - uid: 74
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: -7.5,2.5
-      parent: 2
-      type: Transform
   - uid: 75
     components:
     - rot: -1.5707963267948966 rad
       pos: -8.5,2.5
       parent: 2
       type: Transform
-  - uid: 137
-    components:
-    - pos: -7.5,3.5
-      parent: 2
-      type: Transform
-  - uid: 138
-    components:
-    - pos: -7.5,4.5
-      parent: 2
-      type: Transform
-  - uid: 139
-    components:
-    - pos: -7.5,6.5
-      parent: 2
-      type: Transform
   - uid: 203
     components:
     - rot: 3.141592653589793 rad
@@ -871,30 +815,26 @@ entities:
     - canCollide: False
       type: Physics
     - type: InsideEntityStorage
-- proto: hydroponicsTray
+- proto: hydroponicsTrayAnchored
   entities:
-  - uid: 144
+  - uid: 70
     components:
-    - rot: 3.141592653589793 rad
-      pos: -6.5,3.5
+    - pos: -3.5,3.5
       parent: 2
       type: Transform
-  - uid: 145
+  - uid: 71
     components:
-    - rot: 3.141592653589793 rad
-      pos: -5.5,3.5
+    - pos: -4.5,3.5
       parent: 2
       type: Transform
-  - uid: 146
+  - uid: 73
     components:
-    - rot: 3.141592653589793 rad
-      pos: -4.5,3.5
+    - pos: -5.5,3.5
       parent: 2
       type: Transform
-  - uid: 147
+  - uid: 74
     components:
-    - rot: 3.141592653589793 rad
-      pos: -3.5,3.5
+    - pos: -6.5,3.5
       parent: 2
       type: Transform
 - proto: KitchenKnife
@@ -1069,26 +1009,6 @@ entities:
     - pos: -8.5,2.5
       parent: 2
       type: Transform
-  - uid: 46
-    components:
-    - pos: -7.5,2.5
-      parent: 2
-      type: Transform
-  - uid: 47
-    components:
-    - pos: -6.5,2.5
-      parent: 2
-      type: Transform
-  - uid: 48
-    components:
-    - pos: -6.5,7.5
-      parent: 2
-      type: Transform
-  - uid: 49
-    components:
-    - pos: -7.5,7.5
-      parent: 2
-      type: Transform
   - uid: 50
     components:
     - pos: -8.5,7.5
@@ -1106,21 +1026,6 @@ entities:
       pos: -10.5,4.5
       parent: 2
       type: Transform
-  - uid: 134
-    components:
-    - pos: -7.5,6.5
-      parent: 2
-      type: Transform
-  - uid: 135
-    components:
-    - pos: -7.5,3.5
-      parent: 2
-      type: Transform
-  - uid: 136
-    components:
-    - pos: -7.5,4.5
-      parent: 2
-      type: Transform
 - proto: SignalButton
   entities:
   - uid: 35
@@ -1363,6 +1268,26 @@ entities:
     - pos: 0.5,7.5
       parent: 2
       type: Transform
+  - uid: 46
+    components:
+    - pos: -6.5,7.5
+      parent: 2
+      type: Transform
+  - uid: 47
+    components:
+    - pos: -7.5,6.5
+      parent: 2
+      type: Transform
+  - uid: 48
+    components:
+    - pos: -7.5,3.5
+      parent: 2
+      type: Transform
+  - uid: 49
+    components:
+    - pos: -6.5,2.5
+      parent: 2
+      type: Transform
   - uid: 51
     components:
     - pos: -3.5,7.5
@@ -1413,6 +1338,21 @@ entities:
     - pos: -5.5,2.5
       parent: 2
       type: Transform
+  - uid: 134
+    components:
+    - pos: -7.5,4.5
+      parent: 2
+      type: Transform
+  - uid: 135
+    components:
+    - pos: -7.5,7.5
+      parent: 2
+      type: Transform
+  - uid: 136
+    components:
+    - pos: -7.5,2.5
+      parent: 2
+      type: Transform
   - uid: 182
     components:
     - pos: 3.5,4.5