reach update (#31336)

* reach update

* remove invalid

diff --git a/Resources/Maps/reach.yml b/Resources/Maps/reach.yml
index 821e3fc0f65cdb7eb5e5137b18a9b7dae4c242e2..bf2e0ec5a0e1f510f1c05f8658f7fa63d5e35b4e 100644 (file)
--- a/Resources/Maps/reach.yml
+++ b/Resources/Maps/reach.yml
@@ -3,6 +3,7 @@ meta:
   postmapinit: false
 tilemap:
   0: Space
+  1: FloorBlueCircuit
   31: FloorDark
   36: FloorDarkMono
   47: FloorGlass
@@ -15,6 +16,7 @@ tilemap:
   79: FloorReinforced
   80: FloorReinforcedHardened
   93: FloorSteel
+  2: FloorSteelLime
   108: FloorTechMaint
   109: FloorTechMaint2
   110: FloorTechMaint3
@@ -55,11 +57,11 @@ entities:
           version: 6
         -1,0:
           ind: -1,0
-          tiles: bQAAAAAATgAAAAABLwAAAAABLwAAAAADLwAAAAAALwAAAAADLwAAAAABLwAAAAADLwAAAAADLwAAAAACLwAAAAABLwAAAAABTgAAAAACHwAAAAAAHwAAAAADHwAAAAABfgAAAAAATgAAAAABTgAAAAABTgAAAAACTgAAAAADTgAAAAADTgAAAAADTgAAAAADTgAAAAABTgAAAAAATgAAAAAATgAAAAADTgAAAAAAHwAAAAABHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAegAAAAAAegAAAAABegAAAAAAegAAAAAAfgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfgAAAAAAHwAAAAADHwAAAAACfgAAAAAAPAAAAAAATQAAAAAATQAAAAADHwAAAAAAegAAAAAAegAAAAAAegAAAAABegAAAAACHwAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAPAAAAAAATQAAAAAAPAAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAACfgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAABHwAAAAAAJAAAAAABfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAABJAAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAAHwAAAAACHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAATwAAAAAATwAAAAAAHwAAAAAAHwAAAAABJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADJAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
+          tiles: bQAAAAAATgAAAAABLwAAAAABLwAAAAADLwAAAAAALwAAAAADLwAAAAABLwAAAAADLwAAAAADLwAAAAACLwAAAAABLwAAAAABTgAAAAACHwAAAAAAHwAAAAADHwAAAAABfgAAAAAATgAAAAABTgAAAAABTgAAAAACTgAAAAADTgAAAAADTgAAAAADTgAAAAADTgAAAAABTgAAAAAATgAAAAAATgAAAAADTgAAAAAAHwAAAAABHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAPAAAAAAATQAAAAAAPAAAAAAAfgAAAAAAegAAAAAAegAAAAABegAAAAAAegAAAAAAfgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfgAAAAAAHwAAAAADHwAAAAACfgAAAAAAPAAAAAAATQAAAAAATQAAAAADHwAAAAAAegAAAAAAegAAAAAAegAAAAABegAAAAACHwAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAPAAAAAAATQAAAAAAPAAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAACfgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAABHwAAAAAAJAAAAAABfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAABJAAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAATwAAAAAATwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAABJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAATwAAAAAATwAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAADJAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAQAAAAAAAQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAUAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAUAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAXQAAAAABXQAAAAADXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAXQAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAcAAAAAAAcAAAAAABcAAAAAACcAAAAAADcAAAAAAAcAAAAAAAcAAAAAABcAAAAAADcAAAAAACcAAAAAADcAAAAAACfgAAAAAAHwAAAAADegAAAAADHwAAAAACfgAAAAAAcAAAAAABcAAAAAADcAAAAAAAcAAAAAACcAAAAAADcAAAAAACcAAAAAADcAAAAAAAcAAAAAACcAAAAAACcAAAAAAAfgAAAAAAHwAAAAADegAAAAABHwAAAAABfgAAAAAAcAAAAAAAcAAAAAADcAAAAAABcAAAAAAAcAAAAAACcAAAAAABcAAAAAACcAAAAAACcAAAAAAAcAAAAAACcAAAAAABfgAAAAAAHwAAAAAAegAAAAADHwAAAAACfgAAAAAAfgAAAAAAcAAAAAADcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADcAAAAAADcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAcAAAAAABcAAAAAACcAAAAAACfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAcAAAAAABcAAAAAABcAAAAAADfgAAAAAAHwAAAAABHwAAAAAC
+          tiles: AAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAUAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAAgAAAAAAAgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUAAAAAAAUAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAXQAAAAABAgAAAAAAAgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAcAAAAAAAcAAAAAABcAAAAAACcAAAAAADcAAAAAAAcAAAAAAAcAAAAAABcAAAAAADcAAAAAACcAAAAAADcAAAAAACfgAAAAAAHwAAAAADegAAAAADHwAAAAACfgAAAAAAcAAAAAABcAAAAAADcAAAAAAAcAAAAAACcAAAAAADcAAAAAACcAAAAAADcAAAAAAAcAAAAAACcAAAAAACcAAAAAAAfgAAAAAAHwAAAAADegAAAAABHwAAAAABfgAAAAAAcAAAAAAAcAAAAAADcAAAAAABcAAAAAAAcAAAAAACcAAAAAABcAAAAAACcAAAAAACcAAAAAAAcAAAAAACcAAAAAABfgAAAAAAHwAAAAAAegAAAAADHwAAAAACfgAAAAAAfgAAAAAAcAAAAAADcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADcAAAAAADcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAcAAAAAABcAAAAAACcAAAAAACfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAcAAAAAABcAAAAAABcAAAAAADfgAAAAAAHwAAAAABHwAAAAAC
           version: 6
         -2,0:
           ind: -2,0
@@ -110,6 +112,12 @@ entities:
       chunkCollection:
         version: 2
         nodes:
+        - node:
+            angle: -1.5707963267948966 rad
+            color: '#FFFFFFFF'
+            id: Arrows
+          decals:
+            414: -22,0
         - node:
             color: '#FFFFFFFF'
             id: Arrows
@@ -123,13 +131,14 @@ entities:
             257: 0,12
             258: 0,13
             259: 3,13
-            388: -24,0
-            389: -22,0
             392: -23,-3
             393: -19,-5
             394: -19,-3
             395: -19,3
             398: -17,-1
+            399: -23,-1
+            400: -23,1
+            413: -24,0
         - node:
             color: '#FFFFFFFF'
             id: BotLeft
@@ -145,11 +154,6 @@ entities:
           decals:
             386: -22,-1
             387: -24,1
-        - node:
-            color: '#FFFFFFFF'
-            id: Box
-          decals:
-            390: -23,0
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkBox
@@ -173,18 +177,24 @@ entities:
             color: '#D381C996'
             id: BrickTileSteelCornerNw
           decals:
-            285: -6,8
-            292: -3,11
+            403: -7,9
+            407: -5,11
         - node:
             color: '#D381C996'
             id: BrickTileSteelCornerSw
           decals:
             286: -6,7
+            401: -7,8
         - node:
             color: '#D381C996'
             id: BrickTileSteelInnerNw
           decals:
-            295: -3,8
+            405: -5,9
+        - node:
+            color: '#D381C996'
+            id: BrickTileSteelInnerSw
+          decals:
+            402: -6,8
         - node:
             color: '#52B4E996'
             id: BrickTileSteelLineE
@@ -201,8 +211,9 @@ entities:
             color: '#D381C996'
             id: BrickTileSteelLineN
           decals:
-            296: -4,8
-            297: -5,8
+            404: -6,9
+            408: -4,11
+            409: -3,11
         - node:
             color: '#D381C996'
             id: BrickTileSteelLineS
@@ -214,8 +225,7 @@ entities:
             color: '#D381C996'
             id: BrickTileSteelLineW
           decals:
-            293: -3,10
-            294: -3,9
+            406: -5,10
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteBox
@@ -393,6 +403,9 @@ entities:
             78: 7,-3
             79: 9,-3
             80: 10,-3
+            410: 8,-3
+            411: 5,-3
+            412: 11,-3
         - node:
             color: '#DE3A3A96'
             id: BrickTileWhiteLineS
@@ -572,6 +585,7 @@ entities:
             279: 1,8
             280: 0,8
             281: 1,7
+            416: 3,-14
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -597,6 +611,7 @@ entities:
             1: 2,-13
             2: 2,-12
             3: 3,-13
+            415: 3,-14
         - node:
             color: '#FFFFFFFF'
             id: Grasse2
@@ -1020,9 +1035,9 @@ entities:
           -4,-1:
             0: 61166
           -5,-1:
-            0: 61167
+            0: 65263
           -4,0:
-            0: 57583
+            0: 59119
           -3,-2:
             0: 61440
           -3,-1:
@@ -1066,7 +1081,7 @@ entities:
           0,2:
             0: 65535
           -1,2:
-            0: 61311
+            0: 65407
           0,3:
             0: 29439
           0,4:
@@ -1112,9 +1127,10 @@ entities:
           4,0:
             0: 54783
           4,1:
-            0: 221
+            0: 157
+            4: 64
           -5,0:
-            0: 61166
+            0: 61183
           -4,1:
             0: 3822
           -5,1:
@@ -1132,8 +1148,7 @@ entities:
           -2,1:
             0: 57567
           -2,2:
-            1: 16
-            0: 2188
+            0: 61166
           -1,4:
             0: 174
           1,-4:
@@ -1269,6 +1284,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.14975
+          moles:
+          - 20.078888
+          - 75.53487
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
@@ -1421,7 +1451,6 @@ entities:
       - 1088
       - 1087
       - 1086
-      - 1102
       - 1097
       - 1096
       - 1083
@@ -1449,13 +1478,6 @@ entities:
     - type: Transform
       pos: 6.5,-10.5
       parent: 2
-- proto: AirlockAtmosphericsGlassLocked
-  entities:
-  - uid: 17
-    components:
-    - type: Transform
-      pos: 3.5,-12.5
-      parent: 2
 - proto: AirlockAtmosphericsLocked
   entities:
   - uid: 18
@@ -1594,6 +1616,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: -2.5,17.5
       parent: 2
+- proto: AirlockExternalShuttleLocked
+  entities:
+  - uid: 2036
+    components:
+    - type: Transform
+      pos: -17.5,-5.5
+      parent: 2
 - proto: AirlockGlass
   entities:
   - uid: 36
@@ -1639,6 +1668,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: 7.5,19.5
       parent: 2
+- proto: AirlockHydroponicsLocked
+  entities:
+  - uid: 2060
+    components:
+    - type: Transform
+      pos: -13.5,2.5
+      parent: 2
 - proto: AirlockJanitorLocked
   entities:
   - uid: 44
@@ -1829,6 +1865,11 @@ entities:
     - type: Transform
       pos: -0.5,17.5
       parent: 2
+  - uid: 1685
+    components:
+    - type: Transform
+      pos: -17.5,-5.5
+      parent: 2
 - proto: AtmosFixNitrogenMarker
   entities:
   - uid: 76
@@ -1862,10 +1903,10 @@ entities:
       parent: 2
 - proto: BarSignTheLightbulb
   entities:
-  - uid: 81
+  - uid: 1102
     components:
     - type: Transform
-      pos: -12.5,2.5
+      pos: -9.5,6.5
       parent: 2
 - proto: BaseResearchAndDevelopmentPointSource
   entities:
@@ -1929,14 +1970,15 @@ entities:
     - type: Transform
       pos: 19.5,4.5
       parent: 2
-- proto: BlastDoorScience
+- proto: BlastDoor
   entities:
-  - uid: 92
+  - uid: 910
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,10.5
+      pos: -7.5,11.5
       parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 1
 - proto: BluespaceBeaker
   entities:
   - uid: 93
@@ -1998,16 +2040,20 @@ entities:
     - type: Transform
       pos: -12.730633,3.8739996
       parent: 2
-- proto: ButtonFrameCaution
+- proto: ButtonFrameCautionSecurity
   entities:
-  - uid: 102
+  - uid: 2456
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -19.5,2.5
+      pos: -3.5,12.5
       parent: 2
 - proto: CableApcExtension
   entities:
+  - uid: 92
+    components:
+    - type: Transform
+      pos: -4.5,11.5
+      parent: 2
   - uid: 103
     components:
     - type: Transform
@@ -3798,6 +3844,21 @@ entities:
     - type: Transform
       pos: 10.5,-8.5
       parent: 2
+  - uid: 1879
+    components:
+    - type: Transform
+      pos: -6.5,11.5
+      parent: 2
+  - uid: 2294
+    components:
+    - type: Transform
+      pos: -5.5,11.5
+      parent: 2
+  - uid: 2298
+    components:
+    - type: Transform
+      pos: -4.5,10.5
+      parent: 2
 - proto: CableHV
   entities:
   - uid: 461
@@ -4857,11 +4918,6 @@ entities:
     - type: Transform
       pos: -8.5,0.5
       parent: 2
-  - uid: 672
-    components:
-    - type: Transform
-      pos: -9.5,6.5
-      parent: 2
   - uid: 673
     components:
     - type: Transform
@@ -5796,6 +5852,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 4.5,3.5
       parent: 2
+  - uid: 1614
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-11.5
+      parent: 2
 - proto: ChairFolding
   entities:
   - uid: 853
@@ -5811,12 +5873,6 @@ entities:
       parent: 2
 - proto: ChairOfficeDark
   entities:
-  - uid: 855
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,9.5
-      parent: 2
   - uid: 856
     components:
     - type: Transform
@@ -5836,6 +5892,12 @@ entities:
       parent: 2
 - proto: ChairOfficeLight
   entities:
+  - uid: 855
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5738664,11.146056
+      parent: 2
   - uid: 859
     components:
     - type: Transform
@@ -6087,6 +6149,24 @@ entities:
     - type: Transform
       pos: 18.5,6.5
       parent: 2
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
 - proto: ClothingBackpackERTJanitor
   entities:
   - uid: 887
@@ -6173,15 +6253,6 @@ entities:
     - type: Physics
       canCollide: False
     - type: InsideEntityStorage
-- proto: ClothingOuterHardsuitRd
-  entities:
-  - uid: 911
-    components:
-    - type: Transform
-      parent: 910
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: ClothingOuterHardsuitSalvage
   entities:
   - uid: 914
@@ -6321,15 +6392,15 @@ entities:
       parent: 2
 - proto: ComputerAnalysisConsole
   entities:
-  - uid: 935
+  - uid: 1801
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -2.5,10.5
+      pos: -4.5,11.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        1658:
+        1070:
         - ArtifactAnalyzerSender: ArtifactAnalyzerReceiver
 - proto: ComputerCargoBounty
   entities:
@@ -6424,18 +6495,11 @@ entities:
       parent: 2
 - proto: ComputerResearchAndDevelopment
   entities:
-  - uid: 948
-    components:
-    - type: Transform
-      pos: -1.5,12.5
-      parent: 2
-- proto: ComputerRoboticsControl
-  entities:
-  - uid: 949
+  - uid: 1862
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -2.5,9.5
+      pos: -4.5,10.5
       parent: 2
 - proto: ComputerSalvageExpedition
   entities:
@@ -6482,6 +6546,13 @@ entities:
     - type: Transform
       pos: 19.5,-2.5
       parent: 2
+- proto: ComputerTechnologyDiskTerminal
+  entities:
+  - uid: 911
+    components:
+    - type: Transform
+      pos: -1.5,12.5
+      parent: 2
 - proto: ConveyorBelt
   entities:
   - uid: 956
@@ -6521,13 +6592,6 @@ entities:
     - type: Transform
       pos: 3.5,8.5
       parent: 2
-- proto: CrateArtifactContainer
-  entities:
-  - uid: 963
-    components:
-    - type: Transform
-      pos: -5.5,8.5
-      parent: 2
 - proto: CrateEngineeringCableBulk
   entities:
   - uid: 964
@@ -6552,6 +6616,13 @@ entities:
     - type: SingletonDeviceNetServer
       active: False
       available: False
+- proto: CrowbarYellow
+  entities:
+  - uid: 2408
+    components:
+    - type: Transform
+      pos: -18.519308,1.468835
+      parent: 2
 - proto: CryogenicSleepUnitSpawnerLateJoin
   entities:
   - uid: 967
@@ -7112,15 +7183,6 @@ entities:
     - type: Transform
       pos: 24.577494,2.096348
       parent: 2
-- proto: DoorRemoteResearch
-  entities:
-  - uid: 912
-    components:
-    - type: Transform
-      parent: 910
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: DrinkVodkaBottleFull
   entities:
   - uid: 1057
@@ -7133,7 +7195,7 @@ entities:
   - uid: 1058
     components:
     - type: Transform
-      pos: 18.269522,5.673076
+      pos: 18.26465,5.6096234
       parent: 2
 - proto: EmergencyLight
   entities:
@@ -7202,33 +7264,32 @@ entities:
     - type: Transform
       pos: 2.3683515,-0.47065163
       parent: 2
-- proto: FaxMachineBase
+- proto: ExtinguisherCabinetFilled
   entities:
-  - uid: 2496
+  - uid: 2457
     components:
     - type: Transform
-      pos: 11.5,3.5
+      pos: 9.5,6.5
       parent: 2
-- proto: FirelockEdge
-  entities:
-  - uid: 1070
+  - uid: 2458
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-2.5
+      pos: 7.5,-9.5
       parent: 2
-  - uid: 1071
+  - uid: 2459
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-3.5
+      pos: 1.5,-9.5
       parent: 2
-  - uid: 1072
+- proto: FaxMachineBase
+  entities:
+  - uid: 2496
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 8.5,-3.5
+      pos: 11.5,3.5
       parent: 2
+- proto: FirelockEdge
+  entities:
   - uid: 1073
     components:
     - type: Transform
@@ -7247,12 +7308,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -9.5,-1.5
       parent: 2
-  - uid: 1076
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,8.5
-      parent: 2
   - uid: 1077
     components:
     - type: Transform
@@ -7264,6 +7319,11 @@ entities:
       - 12
 - proto: FirelockGlass
   entities:
+  - uid: 1071
+    components:
+    - type: Transform
+      pos: -1.5,2.5
+      parent: 2
   - uid: 1078
     components:
     - type: Transform
@@ -7411,19 +7471,6 @@ entities:
     - type: Transform
       pos: -0.5,8.5
       parent: 2
-  - uid: 1102
-    components:
-    - type: Transform
-      pos: -1.5,2.5
-      parent: 2
-    - type: Door
-      secondsUntilStateChange: -524.5436
-      state: Closing
-    - type: DeviceNetwork
-      deviceLists:
-      - 13
-    - type: Firelock
-      emergencyCloseCooldown: 57.8332775
 - proto: Fireplace
   entities:
   - uid: 1103
@@ -7431,6 +7478,13 @@ entities:
     - type: Transform
       pos: 23.5,-2.5
       parent: 2
+- proto: Flash
+  entities:
+  - uid: 935
+    components:
+    - type: Transform
+      pos: 10.759085,-8.620478
+      parent: 2
 - proto: FlashlightLantern
   entities:
   - uid: 1104
@@ -7466,6 +7520,14 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
+- proto: FuelDispenser
+  entities:
+  - uid: 2453
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-8.5
+      parent: 2
 - proto: GasMinerNitrogen
   entities:
   - uid: 1109
@@ -10811,12 +10873,42 @@ entities:
     - type: Transform
       pos: -20.521126,3.3189971
       parent: 2
-- proto: GeneratorRTGDamaged
+- proto: GeneratorBasic15kW
   entities:
-  - uid: 1519
+  - uid: 1662
     components:
     - type: Transform
-      pos: -22.5,0.5
+      pos: -22.5,1.5
+      parent: 2
+  - uid: 1681
+    components:
+    - type: Transform
+      pos: -21.5,1.5
+      parent: 2
+  - uid: 1682
+    components:
+    - type: Transform
+      pos: -23.5,-0.5
+      parent: 2
+  - uid: 1717
+    components:
+    - type: Transform
+      pos: -21.5,-0.5
+      parent: 2
+  - uid: 1738
+    components:
+    - type: Transform
+      pos: -22.5,-0.5
+      parent: 2
+  - uid: 1804
+    components:
+    - type: Transform
+      pos: -23.5,1.5
+      parent: 2
+  - uid: 2297
+    components:
+    - type: Transform
+      pos: -23.5,0.5
       parent: 2
 - proto: GeneratorWallmountAPU
   entities:
@@ -10838,6 +10930,11 @@ entities:
       radius: 175.75
 - proto: Grille
   entities:
+  - uid: 1072
+    components:
+    - type: Transform
+      pos: -7.5,8.5
+      parent: 2
   - uid: 1522
     components:
     - type: Transform
@@ -11183,42 +11280,22 @@ entities:
     - type: Transform
       pos: -30.5,2.5
       parent: 2
-  - uid: 1591
+  - uid: 1595
     components:
     - type: Transform
-      pos: -8.5,6.5
+      pos: 0.5,14.5
       parent: 2
-  - uid: 1592
+  - uid: 1596
     components:
     - type: Transform
-      pos: -9.5,6.5
+      pos: 0.5,17.5
       parent: 2
-  - uid: 1593
+  - uid: 1597
     components:
     - type: Transform
-      pos: -14.5,2.5
+      pos: 2.5,14.5
       parent: 2
-  - uid: 1594
-    components:
-    - type: Transform
-      pos: -3.5,11.5
-      parent: 2
-  - uid: 1595
-    components:
-    - type: Transform
-      pos: 0.5,14.5
-      parent: 2
-  - uid: 1596
-    components:
-    - type: Transform
-      pos: 0.5,17.5
-      parent: 2
-  - uid: 1597
-    components:
-    - type: Transform
-      pos: 2.5,14.5
-      parent: 2
-  - uid: 1598
+  - uid: 1598
     components:
     - type: Transform
       pos: 6.5,17.5
@@ -11298,25 +11375,35 @@ entities:
     - type: Transform
       pos: 3.5,-14.5
       parent: 2
-  - uid: 1614
+  - uid: 1615
     components:
     - type: Transform
-      pos: 3.5,-13.5
+      pos: 3.5,2.5
       parent: 2
-  - uid: 1615
+  - uid: 1617
     components:
     - type: Transform
-      pos: 3.5,2.5
+      pos: -13.5,7.5
       parent: 2
-  - uid: 1616
+  - uid: 1625
     components:
     - type: Transform
-      pos: -4.5,11.5
+      pos: -5.5,12.5
       parent: 2
-  - uid: 1617
+  - uid: 1644
     components:
     - type: Transform
-      pos: -13.5,7.5
+      pos: -6.5,12.5
+      parent: 2
+  - uid: 1658
+    components:
+    - type: Transform
+      pos: -7.5,10.5
+      parent: 2
+  - uid: 1686
+    components:
+    - type: Transform
+      pos: -7.5,7.5
       parent: 2
 - proto: Gyroscope
   entities:
@@ -11337,15 +11424,6 @@ entities:
     - type: Transform
       pos: 10.650544,-4.5766006
       parent: 2
-- proto: HandTeleporter
-  entities:
-  - uid: 913
-    components:
-    - type: Transform
-      parent: 910
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: HolofanProjector
   entities:
   - uid: 1621
@@ -11372,11 +11450,6 @@ entities:
     - type: Transform
       pos: -12.5,3.5
       parent: 2
-  - uid: 1625
-    components:
-    - type: Transform
-      pos: -13.5,3.5
-      parent: 2
   - uid: 1626
     components:
     - type: Transform
@@ -11500,10 +11573,10 @@ entities:
       parent: 2
 - proto: LockerAtmosphericsFilledHardsuit
   entities:
-  - uid: 1644
+  - uid: 1956
     components:
     - type: Transform
-      pos: 2.5,-11.5
+      pos: 3.5,-13.5
       parent: 2
 - proto: LockerBoozeFilled
   entities:
@@ -11582,24 +11655,11 @@ entities:
       parent: 2
 - proto: LockerScienceFilled
   entities:
-  - uid: 910
+  - uid: 1805
     components:
     - type: Transform
-      pos: -2.5,11.5
+      pos: -6.5,8.5
       parent: 2
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 913
-          - 911
-          - 912
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
 - proto: LockerSecurityFilled
   entities:
   - uid: 1656
@@ -11616,10 +11676,10 @@ entities:
       parent: 2
 - proto: MachineArtifactAnalyzer
   entities:
-  - uid: 1658
+  - uid: 1070
     components:
     - type: Transform
-      pos: -3.5,10.5
+      pos: -5.5,11.5
       parent: 2
 - proto: MachineCentrifuge
   entities:
@@ -11729,6 +11789,11 @@ entities:
       parent: 2
 - proto: PartRodMetal
   entities:
+  - uid: 963
+    components:
+    - type: Transform
+      pos: -21.27457,-2.519871
+      parent: 2
   - uid: 1676
     components:
     - type: Transform
@@ -11739,6 +11804,16 @@ entities:
     - type: Transform
       pos: 7.4046574,-16.509167
       parent: 2
+  - uid: 1684
+    components:
+    - type: Transform
+      pos: -21.27457,-2.519871
+      parent: 2
+  - uid: 2455
+    components:
+    - type: Transform
+      pos: -21.27457,-2.519871
+      parent: 2
 - proto: PianoInstrument
   entities:
   - uid: 1678
@@ -11763,39 +11838,31 @@ entities:
       parent: 2
 - proto: PlasmaReinforcedWindowDirectional
   entities:
-  - uid: 1681
+  - uid: 1593
     components:
     - type: Transform
-      pos: -3.5,9.5
+      rot: -1.5707963267948966 rad
+      pos: -4.5,10.5
       parent: 2
-  - uid: 1682
+  - uid: 1878
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,10.5
+      rot: 3.141592653589793 rad
+      pos: -6.5,9.5
       parent: 2
-  - uid: 1683
+  - uid: 2295
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -2.5,9.5
+      pos: -4.5,11.5
       parent: 2
-- proto: PlasmaTankFilled
+- proto: PlasmaWindoorSecureScienceLocked
   entities:
-  - uid: 1684
-    components:
-    - type: Transform
-      pos: -21.613918,-2.399491
-      parent: 2
-  - uid: 1685
-    components:
-    - type: Transform
-      pos: -21.520168,-2.446366
-      parent: 2
-  - uid: 1686
+  - uid: 1591
     components:
     - type: Transform
-      pos: -21.379543,-2.540116
+      rot: 3.141592653589793 rad
+      pos: -5.5,9.5
       parent: 2
 - proto: PlasticFlapsAirtightClear
   entities:
@@ -11842,6 +11909,13 @@ entities:
     - type: Transform
       pos: -23.5,-1.5
       parent: 2
+- proto: PortableGeneratorSuperPacman
+  entities:
+  - uid: 2443
+    components:
+    - type: Transform
+      pos: -22.5,0.5
+      parent: 2
 - proto: PortableScrubber
   entities:
   - uid: 1694
@@ -11993,13 +12067,6 @@ entities:
     - type: Transform
       pos: 9.5,1.5
       parent: 2
-- proto: PosterLegitReportCrimes
-  entities:
-  - uid: 1717
-    components:
-    - type: Transform
-      pos: -10.5,6.5
-      parent: 2
 - proto: PosterLegitSafetyInternals
   entities:
   - uid: 1718
@@ -12114,6 +12181,11 @@ entities:
       parent: 2
 - proto: PowerCellRecharger
   entities:
+  - uid: 949
+    components:
+    - type: Transform
+      pos: 1.5,-11.5
+      parent: 2
   - uid: 1736
     components:
     - type: Transform
@@ -12124,18 +12196,23 @@ entities:
     - type: Transform
       pos: 2.5,6.5
       parent: 2
-  - uid: 1738
+  - uid: 1739
     components:
     - type: Transform
-      pos: 7.5,-3.5
+      pos: -0.5,10.5
       parent: 2
-  - uid: 1739
+  - uid: 1949
     components:
     - type: Transform
-      pos: -0.5,10.5
+      pos: 8.5,-4.5
       parent: 2
 - proto: Poweredlight
   entities:
+  - uid: 876
+    components:
+    - type: Transform
+      pos: -3.5,11.5
+      parent: 2
   - uid: 1740
     components:
     - type: Transform
@@ -12158,14 +12235,6 @@ entities:
       parent: 2
     - type: ApcPowerReceiver
       powerLoad: 0
-  - uid: 1743
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -17.5,-4.5
-      parent: 2
-    - type: ApcPowerReceiver
-      powerLoad: 0
   - uid: 1744
     components:
     - type: Transform
@@ -12375,6 +12444,12 @@ entities:
       parent: 2
     - type: ApcPowerReceiver
       powerLoad: 0
+  - uid: 1943
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -16.5,-3.5
+      parent: 2
 - proto: PoweredlightLED
   entities:
   - uid: 1771
@@ -12582,38 +12657,6 @@ entities:
     - type: Transform
       pos: -1.5,14.5
       parent: 2
-- proto: RadiationCollector
-  entities:
-  - uid: 1801
-    components:
-    - type: Transform
-      pos: -23.5,-0.5
-      parent: 2
-  - uid: 1802
-    components:
-    - type: Transform
-      pos: -23.5,0.5
-      parent: 2
-  - uid: 1803
-    components:
-    - type: Transform
-      pos: -23.5,1.5
-      parent: 2
-  - uid: 1804
-    components:
-    - type: Transform
-      pos: -21.5,1.5
-      parent: 2
-  - uid: 1805
-    components:
-    - type: Transform
-      pos: -21.5,0.5
-      parent: 2
-  - uid: 1806
-    components:
-    - type: Transform
-      pos: -21.5,-0.5
-      parent: 2
 - proto: Railing
   entities:
   - uid: 1807
@@ -12689,10 +12732,10 @@ entities:
       parent: 2
 - proto: RandomArtifactSpawner
   entities:
-  - uid: 1819
+  - uid: 1743
     components:
     - type: Transform
-      pos: -4.5,10.5
+      pos: -6.5,11.5
       parent: 2
 - proto: RandomBoard
   entities:
@@ -12807,6 +12850,11 @@ entities:
       parent: 2
 - proto: SheetGlass
   entities:
+  - uid: 1594
+    components:
+    - type: Transform
+      pos: -21.352695,-2.519871
+      parent: 2
   - uid: 1837
     components:
     - type: Transform
@@ -12822,12 +12870,15 @@ entities:
     - type: Transform
       pos: 19.12654,-4.309994
       parent: 2
-- proto: SheetPlasma
-  entities:
-  - uid: 1840
+  - uid: 1855
+    components:
+    - type: Transform
+      pos: -21.352695,-2.519871
+      parent: 2
+  - uid: 1856
     components:
     - type: Transform
-      pos: -21.551367,-2.3599691
+      pos: -21.352695,-2.519871
       parent: 2
 - proto: SheetPlastic
   entities:
@@ -12848,6 +12899,11 @@ entities:
       parent: 2
 - proto: SheetSteel
   entities:
+  - uid: 1683
+    components:
+    - type: Transform
+      pos: -21.64957,-2.504246
+      parent: 2
   - uid: 1844
     components:
     - type: Transform
@@ -12873,6 +12929,23 @@ entities:
     - type: Transform
       pos: 19.704664,-4.278744
       parent: 2
+  - uid: 1944
+    components:
+    - type: Transform
+      pos: -21.64957,-2.504246
+      parent: 2
+  - uid: 1945
+    components:
+    - type: Transform
+      pos: -21.64957,-2.504246
+      parent: 2
+- proto: SheetUranium
+  entities:
+  - uid: 948
+    components:
+    - type: Transform
+      pos: -20.53674,3.6443589
+      parent: 2
 - proto: ShuttersNormalOpen
   entities:
   - uid: 1849
@@ -12902,35 +12975,25 @@ entities:
     - type: Transform
       pos: -14.5,2.5
       parent: 2
-- proto: ShuttersRadiation
+- proto: ShuttersWindowOpen
   entities:
-  - uid: 1854
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -19.5,-0.5
-      parent: 2
-  - uid: 1855
+  - uid: 1857
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -19.5,0.5
+      pos: -9.5,2.5
       parent: 2
-  - uid: 1856
+- proto: ShuttleWindow
+  entities:
+  - uid: 913
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -19.5,1.5
+      pos: -5.5,12.5
       parent: 2
-- proto: ShuttersWindowOpen
-  entities:
-  - uid: 1857
+  - uid: 1803
     components:
     - type: Transform
-      pos: -9.5,2.5
+      pos: -6.5,12.5
       parent: 2
-- proto: ShuttleWindow
-  entities:
   - uid: 1858
     components:
     - type: Transform
@@ -12951,11 +13014,6 @@ entities:
     - type: Transform
       pos: 12.5,-10.5
       parent: 2
-  - uid: 1862
-    components:
-    - type: Transform
-      pos: 3.5,-13.5
-      parent: 2
   - uid: 1863
     components:
     - type: Transform
@@ -13031,21 +13089,6 @@ entities:
     - type: Transform
       pos: -16.5,7.5
       parent: 2
-  - uid: 1878
-    components:
-    - type: Transform
-      pos: -14.5,2.5
-      parent: 2
-  - uid: 1879
-    components:
-    - type: Transform
-      pos: -9.5,6.5
-      parent: 2
-  - uid: 1880
-    components:
-    - type: Transform
-      pos: -8.5,6.5
-      parent: 2
   - uid: 1881
     components:
     - type: Transform
@@ -13076,11 +13119,6 @@ entities:
     - type: Transform
       pos: -8.5,-5.5
       parent: 2
-  - uid: 1887
-    components:
-    - type: Transform
-      pos: -3.5,11.5
-      parent: 2
   - uid: 1888
     components:
     - type: Transform
@@ -13356,36 +13394,21 @@ entities:
     - type: Transform
       pos: 6.5,19.5
       parent: 2
-  - uid: 1943
+  - uid: 2061
     components:
     - type: Transform
-      pos: -4.5,11.5
+      pos: -7.5,7.5
       parent: 2
-- proto: SignalButton
-  entities:
-  - uid: 1944
+  - uid: 2172
     components:
     - type: Transform
-      pos: -5.5,9.5
+      pos: -7.5,8.5
       parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        92:
-        - Pressed: Toggle
-  - uid: 1945
+  - uid: 2269
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -19.5,2.5
+      pos: -7.5,10.5
       parent: 2
-    - type: DeviceLinkSource
-      linkedPorts:
-        1856:
-        - Pressed: Toggle
-        1855:
-        - Pressed: Toggle
-        1854:
-        - Pressed: Toggle
 - proto: SignalButtonDirectional
   entities:
   - uid: 1946
@@ -13424,12 +13447,23 @@ entities:
         - Pressed: Toggle
         1852:
         - Pressed: Toggle
+- proto: SignalSwitchDirectional
+  entities:
+  - uid: 1802
+    components:
+    - type: Transform
+      pos: -3.5,12.5
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        910:
+        - Status: Toggle
 - proto: SignAtmos
   entities:
-  - uid: 1949
+  - uid: 2296
     components:
     - type: Transform
-      pos: 1.5,-11.5
+      pos: 1.5,-13.5
       parent: 2
 - proto: SignBar
   entities:
@@ -13459,6 +13493,13 @@ entities:
     - type: Transform
       pos: 3.5,-8.5
       parent: 2
+- proto: SignEngine
+  entities:
+  - uid: 1806
+    components:
+    - type: Transform
+      pos: -19.5,2.5
+      parent: 2
 - proto: SignEngineering
   entities:
   - uid: 1954
@@ -13473,12 +13514,12 @@ entities:
     - type: Transform
       pos: -15.5,6.5
       parent: 2
-- proto: SignKiddiePlaque
+- proto: SignHydro1
   entities:
-  - uid: 1956
+  - uid: 81
     components:
     - type: Transform
-      pos: -17.5,-5.5
+      pos: -12.5,2.5
       parent: 2
 - proto: SignMedical
   entities:
@@ -13795,6 +13836,18 @@ entities:
     - type: Transform
       pos: 12.5,-4.5
       parent: 2
+- proto: StationMap
+  entities:
+  - uid: 2497
+    components:
+    - type: Transform
+      pos: 1.5,-8.5
+      parent: 2
+  - uid: 2498
+    components:
+    - type: Transform
+      pos: 4.5,12.5
+      parent: 2
 - proto: StatueVenusBlue
   entities:
   - uid: 2005
@@ -14064,15 +14117,13 @@ entities:
     - type: Transform
       pos: 10.559818,-4.3941536
       parent: 2
-- proto: SyringeTranexamicAcid
+- proto: Table
   entities:
-  - uid: 2036
+  - uid: 1519
     components:
     - type: Transform
-      pos: 9.481693,-3.4879038
+      pos: -14.5,2.5
       parent: 2
-- proto: Table
-  entities:
   - uid: 2037
     components:
     - type: Transform
@@ -14197,16 +14248,6 @@ entities:
     - type: Transform
       pos: 4.5,-3.5
       parent: 2
-  - uid: 2060
-    components:
-    - type: Transform
-      pos: 7.5,-3.5
-      parent: 2
-  - uid: 2061
-    components:
-    - type: Transform
-      pos: 9.5,-3.5
-      parent: 2
   - uid: 2062
     components:
     - type: Transform
@@ -14252,8 +14293,19 @@ entities:
     - type: Transform
       pos: 8.5,1.5
       parent: 2
+  - uid: 2445
+    components:
+    - type: Transform
+      pos: 8.5,-4.5
+      parent: 2
 - proto: TableReinforced
   entities:
+  - uid: 1887
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-11.5
+      parent: 2
   - uid: 2070
     components:
     - type: Transform
@@ -14691,6 +14743,26 @@ entities:
       parent: 2
 - proto: WallShuttle
   entities:
+  - uid: 672
+    components:
+    - type: Transform
+      pos: -9.5,6.5
+      parent: 2
+  - uid: 912
+    components:
+    - type: Transform
+      pos: -7.5,9.5
+      parent: 2
+  - uid: 1076
+    components:
+    - type: Transform
+      pos: -8.5,6.5
+      parent: 2
+  - uid: 1616
+    components:
+    - type: Transform
+      pos: -7.5,12.5
+      parent: 2
   - uid: 2134
     components:
     - type: Transform
@@ -14881,11 +14953,6 @@ entities:
     - type: Transform
       pos: 3.5,-11.5
       parent: 2
-  - uid: 2172
-    components:
-    - type: Transform
-      pos: 1.5,-11.5
-      parent: 2
   - uid: 2173
     components:
     - type: Transform
@@ -15099,7 +15166,7 @@ entities:
   - uid: 2215
     components:
     - type: Transform
-      pos: -17.5,-5.5
+      pos: -4.5,12.5
       parent: 2
   - uid: 2216
     components:
@@ -15366,11 +15433,6 @@ entities:
     - type: Transform
       pos: -12.5,2.5
       parent: 2
-  - uid: 2269
-    components:
-    - type: Transform
-      pos: -13.5,2.5
-      parent: 2
   - uid: 2270
     components:
     - type: Transform
@@ -15491,31 +15553,6 @@ entities:
     - type: Transform
       pos: -2.5,-1.5
       parent: 2
-  - uid: 2294
-    components:
-    - type: Transform
-      pos: -7.5,7.5
-      parent: 2
-  - uid: 2295
-    components:
-    - type: Transform
-      pos: -7.5,8.5
-      parent: 2
-  - uid: 2296
-    components:
-    - type: Transform
-      pos: -6.5,8.5
-      parent: 2
-  - uid: 2297
-    components:
-    - type: Transform
-      pos: -6.5,9.5
-      parent: 2
-  - uid: 2298
-    components:
-    - type: Transform
-      pos: -5.5,9.5
-      parent: 2
   - uid: 2299
     components:
     - type: Transform
@@ -16065,11 +16102,6 @@ entities:
     - type: Transform
       pos: 1.5,17.5
       parent: 2
-  - uid: 2408
-    components:
-    - type: Transform
-      pos: -5.5,11.5
-      parent: 2
 - proto: WallShuttleDiagonal
   entities:
   - uid: 2409
@@ -16193,6 +16225,13 @@ entities:
     - type: Transform
       pos: 3.5,7.5
       parent: 2
+- proto: WindoorHydroponicsLocked
+  entities:
+  - uid: 1854
+    components:
+    - type: Transform
+      pos: -14.5,2.5
+      parent: 2
 - proto: WindoorSecure
   entities:
   - uid: 2427
@@ -16201,6 +16240,20 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 9.5,-6.5
       parent: 2
+- proto: WindoorSecureAtmosphericsLocked
+  entities:
+  - uid: 17
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-11.5
+      parent: 2
+  - uid: 1840
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-12.5
+      parent: 2
 - proto: WindoorSecureCargoLocked
   entities:
   - uid: 2428
@@ -16263,6 +16316,24 @@ entities:
       parent: 2
 - proto: WindoorSecureEngineeringLocked
   entities:
+  - uid: 102
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -19.5,-0.5
+      parent: 2
+  - uid: 1819
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -19.5,1.5
+      parent: 2
+  - uid: 1880
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -19.5,0.5
+      parent: 2
   - uid: 2437
     components:
     - type: Transform
@@ -16294,18 +16365,6 @@ entities:
       parent: 2
 - proto: WindoorSecureMedicalLocked
   entities:
-  - uid: 2442
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-3.5
-      parent: 2
-  - uid: 2443
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 8.5,-3.5
-      parent: 2
   - uid: 2444
     components:
     - type: Transform
@@ -16314,17 +16373,6 @@ entities:
       parent: 2
 - proto: WindoorSecureScienceLocked
   entities:
-  - uid: 2445
-    components:
-    - type: Transform
-      pos: -4.5,9.5
-      parent: 2
-    - type: DeviceLinkSource
-      lastSignals:
-        DoorStatus: True
-    - type: Door
-      secondsUntilStateChange: -520.64355
-      state: Opening
   - uid: 2446
     components:
     - type: Transform
@@ -16368,48 +16416,12 @@ entities:
       parent: 2
 - proto: WindowFrostedDirectional
   entities:
-  - uid: 2453
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-3.5
-      parent: 2
   - uid: 2454
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 4.5,-4.5
       parent: 2
-  - uid: 2455
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 6.5,-3.5
-      parent: 2
-  - uid: 2456
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,-3.5
-      parent: 2
-  - uid: 2457
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,-4.5
-      parent: 2
-  - uid: 2458
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 7.5,-3.5
-      parent: 2
-  - uid: 2459
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 9.5,-3.5
-      parent: 2
   - uid: 2460
     components:
     - type: Transform
@@ -16436,6 +16448,12 @@ entities:
       parent: 2
 - proto: WindowReinforcedDirectional
   entities:
+  - uid: 1592
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-13.5
+      parent: 2
   - uid: 2464
     components:
     - type: Transform
@@ -16620,4 +16638,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 22.5,4.5
       parent: 2
+- proto: Wrench
+  entities:
+  - uid: 2442
+    components:
+    - type: Transform
+      pos: -22.499155,-1.51554
+      parent: 2
 ...