diff --git a/Resources/Maps/Shuttles/bocadillo.yml b/Resources/Maps/Shuttles/bocadillo.yml
index 151a299895e..30eb95443d8 100644
--- a/Resources/Maps/Shuttles/bocadillo.yml
+++ b/Resources/Maps/Shuttles/bocadillo.yml
@@ -62,17 +62,18 @@ entities:
           -2,0:
             0: 65280
           -2,1:
-            0: 63999
-            1: 512
-            2: 1024
+            0: 65535
           -1,0:
-            0: 65518
+            0: 65484
+            1: 34
           -1,1:
             0: 65535
           1,1:
-            0: 4915
+            0: 819
+            1: 4096
           1,0:
-            0: 13072
+            1: 16
+            0: 13056
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -90,29 +91,14 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.14996
+          temperature: 293.15
           moles:
-          - 20.078888
-          - 75.53487
-          - 0
-          - 0
-          - 0
-          - 0
           - 0
           - 0
           - 0
           - 0
           - 0
           - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 23.43119
-          - 88.145905
-          - 0
-          - 0
-          - 0
-          - 0
           - 0
           - 0
           - 0
@@ -123,6 +109,39 @@ entities:
       type: GridAtmosphere
     - type: GasTileOverlay
     - type: RadiationGridResistance
+- proto: AirAlarm
+  entities:
+  - uid: 110
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -7.5,3.5
+      parent: 2
+      type: Transform
+    - ShutdownSubscribers:
+      - 245
+      - 237
+      - 247
+      - 239
+      - 211
+      - 240
+      - 246
+      type: DeviceNetwork
+    - devices:
+      - 240
+      - 211
+      - 239
+      - 237
+      - 245
+      - 247
+      - 246
+      type: DeviceList
+- proto: AirCanister
+  entities:
+  - uid: 212
+    components:
+    - pos: -6.5,6.5
+      parent: 2
+      type: Transform
 - proto: AirlockCaptainGlassLocked
   entities:
   - uid: 137
@@ -181,9 +200,10 @@ entities:
       type: Transform
 - proto: APCBasic
   entities:
-  - uid: 88
+  - uid: 1
     components:
-    - pos: -9.5,2.5
+    - rot: 3.141592653589793 rad
+      pos: -9.5,2.5
       parent: 2
       type: Transform
   - uid: 89
@@ -217,6 +237,28 @@ entities:
       pos: 5.5,5.5
       parent: 2
       type: Transform
+- proto: AtmosFixBlockerMarker
+  entities:
+  - uid: 244
+    components:
+    - pos: -2.5,0.5
+      parent: 2
+      type: Transform
+  - uid: 248
+    components:
+    - pos: -2.5,1.5
+      parent: 2
+      type: Transform
+  - uid: 249
+    components:
+    - pos: 4.5,1.5
+      parent: 2
+      type: Transform
+  - uid: 250
+    components:
+    - pos: 4.5,7.5
+      parent: 2
+      type: Transform
 - proto: BarSign
   entities:
   - uid: 143
@@ -233,13 +275,48 @@ entities:
       type: Transform
 - proto: ButchCleaver
   entities:
-  - uid: 161
+  - uid: 15
     components:
-    - pos: -1.5070472,6.662921
+    - pos: -2.5855894,6.703055
       parent: 2
       type: Transform
 - proto: CableApcExtension
   entities:
+  - uid: 84
+    components:
+    - pos: -5.5,3.5
+      parent: 2
+      type: Transform
+  - uid: 88
+    components:
+    - pos: -5.5,4.5
+      parent: 2
+      type: Transform
+  - uid: 93
+    components:
+    - pos: 1.5,5.5
+      parent: 2
+      type: Transform
+  - uid: 94
+    components:
+    - pos: 1.5,4.5
+      parent: 2
+      type: Transform
+  - uid: 95
+    components:
+    - pos: 1.5,3.5
+      parent: 2
+      type: Transform
+  - uid: 96
+    components:
+    - pos: -7.5,5.5
+      parent: 2
+      type: Transform
+  - uid: 97
+    components:
+    - pos: -8.5,5.5
+      parent: 2
+      type: Transform
   - uid: 104
     components:
     - pos: -9.5,2.5
@@ -247,32 +324,27 @@ entities:
       type: Transform
   - uid: 105
     components:
-    - pos: -8.5,2.5
+    - pos: -9.5,5.5
       parent: 2
       type: Transform
   - uid: 106
     components:
-    - pos: -7.5,2.5
+    - pos: 2.5,5.5
       parent: 2
       type: Transform
   - uid: 107
     components:
-    - pos: -6.5,2.5
+    - pos: 1.5,1.5
       parent: 2
       type: Transform
   - uid: 108
     components:
-    - pos: -5.5,2.5
+    - pos: -0.5,1.5
       parent: 2
       type: Transform
   - uid: 109
     components:
-    - pos: -4.5,2.5
-      parent: 2
-      type: Transform
-  - uid: 110
-    components:
-    - pos: -3.5,2.5
+    - pos: -4.5,4.5
       parent: 2
       type: Transform
   - uid: 111
@@ -280,21 +352,11 @@ entities:
     - pos: -2.5,2.5
       parent: 2
       type: Transform
-  - uid: 112
-    components:
-    - pos: -1.5,2.5
-      parent: 2
-      type: Transform
   - uid: 113
     components:
     - pos: -0.5,2.5
       parent: 2
       type: Transform
-  - uid: 114
-    components:
-    - pos: 0.5,2.5
-      parent: 2
-      type: Transform
   - uid: 115
     components:
     - pos: 1.5,2.5
@@ -302,7 +364,7 @@ entities:
       type: Transform
   - uid: 116
     components:
-    - pos: 2.5,2.5
+    - pos: -0.5,3.5
       parent: 2
       type: Transform
   - uid: 117
@@ -317,7 +379,7 @@ entities:
       type: Transform
   - uid: 119
     components:
-    - pos: -10.5,4.5
+    - pos: -0.5,4.5
       parent: 2
       type: Transform
   - uid: 120
@@ -365,16 +427,6 @@ entities:
     - pos: 1.5,6.5
       parent: 2
       type: Transform
-  - uid: 129
-    components:
-    - pos: 2.5,6.5
-      parent: 2
-      type: Transform
-  - uid: 130
-    components:
-    - pos: 3.5,6.5
-      parent: 2
-      type: Transform
   - uid: 131
     components:
     - pos: 3.5,5.5
@@ -440,6 +492,11 @@ entities:
     - pos: 4.5,2.5
       parent: 2
       type: Transform
+  - uid: 222
+    components:
+    - pos: -1.5,4.5
+      parent: 2
+      type: Transform
 - proto: CableHV
   entities:
   - uid: 90
@@ -459,66 +516,83 @@ entities:
     - pos: -9.5,7.5
       parent: 2
       type: Transform
-  - uid: 93
+  - uid: 98
     components:
-    - pos: -8.5,7.5
+    - pos: -3.5,7.5
       parent: 2
       type: Transform
-  - uid: 94
+  - uid: 99
     components:
-    - pos: -7.5,7.5
+    - pos: -9.5,6.5
       parent: 2
       type: Transform
-  - uid: 95
+  - uid: 100
     components:
-    - pos: -6.5,7.5
+    - pos: -9.5,5.5
       parent: 2
       type: Transform
-  - uid: 96
+  - uid: 101
     components:
-    - pos: -5.5,7.5
+    - pos: -9.5,4.5
       parent: 2
       type: Transform
-  - uid: 97
+  - uid: 102
     components:
-    - pos: -4.5,7.5
+    - pos: -9.5,3.5
       parent: 2
       type: Transform
-  - uid: 98
+  - uid: 103
     components:
-    - pos: -3.5,7.5
+    - pos: -9.5,2.5
       parent: 2
       type: Transform
-  - uid: 99
+  - uid: 215
     components:
-    - pos: -9.5,6.5
+    - pos: -8.5,5.5
       parent: 2
       type: Transform
-  - uid: 100
+  - uid: 216
     components:
-    - pos: -9.5,5.5
+    - pos: -7.5,5.5
       parent: 2
       type: Transform
-  - uid: 101
+  - uid: 217
     components:
-    - pos: -9.5,4.5
+    - pos: -6.5,5.5
       parent: 2
       type: Transform
-  - uid: 102
+  - uid: 218
     components:
-    - pos: -9.5,3.5
+    - pos: -5.5,5.5
       parent: 2
       type: Transform
-  - uid: 103
+  - uid: 219
     components:
-    - pos: -9.5,2.5
+    - pos: -4.5,5.5
+      parent: 2
+      type: Transform
+  - uid: 220
+    components:
+    - pos: -3.5,5.5
+      parent: 2
+      type: Transform
+  - uid: 221
+    components:
+    - pos: -3.5,6.5
       parent: 2
       type: Transform
 - proto: ClosetChefFilled
   entities:
-  - uid: 1
+  - uid: 160
     components:
-    - pos: -6.5,6.5
+    - pos: -1.5,6.5
+      parent: 2
+      type: Transform
+- proto: ClosetWallEmergencyFilledRandom
+  entities:
+  - uid: 242
+    components:
+    - pos: -5.5,7.5
       parent: 2
       type: Transform
 - proto: ComputerShuttle
@@ -539,7 +613,7 @@ entities:
       type: Transform
 - proto: ComputerWallmountWithdrawBankATM
   entities:
-  - uid: 15
+  - uid: 130
     components:
     - rot: 3.141592653589793 rad
       pos: 2.5,1.5
@@ -558,15 +632,34 @@ entities:
     - pos: -7.5,6.5
       parent: 2
       type: Transform
+- proto: DeskBell
+  entities:
+  - uid: 213
+    components:
+    - pos: 2.6402364,4.6301794
+      parent: 2
+      type: Transform
+- proto: EmergencyLight
+  entities:
+  - uid: 223
+    components:
+    - pos: -3.5,6.5
+      parent: 2
+      type: Transform
+  - uid: 224
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -8.5,4.5
+      parent: 2
+      type: Transform
 - proto: ExtinguisherCabinetFilled
   entities:
   - uid: 145
     components:
-    - pos: -7.5,4.5
+    - rot: 1.5707963267948966 rad
+      pos: -7.5,4.5
       parent: 2
       type: Transform
-    - opened: True
-      type: ItemCabinet
 - proto: FaxMachineShip
   entities:
   - uid: 138
@@ -574,6 +667,348 @@ entities:
     - pos: -8.5,6.5
       parent: 2
       type: Transform
+- proto: FirelockEdge
+  entities:
+  - uid: 246
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 1.5,3.5
+      parent: 2
+      type: Transform
+    - ShutdownSubscribers:
+      - 110
+      type: DeviceNetwork
+  - uid: 247
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 2.5,3.5
+      parent: 2
+      type: Transform
+    - ShutdownSubscribers:
+      - 110
+      type: DeviceNetwork
+- proto: FirelockGlass
+  entities:
+  - uid: 245
+    components:
+    - pos: -7.5,5.5
+      parent: 2
+      type: Transform
+    - ShutdownSubscribers:
+      - 110
+      type: DeviceNetwork
+- proto: FloorDrain
+  entities:
+  - uid: 129
+    components:
+    - pos: -6.5,4.5
+      parent: 2
+      type: Transform
+    - fixtures: {}
+      type: Fixtures
+- proto: GasPassiveVent
+  entities:
+  - uid: 214
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -2.5,1.5
+      parent: 2
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
+- proto: GasPipeBend
+  entities:
+  - uid: 180
+    components:
+    - pos: 2.5,5.5
+      parent: 2
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
+  - uid: 234
+    components:
+    - pos: 1.5,4.5
+      parent: 2
+      type: Transform
+    - color: '#03FCD3FF'
+      type: AtmosPipeColor
+- proto: GasPipeStraight
+  entities:
+  - uid: 161
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -7.5,5.5
+      parent: 2
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
+  - uid: 163
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -6.5,5.5
+      parent: 2
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
+  - uid: 165
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -5.5,5.5
+      parent: 2
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
+  - uid: 167
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -3.5,5.5
+      parent: 2
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
+  - uid: 169
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -1.5,5.5
+      parent: 2
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
+  - uid: 170
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -0.5,5.5
+      parent: 2
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
+  - uid: 171
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 0.5,5.5
+      parent: 2
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
+  - uid: 172
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 1.5,5.5
+      parent: 2
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
+  - uid: 206
+    components:
+    - pos: -2.5,4.5
+      parent: 2
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
+  - uid: 207
+    components:
+    - pos: -2.5,3.5
+      parent: 2
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
+  - uid: 208
+    components:
+    - pos: -2.5,2.5
+      parent: 2
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
+  - uid: 209
+    components:
+    - pos: 2.5,4.5
+      parent: 2
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
+  - uid: 210
+    components:
+    - pos: 2.5,3.5
+      parent: 2
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
+  - uid: 226
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -7.5,4.5
+      parent: 2
+      type: Transform
+    - color: '#03FCD3FF'
+      type: AtmosPipeColor
+  - uid: 227
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -5.5,4.5
+      parent: 2
+      type: Transform
+    - color: '#03FCD3FF'
+      type: AtmosPipeColor
+  - uid: 229
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -3.5,4.5
+      parent: 2
+      type: Transform
+    - color: '#03FCD3FF'
+      type: AtmosPipeColor
+  - uid: 230
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -2.5,4.5
+      parent: 2
+      type: Transform
+    - color: '#03FCD3FF'
+      type: AtmosPipeColor
+  - uid: 231
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -1.5,4.5
+      parent: 2
+      type: Transform
+    - color: '#03FCD3FF'
+      type: AtmosPipeColor
+  - uid: 232
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -0.5,4.5
+      parent: 2
+      type: Transform
+    - color: '#03FCD3FF'
+      type: AtmosPipeColor
+  - uid: 233
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 0.5,4.5
+      parent: 2
+      type: Transform
+    - color: '#03FCD3FF'
+      type: AtmosPipeColor
+  - uid: 235
+    components:
+    - pos: 1.5,3.5
+      parent: 2
+      type: Transform
+    - color: '#03FCD3FF'
+      type: AtmosPipeColor
+- proto: GasPipeTJunction
+  entities:
+  - uid: 114
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -4.5,5.5
+      parent: 2
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
+  - uid: 168
+    components:
+    - pos: -2.5,5.5
+      parent: 2
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
+  - uid: 225
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -6.5,4.5
+      parent: 2
+      type: Transform
+    - color: '#03FCD3FF'
+      type: AtmosPipeColor
+  - uid: 228
+    components:
+    - pos: -4.5,4.5
+      parent: 2
+      type: Transform
+    - color: '#03FCD3FF'
+      type: AtmosPipeColor
+- proto: GasPort
+  entities:
+  - uid: 112
+    components:
+    - pos: -6.5,6.5
+      parent: 2
+      type: Transform
+    - color: '#0055CCFF'
+      type: AtmosPipeColor
+- proto: GasPressurePump
+  entities:
+  - uid: 236
+    components:
+    - pos: -6.5,5.5
+      parent: 2
+      type: Transform
+    - color: '#03FCD3FF'
+      type: AtmosPipeColor
+- proto: GasVentPump
+  entities:
+  - uid: 237
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -4.5,3.5
+      parent: 2
+      type: Transform
+    - ShutdownSubscribers:
+      - 110
+      type: DeviceNetwork
+    - color: '#03FCD3FF'
+      type: AtmosPipeColor
+  - uid: 238
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -8.5,4.5
+      parent: 2
+      type: Transform
+    - color: '#03FCD3FF'
+      type: AtmosPipeColor
+  - uid: 239
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 1.5,2.5
+      parent: 2
+      type: Transform
+    - ShutdownSubscribers:
+      - 110
+      type: DeviceNetwork
+    - color: '#03FCD3FF'
+      type: AtmosPipeColor
+- proto: GasVentScrubber
+  entities:
+  - uid: 211
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 2.5,2.5
+      parent: 2
+      type: Transform
+    - ShutdownSubscribers:
+      - 110
+      type: DeviceNetwork
+    - color: '#990000FF'
+      type: AtmosPipeColor
+  - uid: 240
+    components:
+    - pos: -4.5,6.5
+      parent: 2
+      type: Transform
+    - ShutdownSubscribers:
+      - 110
+      type: DeviceNetwork
+    - color: '#990000FF'
+      type: AtmosPipeColor
+  - uid: 241
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: -8.5,5.5
+      parent: 2
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
 - proto: GravityGeneratorMini
   entities:
   - uid: 133
@@ -675,23 +1110,23 @@ entities:
       type: Transform
 - proto: KitchenKnife
   entities:
-  - uid: 165
+  - uid: 153
     components:
-    - pos: -1.5695472,6.600421
+    - pos: -2.7262144,6.671805
       parent: 2
       type: Transform
 - proto: KitchenMicrowave
   entities:
   - uid: 151
     components:
-    - pos: -2.5,6.5
+    - pos: -3.5,6.5
       parent: 2
       type: Transform
 - proto: KitchenReagentGrinder
   entities:
   - uid: 152
     components:
-    - pos: -3.5,6.5
+    - pos: -4.5,6.5
       parent: 2
       type: Transform
 - proto: LargeBeaker
@@ -727,6 +1162,13 @@ entities:
     - pos: -4.2193184,6.7525597
       parent: 2
       type: Transform
+- proto: Plunger
+  entities:
+  - uid: 166
+    components:
+    - pos: -6.520974,4.2649193
+      parent: 2
+      type: Transform
 - proto: PortableGeneratorPacman
   entities:
   - uid: 86
@@ -947,11 +1389,6 @@ entities:
       type: Transform
 - proto: TableGlass
   entities:
-  - uid: 84
-    components:
-    - pos: -1.5,6.5
-      parent: 2
-      type: Transform
   - uid: 85
     components:
     - pos: -2.5,6.5