diff --git a/Resources/Maps/Shuttles/investigator.yml b/Resources/Maps/Shuttles/investigator.yml
index d90bae49c74..4462441ae79 100644
--- a/Resources/Maps/Shuttles/investigator.yml
+++ b/Resources/Maps/Shuttles/investigator.yml
@@ -14,24 +14,12 @@ tilemap:
 entities:
 - proto: ""
   entities:
-  - uid: 1
-    components:
-    - name: map 20
-      type: MetaData
-    - type: Transform
-    - type: Map
-    - type: PhysicsMap
-    - type: GridTree
-    - type: MovedGrids
-    - type: Broadphase
-    - type: OccluderTree
-    - type: LoadedMap
   - uid: 2
     components:
     - name: grid
       type: MetaData
     - pos: -2.6107569,3.2554395
-      parent: 1
+      parent: invalid
       type: Transform
     - chunks:
         0,0:
@@ -348,20 +336,21 @@ entities:
           0,0:
             0: 65535
           1,0:
-            0: 65535
+            0: 65527
+            1: 8
           0,1:
             0: 4095
           1,1:
             0: 1911
-            1: 8
+            2: 8
           2,0:
             0: 65535
           2,1:
             0: 14
-            1: 1
+            2: 1
           3,0:
             0: 4369
-            1: 238
+            2: 238
           3,1:
             0: 1
           0,-3:
@@ -388,38 +377,39 @@ entities:
             0: 4369
           3,-1:
             0: 4369
-            1: 12000
+            2: 12000
           -2,-3:
             0: 52224
           -2,-2:
             0: 52428
           -2,-1:
             0: 52428
-            1: 9008
+            2: 9008
           -1,-3:
             0: 65280
           -1,-2:
             0: 65535
           -1,-1:
-            0: 65535
+            0: 65343
+            1: 192
           -2,0:
             0: 52428
-            1: 51
+            2: 51
           -2,1:
             0: 12
           -1,0:
             0: 65535
           -1,1:
             0: 3
-            1: 12
+            2: 12
           -3,-1:
-            1: 12272
+            2: 12272
           -3,0:
-            1: 255
+            2: 255
           4,-1:
-            1: 10096
+            2: 10096
           4,0:
-            1: 119
+            2: 119
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -436,6 +426,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.14996
+          moles:
+          - 20.078888
+          - 75.53487
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -3073,6 +3078,24 @@ entities:
     - pos: 7.5,0.5
       parent: 2
       type: Transform
+    - air:
+        volume: 200
+        immutable: False
+        temperature: 293.1496
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+      type: EntityStorage
 - proto: LockerSalvageSpecialistFilled
   entities:
   - uid: 193
@@ -3080,6 +3103,24 @@ entities:
     - pos: -1.5,-2.5
       parent: 2
       type: Transform
+    - air:
+        volume: 200
+        immutable: False
+        temperature: 293.1496
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+      type: EntityStorage
 - proto: MachineArtifactAnalyzer
   entities:
   - uid: 125
@@ -4028,8 +4069,24 @@ entities:
     - pos: -0.5,-2.5
       parent: 2
       type: Transform
-    - locked: False
-      type: Lock
+    - air:
+        volume: 200
+        immutable: False
+        temperature: 293.1496
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+      type: EntityStorage
 - proto: Table
   entities:
   - uid: 223