diff --git a/Resources/Maps/_NF/Shuttles/bocadillo.yml b/Resources/Maps/_NF/Shuttles/bocadillo.yml
index 89704197a27..0ea137918ad 100644
--- a/Resources/Maps/_NF/Shuttles/bocadillo.yml
+++ b/Resources/Maps/_NF/Shuttles/bocadillo.yml
@@ -306,31 +306,29 @@ entities:
       rot: 3.141592653589793 rad
       pos: -5.5,2.5
       parent: 2
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
   - uid: 31
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
       pos: 1.5,0.5
       parent: 2
   - uid: 32
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
       pos: -0.5,0.5
       parent: 2
   - uid: 76
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,3.5
+      rot: 1.5707963267948966 rad
+      pos: 5.5,5.5
       parent: 2
   - uid: 77
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,5.5
+      rot: 1.5707963267948966 rad
+      pos: 5.5,3.5
       parent: 2
 - proto: AtmosFixBlockerMarker
   entities:
@@ -672,8 +670,6 @@ entities:
       pos: 1.5,3.5
       parent: 2
     - type: DeviceNetwork
-      configurators:
-      - invalid
       deviceLists:
       - 67
   - uid: 247
@@ -683,8 +679,6 @@ entities:
       pos: 2.5,3.5
       parent: 2
     - type: DeviceNetwork
-      configurators:
-      - invalid
       deviceLists:
       - 67
 - proto: FirelockGlass
@@ -728,6 +722,9 @@ entities:
       rot: 3.141592653589793 rad
       pos: -8.5,4.5
       parent: 2
+    - type: GasMixer
+      inletTwoConcentration: 0.79
+      inletOneConcentration: 0.21
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasPassiveVent
@@ -1013,8 +1010,6 @@ entities:
       pos: -8.5,6.5
       parent: 2
     - type: DeviceNetwork
-      configurators:
-      - invalid
       deviceLists:
       - 67
     - type: AtmosPipeColor
@@ -1025,8 +1020,6 @@ entities:
       pos: -3.5,6.5
       parent: 2
     - type: DeviceNetwork
-      configurators:
-      - invalid
       deviceLists:
       - 67
     - type: AtmosPipeColor
@@ -1038,8 +1031,6 @@ entities:
       pos: 1.5,2.5
       parent: 2
     - type: DeviceNetwork
-      configurators:
-      - invalid
       deviceLists:
       - 67
     - type: AtmosPipeColor
@@ -1052,8 +1043,6 @@ entities:
       pos: -2.5,6.5
       parent: 2
     - type: DeviceNetwork
-      configurators:
-      - invalid
       deviceLists:
       - 67
     - type: AtmosPipeColor
@@ -1065,8 +1054,6 @@ entities:
       pos: -7.5,6.5
       parent: 2
     - type: DeviceNetwork
-      configurators:
-      - invalid
       deviceLists:
       - 67
     - type: AtmosPipeColor
@@ -1078,8 +1065,6 @@ entities:
       pos: 2.5,2.5
       parent: 2
     - type: DeviceNetwork
-      configurators:
-      - invalid
       deviceLists:
       - 67
     - type: AtmosPipeColor