diff --git a/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml b/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml
index 248d35cfcf8..28b3b9d3b19 100644
--- a/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml
+++ b/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml
@@ -20,9 +20,6 @@ entities:
     components:
     - type: MetaData
       name: Sprinter
-    - type: Transform
-      pos: -1.3749695,4.533844
-      parent: invalid
     - type: MapGrid
       chunks:
         0,0:
@@ -110,6 +107,16 @@ entities:
             id: Caution
           decals:
             1: 11,-4
+        - node:
+            color: '#3AB3DAFF'
+            id: DeliveryGreyscale
+          decals:
+            503: -2,-12
+        - node:
+            color: '#F9801DFF'
+            id: DeliveryGreyscale
+          decals:
+            502: -1,-12
         - node:
             cleanable: True
             color: '#C7621F47'
@@ -458,6 +465,8 @@ entities:
             486: -8,-5
             488: 6,-4
             489: 7,-4
+            512: 2,-8
+            513: 2,-8
         - node:
             cleanable: True
             color: '#FF0000FF'
@@ -988,9 +997,6 @@ entities:
     - type: Transform
       pos: -3.5,-2.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 412
 - proto: AirlockMercenaryLocked
   entities:
   - uid: 21
@@ -1015,22 +1021,12 @@ entities:
           ent: 33
 - proto: AmeJar
   entities:
-  - uid: 25
-    components:
-    - type: Transform
-      pos: 0.6948629,7.6918755
-      parent: 1
   - uid: 33
     components:
     - type: Transform
       parent: 32
     - type: Physics
       canCollide: False
-  - uid: 415
-    components:
-    - type: Transform
-      pos: 0.3256532,7.6657753
-      parent: 1
 - proto: AmeShielding
   entities:
   - uid: 24
@@ -1103,62 +1099,71 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,-0.5
       parent: 1
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
   - uid: 40
     components:
     - type: Transform
-      pos: 12.5,-5.5
+      rot: -1.5707963267948966 rad
+      pos: -12.5,-5.5
       parent: 1
   - uid: 41
     components:
     - type: Transform
-      pos: -12.5,-5.5
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-5.5
       parent: 1
   - uid: 42
     components:
     - type: Transform
-      pos: -12.5,-3.5
+      rot: 1.5707963267948966 rad
+      pos: 12.5,-3.5
       parent: 1
   - uid: 43
     components:
     - type: Transform
-      pos: 12.5,-3.5
+      rot: -1.5707963267948966 rad
+      pos: -12.5,-3.5
       parent: 1
   - uid: 44
     components:
     - type: Transform
-      pos: -5.5,-7.5
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-9.5
       parent: 1
   - uid: 45
     components:
     - type: Transform
-      pos: -5.5,-9.5
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-7.5
       parent: 1
   - uid: 46
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -5.5,-8.5
       parent: 1
   - uid: 47
     components:
     - type: Transform
-      pos: -10.5,-1.5
+      rot: 3.141592653589793 rad
+      pos: 10.5,-1.5
       parent: 1
   - uid: 48
     components:
     - type: Transform
-      pos: -10.5,-6.5
+      pos: 10.5,-6.5
       parent: 1
   - uid: 49
     components:
     - type: Transform
-      pos: 10.5,-6.5
+      pos: -10.5,-6.5
       parent: 1
   - uid: 50
     components:
     - type: Transform
-      pos: 10.5,-1.5
+      rot: 3.141592653589793 rad
+      pos: -10.5,-1.5
       parent: 1
 - proto: AtmosFixBlockerMarker
   entities:
@@ -1610,25 +1615,16 @@ entities:
     - type: Transform
       pos: -5.5,-9.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 36
   - uid: 65
     components:
     - type: Transform
       pos: -5.5,-7.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 36
   - uid: 66
     components:
     - type: Transform
       pos: -5.5,-8.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 36
 - proto: BookRandomStory
   entities:
   - uid: 590
@@ -2326,13 +2322,6 @@ entities:
     - type: Transform
       pos: -2.4529943,1.6674619
       parent: 1
-- proto: ClothingOuterWinterPara
-  entities:
-  - uid: 395
-    components:
-    - type: Transform
-      pos: 2.53125,-6.401108
-      parent: 1
 - proto: ComputerPowerMonitoring
   entities:
   - uid: 224
@@ -3576,7 +3565,7 @@ entities:
   - uid: 437
     components:
     - type: Transform
-      pos: 0.5,6.5
+      pos: 0.5,7.5
       parent: 1
 - proto: Grille
   entities:
@@ -3789,13 +3778,6 @@ entities:
     - type: Transform
       pos: -1.5,-1.5
       parent: 1
-- proto: LockerMedicalFilled
-  entities:
-  - uid: 176
-    components:
-    - type: Transform
-      pos: 2.5,-7.5
-      parent: 1
 - proto: LockerMercenaryFilled
   entities:
   - uid: 147
@@ -3810,6 +3792,21 @@ entities:
     - type: Transform
       pos: -3.5,-6.5
       parent: 1
+- proto: LockerWallMaterialsFuelAmeJarFilled
+  entities:
+  - uid: 238
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,6.5
+      parent: 1
+- proto: LockerWallMedicalDoctorFilled
+  entities:
+  - uid: 176
+    components:
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 1
 - proto: Mirror
   entities:
   - uid: 369
@@ -3972,11 +3969,6 @@ entities:
     - type: Transform
       pos: 3.5,4.5
       parent: 1
-  - uid: 627
-    components:
-    - type: Transform
-      pos: 0.5,7.5
-      parent: 1
 - proto: RagItem
   entities:
   - uid: 628
@@ -4177,49 +4169,31 @@ entities:
     - type: Transform
       pos: -1.5,12.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 693
   - uid: 217
     components:
     - type: Transform
       pos: -2.5,11.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 693
   - uid: 687
     components:
     - type: Transform
       pos: 0.5,12.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 693
   - uid: 688
     components:
     - type: Transform
       pos: -0.5,12.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 693
   - uid: 691
     components:
     - type: Transform
       pos: 1.5,12.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 693
   - uid: 692
     components:
     - type: Transform
       pos: 2.5,11.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 693
 - proto: SignalButton
   entities:
   - uid: 412
@@ -4461,8 +4435,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -5.5,-0.5
       parent: 1
-    - type: Physics
-      canCollide: False
 - proto: TableCarpet
   entities:
   - uid: 58