diff --git a/Resources/Maps/_NF/Shuttles/Expedition/gourd.yml b/Resources/Maps/_NF/Shuttles/Expedition/gourd.yml
index 9c4d5d323b4..cb2b9b260ad 100644
--- a/Resources/Maps/_NF/Shuttles/Expedition/gourd.yml
+++ b/Resources/Maps/_NF/Shuttles/Expedition/gourd.yml
@@ -2561,11 +2561,6 @@ entities:
           ent: 63
 - proto: AmeJar
   entities:
-  - uid: 61
-    components:
-    - type: Transform
-      pos: -0.2596559,-6.4297347
-      parent: 1
   - uid: 63
     components:
     - type: Transform
@@ -2726,135 +2721,142 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 7.5,-2.5
       parent: 1
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
+  - uid: 61
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,0.5
+      parent: 1
   - uid: 92
     components:
     - type: Transform
-      pos: 2.5,0.5
+      rot: -1.5707963267948966 rad
+      pos: -1.5,0.5
       parent: 1
   - uid: 93
     components:
     - type: Transform
-      pos: 4.5,0.5
+      rot: 1.5707963267948966 rad
+      pos: -3.5,0.5
       parent: 1
   - uid: 94
     components:
     - type: Transform
-      pos: -3.5,0.5
+      rot: -1.5707963267948966 rad
+      pos: 4.5,0.5
       parent: 1
   - uid: 95
     components:
     - type: Transform
-      pos: -1.5,0.5
+      rot: 1.5707963267948966 rad
+      pos: 2.5,0.5
       parent: 1
   - uid: 96
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
+      rot: 1.5707963267948966 rad
       pos: 14.5,-4.5
       parent: 1
   - uid: 97
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
+      rot: 1.5707963267948966 rad
       pos: 14.5,-3.5
       parent: 1
   - uid: 98
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
+      rot: 1.5707963267948966 rad
       pos: 14.5,-2.5
       parent: 1
   - uid: 99
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
+      rot: 1.5707963267948966 rad
       pos: 14.5,-5.5
       parent: 1
   - uid: 100
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
       pos: -5.5,-12.5
       parent: 1
   - uid: 101
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
       pos: -4.5,-12.5
       parent: 1
   - uid: 102
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-12.5
+      pos: -0.5,-12.5
       parent: 1
   - uid: 103
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,-12.5
+      pos: -1.5,-12.5
       parent: 1
   - uid: 104
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
       pos: 0.5,-12.5
       parent: 1
   - uid: 105
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
       pos: 1.5,-12.5
       parent: 1
   - uid: 106
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
       pos: 2.5,-12.5
       parent: 1
   - uid: 107
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
       pos: 5.5,-12.5
       parent: 1
   - uid: 108
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
       pos: 6.5,-12.5
       parent: 1
   - uid: 1379
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -11.5,16.5
       parent: 1
   - uid: 1380
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -11.5,15.5
       parent: 1
   - uid: 1381
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -11.5,14.5
       parent: 1
   - uid: 1382
     components:
     - type: Transform
-      pos: 12.5,16.5
+      rot: 1.5707963267948966 rad
+      pos: 12.5,14.5
       parent: 1
   - uid: 1383
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 12.5,15.5
       parent: 1
   - uid: 1384
     components:
     - type: Transform
-      pos: 12.5,14.5
+      rot: 1.5707963267948966 rad
+      pos: 12.5,16.5
       parent: 1
   - uid: 1690
     components:
@@ -2864,58 +2866,58 @@ entities:
   - uid: 1949
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -7.5,9.5
       parent: 1
   - uid: 1951
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 8.5,9.5
       parent: 1
   - uid: 1954
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -6.5,-11.5
       parent: 1
-  - uid: 1961
+  - uid: 1958
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -13.5,-2.5
+      rot: -1.5707963267948966 rad
+      pos: -13.5,0.5
       parent: 1
-  - uid: 1962
+  - uid: 1961
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 7.5,-11.5
       parent: 1
-  - uid: 1964
+  - uid: 1962
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
+      rot: -1.5707963267948966 rad
       pos: -13.5,-3.5
       parent: 1
-  - uid: 1965
+  - uid: 1964
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
+      rot: -1.5707963267948966 rad
       pos: -13.5,-4.5
       parent: 1
-  - uid: 1966
+  - uid: 1965
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
+      rot: -1.5707963267948966 rad
       pos: -13.5,-5.5
       parent: 1
-  - uid: 2020
-    components:
-    - type: Transform
-      pos: 14.5,0.5
-      parent: 1
-  - uid: 2021
+  - uid: 1966
     components:
     - type: Transform
-      pos: -13.5,0.5
+      rot: -1.5707963267948966 rad
+      pos: -13.5,-2.5
       parent: 1
-  - uid: 2030
+  - uid: 1969
     components:
     - type: Transform
       pos: 13.5,-6.5
@@ -3490,206 +3492,126 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -13.5,-4.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1297
   - uid: 126
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -13.5,-5.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1297
   - uid: 127
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -13.5,-2.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1297
   - uid: 128
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -13.5,-3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1297
   - uid: 129
     components:
     - type: Transform
       pos: -12.5,-6.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1297
   - uid: 132
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 14.5,-4.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 135
   - uid: 133
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 14.5,-3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 135
   - uid: 134
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 14.5,-2.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 135
   - uid: 137
     components:
     - type: Transform
       pos: -5.5,-12.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1227
-      - 1226
   - uid: 138
     components:
     - type: Transform
       pos: -1.5,-12.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1227
-      - 1226
   - uid: 139
     components:
     - type: Transform
       pos: -0.5,-12.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1227
-      - 1226
   - uid: 140
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 7.5,-11.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1226
-      - 1227
   - uid: 162
     components:
     - type: Transform
       pos: 5.5,-12.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1227
-      - 1226
   - uid: 175
     components:
     - type: Transform
       pos: -4.5,-12.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1227
-      - 1226
   - uid: 181
     components:
     - type: Transform
       pos: 2.5,-12.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1227
-      - 1226
   - uid: 224
     components:
     - type: Transform
       pos: 1.5,-12.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1227
-      - 1226
   - uid: 273
     components:
     - type: Transform
       pos: 0.5,-12.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1227
-      - 1226
   - uid: 275
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -6.5,-11.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1226
-      - 1227
   - uid: 284
     components:
     - type: Transform
       pos: 6.5,-12.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 1227
-      - 1226
   - uid: 1228
     components:
     - type: Transform
       pos: 13.5,-6.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 135
   - uid: 1231
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 0.5,2.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 130
   - uid: 1232
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 14.5,-5.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 135
   - uid: 1298
     components:
     - type: Transform
       pos: 0.5,-1.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 130
 - proto: BookshelfFilled
   entities:
   - uid: 1191
@@ -6717,13 +6639,18 @@ entities:
     - type: Transform
       pos: 2.5,19.5
       parent: 1
-    - type: Physics
-      canCollide: False
     - type: ContainerContainer
       containers:
         board: !type:Container
+          showEnts: False
+          occludes: True
           ents: []
-        bank-ATM-cashSlot: !type:ContainerSlot {}
+        bank-ATM-cashSlot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+    - type: Physics
+      canCollide: False
     - type: ItemSlots
 - proto: CrateArtifactContainer
   entities:
@@ -10900,12 +10827,19 @@ entities:
     - type: Transform
       pos: 8.5,3.5
       parent: 1
+- proto: LockerWallMaterialsFuelAmeJarFilled
+  entities:
+  - uid: 1975
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-10.5
+      parent: 1
 - proto: MachineArtifactAnalyzer
   entities:
   - uid: 4
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
       pos: 0.5,0.5
       parent: 1
 - proto: Matchbox
@@ -10929,6 +10863,32 @@ entities:
     - type: Transform
       pos: 8.5,24.5
       parent: 1
+- proto: NFSignDock
+  entities:
+  - uid: 1526
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -10.5,17.5
+      parent: 1
+  - uid: 1527
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -10.5,13.5
+      parent: 1
+  - uid: 1528
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,17.5
+      parent: 1
+  - uid: 1529
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,13.5
+      parent: 1
 - proto: NitrogenCanister
   entities:
   - uid: 1318
@@ -12117,7 +12077,7 @@ entities:
         - Pressed: Toggle
         129:
         - Pressed: Toggle
-- proto: SignAtmosMinsky
+- proto: SignAtmos
   entities:
   - uid: 1936
     components:
@@ -12269,32 +12229,6 @@ entities:
     - type: Transform
       pos: -8.5,-2.5
       parent: 1
-- proto: NFSignDock
-  entities:
-  - uid: 1526
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -10.5,17.5
-      parent: 1
-  - uid: 1527
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -10.5,13.5
-      parent: 1
-  - uid: 1528
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 11.5,17.5
-      parent: 1
-  - uid: 1529
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 11.5,13.5
-      parent: 1
 - proto: SignToolStorage
   entities:
   - uid: 1904