From: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com>
Date: Wed, 21 May 2025 23:26:57 +0000 (+1200)
Subject: Evac Shuttle Wode update (#37223)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=0c7cfb528d2a8557db4fe62e3687ece1e5bc148b;p=space-station-14.git

Evac Shuttle Wode update (#37223)
---

diff --git a/Resources/Maps/Shuttles/emergency_wode.yml b/Resources/Maps/Shuttles/emergency_wode.yml
index 5d75f7fc4a..e817441ab7 100644
--- a/Resources/Maps/Shuttles/emergency_wode.yml
+++ b/Resources/Maps/Shuttles/emergency_wode.yml
@@ -1,6 +1,17 @@
 meta:
-  format: 6
-  postmapinit: false
+  format: 7
+  category: Grid
+  engineVersion: 255.1.0
+  forkId: ""
+  forkVersion: ""
+  time: 05/06/2025 11:39:26
+  entityCount: 604
+maps: []
+grids:
+- 2
+orphans:
+- 2
+nullspace: []
 tilemap:
   0: Space
   14: FloorBar
@@ -33,7 +44,7 @@ entities:
           version: 6
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAcQAAAAAAAQAAAAAAcQAAAAAAeQAAAAAAJgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAZAAAAAAAAQAAAAAAAQAAAAAAeQAAAAAAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAZAAAAAAAAQAAAAAAAQAAAAAAeQAAAAAAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAcQAAAAAAAQAAAAAAcQAAAAAAeQAAAAAAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAcQAAAAAAAQAAAAAAcQAAAAAAeQAAAAAAJgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAAQAAAAAAeQAAAAAAeQAAAAAAJgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAZAAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAZAAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAJgAAAAAAZAAAAAAAZAAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAJgAAAAAAZAAAAAAAZAAAAAAAJgAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAJgAAAAAAZAAAAAAAZAAAAAAAJgAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAJgAAAAAAZAAAAAAAZAAAAAAAJgAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAJgAAAAAAZAAAAAAAZAAAAAAAJgAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAcQAAAAAAAQAAAAAAcQAAAAAAeQAAAAAAJgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAcQAAAAAAAQAAAAAAZAAAAAAAeQAAAAAAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAcQAAAAAAAQAAAAAAZAAAAAAAeQAAAAAAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAcQAAAAAAAQAAAAAAcQAAAAAAeQAAAAAAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAcQAAAAAAAQAAAAAAcQAAAAAAeQAAAAAAJgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAAQAAAAAAeQAAAAAAeQAAAAAAJgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAZAAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAZAAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAJgAAAAAAZAAAAAAAZAAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAJgAAAAAAZAAAAAAAZAAAAAAAJgAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAJgAAAAAAZAAAAAAAZAAAAAAAJgAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAJgAAAAAAZAAAAAAAZAAAAAAAJgAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAJgAAAAAAZAAAAAAAZAAAAAAAJgAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
@@ -68,10 +79,10 @@ entities:
       gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg
     - type: DeviceNetwork
+      deviceNetId: Wireless
       configurators: []
       deviceLists: []
       transmitFrequencyId: ShuttleTimer
-      deviceNetId: Wireless
     - type: DecalGrid
       chunkCollection:
         version: 2
@@ -146,15 +157,15 @@ entities:
             62: 1,1
             70: 2,4
             256: -2,19
-            257: -4,20
             258: 0,17
             259: 0,18
             260: 0,19
             261: 1,19
             262: 2,19
             263: 2,18
-            264: -5,1
-            265: -5,2
+            289: -3,2
+            317: -4,20
+            325: -3,1
         - node:
             angle: -1.5707963267948966 rad
             color: '#FFFFFFFF'
@@ -169,6 +180,12 @@ entities:
           decals:
             73: -7,10
             74: -7,18
+        - node:
+            angle: 3.141592653589793 rad
+            color: '#FFFFFFFF'
+            id: Caution
+          decals:
+            291: 2,1
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -176,8 +193,6 @@ entities:
           decals:
             203: -5,8
             204: -4,7
-            205: -1,6
-            206: -1,7
             207: -7,12
             208: -6,15
             209: -4,15
@@ -203,7 +218,6 @@ entities:
             233: 1,17
             234: 0,18
             235: 2,20
-            236: -4,20
             237: -3,17
         - node:
             cleanable: True
@@ -269,14 +283,17 @@ entities:
             132: -7,9
             170: -4,8
             202: 1,3
+        - node:
+            color: '#0000006B'
+            id: WoodTrimThinInnerNe
+          decals:
+            312: -4,0
         - node:
             color: '#0000005B'
             id: WoodTrimThinInnerNw
           decals:
             277: 1,16
             283: -4,18
-            284: -3,19
-            285: -4,0
         - node:
             color: '#0000006A'
             id: WoodTrimThinInnerNw
@@ -286,15 +303,14 @@ entities:
             158: -4,9
             171: 1,8
         - node:
-            color: '#0000005B'
-            id: WoodTrimThinInnerSe
+            color: '#0000006B'
+            id: WoodTrimThinInnerNw
           decals:
-            274: -3,20
+            324: -3,19
         - node:
             color: '#0000006A'
             id: WoodTrimThinInnerSe
           decals:
-            138: -4,20
             152: -7,15
             153: -4,15
             155: 1,15
@@ -302,10 +318,12 @@ entities:
             164: -4,10
             178: 1,8
         - node:
-            color: '#0000005B'
-            id: WoodTrimThinInnerSw
+            color: '#0000006B'
+            id: WoodTrimThinInnerSe
           decals:
-            286: -4,3
+            314: -4,3
+            316: 0,2
+            322: -3,20
         - node:
             color: '#0000006A'
             id: WoodTrimThinInnerSw
@@ -317,12 +335,6 @@ entities:
             165: 1,10
             177: 3,8
             179: 2,2
-        - node:
-            color: '#0000005B'
-            id: WoodTrimThinLineE
-          decals:
-            271: -3,18
-            272: -3,19
         - node:
             color: '#0000006A'
             id: WoodTrimThinLineE
@@ -348,10 +360,13 @@ entities:
             133: -3,17
             201: 1,4
         - node:
-            color: '#0000005B'
-            id: WoodTrimThinLineN
+            color: '#0000006B'
+            id: WoodTrimThinLineE
           decals:
-            288: -5,0
+            308: -4,1
+            309: -4,2
+            320: -3,19
+            321: -3,18
         - node:
             color: '#0000006A'
             id: WoodTrimThinLineN
@@ -370,6 +385,11 @@ entities:
             168: -1,8
             169: 0,8
             200: 2,3
+        - node:
+            color: '#0000006B'
+            id: WoodTrimThinLineN
+          decals:
+            326: -3,0
         - node:
             color: '#0000005B'
             id: WoodTrimThinLineS
@@ -378,7 +398,6 @@ entities:
             278: 0,20
             279: 1,20
             280: 2,20
-            287: -5,3
         - node:
             color: '#0000006A'
             id: WoodTrimThinLineS
@@ -398,16 +417,18 @@ entities:
             175: 0,10
             176: 2,8
             180: 1,2
+        - node:
+            color: '#0000006B'
+            id: WoodTrimThinLineS
+          decals:
+            315: -3,3
         - node:
             color: '#0000005B'
             id: WoodTrimThinLineW
           decals:
             266: 0,2
             267: 0,3
-            268: -4,1
-            269: -4,2
             276: 1,17
-            282: -3,20
         - node:
             color: '#0000006A'
             id: WoodTrimThinLineW
@@ -430,8 +451,12 @@ entities:
             112: -4,7
             119: 2,1
             122: 1,9
-            136: -4,20
             181: 0,1
+        - node:
+            color: '#0000006B'
+            id: WoodTrimThinLineW
+          decals:
+            323: -3,20
     - type: GridAtmosphere
       version: 2
       data:
@@ -439,8 +464,9 @@ entities:
           0,0:
             0: 30580
           0,-1:
-            0: 30576
-            1: 8
+            0: 30480
+            1: 96
+            2: 8
           -1,0:
             0: 48051
           0,1:
@@ -458,7 +484,7 @@ entities:
           0,4:
             0: 30522
           1,1:
-            1: 12560
+            2: 12560
           1,2:
             0: 12592
           1,3:
@@ -466,33 +492,34 @@ entities:
           1,4:
             0: 12593
           -2,1:
-            1: 12832
+            2: 12832
             0: 34824
           -2,2:
             0: 65276
           -2,3:
             0: 61166
           -2,4:
-            0: 47670
+            0: 14902
+            3: 32768
           -2,0:
             0: 34952
           -2,-1:
             0: 32768
-            1: 1024
+            2: 1024
           -1,-1:
             0: 47232
-            1: 4
+            2: 4
           -1,4:
             0: 30577
           -2,5:
-            1: 48
+            2: 48
             0: 8
           -1,5:
             0: 7
           0,5:
             0: 7
           1,5:
-            1: 48
+            2: 48
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -509,6 +536,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 1400.0662
+          - 5266.916
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           immutable: True
           moles:
@@ -524,6 +566,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.14975
+          moles:
+          - 21.824879
+          - 82.10312
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
@@ -610,10 +667,9 @@ entities:
       parent: 2
 - proto: AirlockMedicalGlassLocked
   entities:
-  - uid: 338
+  - uid: 314
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
       pos: -3.5,5.5
       parent: 2
 - proto: AirlockSecurityGlassLocked
@@ -625,7 +681,7 @@ entities:
       parent: 2
 - proto: APCBasic
   entities:
-  - uid: 47
+  - uid: 50
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -657,6 +713,13 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 2.5,17.5
       parent: 2
+- proto: Ashtray
+  entities:
+  - uid: 573
+    components:
+    - type: Transform
+      pos: -2.5024493,8.527765
+      parent: 2
 - proto: AtmosDeviceFanDirectional
   entities:
   - uid: 1
@@ -707,14 +770,20 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 5.5,9.5
       parent: 2
-- proto: BedsheetMedical
+- proto: AtmosFixAirMarker
   entities:
-  - uid: 143
+  - uid: 554
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,2.5
+      pos: 1.5,-2.5
+      parent: 2
+  - uid: 555
+    components:
+    - type: Transform
+      pos: 2.5,-2.5
       parent: 2
+- proto: BedsheetMedical
+  entities:
   - uid: 147
     components:
     - type: Transform
@@ -726,6 +795,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -4.5,4.5
       parent: 2
+  - uid: 423
+    components:
+    - type: Transform
+      pos: -4.5,2.5
+      parent: 2
 - proto: BoozeDispenser
   entities:
   - uid: 459
@@ -734,14 +808,20 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,6.5
       parent: 2
-- proto: ButtonFrameGrey
+- proto: ButtonFrameCaution
   entities:
-  - uid: 314
+  - uid: 48
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 3.5,18.5
       parent: 2
+  - uid: 572
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,5.5
+      parent: 2
 - proto: CableApcExtension
   entities:
   - uid: 12
@@ -769,10 +849,10 @@ entities:
     - type: Transform
       pos: 1.5,-1.5
       parent: 2
-  - uid: 50
+  - uid: 47
     components:
     - type: Transform
-      pos: 0.5,-0.5
+      pos: 2.5,1.5
       parent: 2
   - uid: 52
     components:
@@ -789,6 +869,11 @@ entities:
     - type: Transform
       pos: -6.5,12.5
       parent: 2
+  - uid: 88
+    components:
+    - type: Transform
+      pos: 2.5,-1.5
+      parent: 2
   - uid: 108
     components:
     - type: Transform
@@ -812,32 +897,52 @@ entities:
   - uid: 118
     components:
     - type: Transform
-      pos: -5.5,4.5
+      pos: -5.5,3.5
       parent: 2
   - uid: 120
     components:
     - type: Transform
-      pos: 0.5,0.5
+      pos: 3.5,2.5
       parent: 2
-  - uid: 121
+  - uid: 122
     components:
     - type: Transform
-      pos: 0.5,1.5
+      pos: 0.5,2.5
       parent: 2
-  - uid: 122
+  - uid: 128
     components:
     - type: Transform
-      pos: 0.5,2.5
+      pos: 5.5,10.5
+      parent: 2
+  - uid: 134
+    components:
+    - type: Transform
+      pos: -7.5,13.5
+      parent: 2
+  - uid: 135
+    components:
+    - type: Transform
+      pos: 5.5,18.5
+      parent: 2
+  - uid: 139
+    components:
+    - type: Transform
+      pos: -7.5,18.5
+      parent: 2
+  - uid: 143
+    components:
+    - type: Transform
+      pos: -7.5,10.5
       parent: 2
   - uid: 156
     components:
     - type: Transform
-      pos: -5.5,1.5
+      pos: 2.5,-0.5
       parent: 2
-  - uid: 158
+  - uid: 159
     components:
     - type: Transform
-      pos: -4.5,1.5
+      pos: -3.5,11.5
       parent: 2
   - uid: 164
     components:
@@ -874,6 +979,11 @@ entities:
     - type: Transform
       pos: -6.5,18.5
       parent: 2
+  - uid: 213
+    components:
+    - type: Transform
+      pos: -2.5,-0.5
+      parent: 2
   - uid: 219
     components:
     - type: Transform
@@ -899,11 +1009,6 @@ entities:
     - type: Transform
       pos: -3.5,0.5
       parent: 2
-  - uid: 237
-    components:
-    - type: Transform
-      pos: -5.5,3.5
-      parent: 2
   - uid: 265
     components:
     - type: Transform
@@ -919,11 +1024,6 @@ entities:
     - type: Transform
       pos: -4.5,17.5
       parent: 2
-  - uid: 277
-    components:
-    - type: Transform
-      pos: -7.5,13.5
-      parent: 2
   - uid: 285
     components:
     - type: Transform
@@ -999,11 +1099,6 @@ entities:
     - type: Transform
       pos: -5.5,-0.5
       parent: 2
-  - uid: 367
-    components:
-    - type: Transform
-      pos: -3.5,-1.5
-      parent: 2
   - uid: 368
     components:
     - type: Transform
@@ -1054,6 +1149,21 @@ entities:
     - type: Transform
       pos: -1.5,6.5
       parent: 2
+  - uid: 411
+    components:
+    - type: Transform
+      pos: -5.5,4.5
+      parent: 2
+  - uid: 416
+    components:
+    - type: Transform
+      pos: -4.5,-0.5
+      parent: 2
+  - uid: 443
+    components:
+    - type: Transform
+      pos: -3.5,10.5
+      parent: 2
   - uid: 460
     components:
     - type: Transform
@@ -1254,6 +1364,56 @@ entities:
     - type: Transform
       pos: 1.5,20.5
       parent: 2
+  - uid: 581
+    components:
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 2
+  - uid: 582
+    components:
+    - type: Transform
+      pos: 0.5,1.5
+      parent: 2
+  - uid: 583
+    components:
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 2
+  - uid: 594
+    components:
+    - type: Transform
+      pos: -2.5,10.5
+      parent: 2
+  - uid: 596
+    components:
+    - type: Transform
+      pos: -3.5,12.5
+      parent: 2
+  - uid: 597
+    components:
+    - type: Transform
+      pos: -0.5,10.5
+      parent: 2
+  - uid: 598
+    components:
+    - type: Transform
+      pos: 0.5,10.5
+      parent: 2
+  - uid: 599
+    components:
+    - type: Transform
+      pos: 1.5,10.5
+      parent: 2
+  - uid: 600
+    components:
+    - type: Transform
+      pos: 1.5,11.5
+      parent: 2
+  - uid: 601
+    components:
+    - type: Transform
+      pos: 1.5,12.5
+      parent: 2
 - proto: CableHV
   entities:
   - uid: 142
@@ -1278,6 +1438,11 @@ entities:
       parent: 2
 - proto: CableMV
   entities:
+  - uid: 7
+    components:
+    - type: Transform
+      pos: 2.5,-1.5
+      parent: 2
   - uid: 9
     components:
     - type: Transform
@@ -1318,15 +1483,15 @@ entities:
     - type: Transform
       pos: 1.5,1.5
       parent: 2
-  - uid: 48
+  - uid: 51
     components:
     - type: Transform
-      pos: -0.5,0.5
+      pos: 2.5,1.5
       parent: 2
-  - uid: 51
+  - uid: 81
     components:
     - type: Transform
-      pos: 2.5,1.5
+      pos: -0.5,-1.5
       parent: 2
   - uid: 102
     components:
@@ -1341,17 +1506,22 @@ entities:
   - uid: 123
     components:
     - type: Transform
-      pos: 2.5,6.5
+      pos: 0.5,-1.5
       parent: 2
   - uid: 124
     components:
     - type: Transform
       pos: 2.5,4.5
       parent: 2
-  - uid: 128
+  - uid: 140
     components:
     - type: Transform
-      pos: 2.5,9.5
+      pos: 2.5,-0.5
+      parent: 2
+  - uid: 144
+    components:
+    - type: Transform
+      pos: 2.5,0.5
       parent: 2
   - uid: 170
     components:
@@ -1378,6 +1548,11 @@ entities:
     - type: Transform
       pos: -2.5,6.5
       parent: 2
+  - uid: 178
+    components:
+    - type: Transform
+      pos: 1.5,7.5
+      parent: 2
   - uid: 189
     components:
     - type: Transform
@@ -1403,11 +1578,6 @@ entities:
     - type: Transform
       pos: -1.5,5.5
       parent: 2
-  - uid: 233
-    components:
-    - type: Transform
-      pos: 2.5,7.5
-      parent: 2
   - uid: 238
     components:
     - type: Transform
@@ -1453,10 +1623,10 @@ entities:
     - type: Transform
       pos: 1.5,17.5
       parent: 2
-  - uid: 294
+  - uid: 300
     components:
     - type: Transform
-      pos: 2.5,8.5
+      pos: 1.5,-1.5
       parent: 2
   - uid: 322
     components:
@@ -1468,10 +1638,15 @@ entities:
     - type: Transform
       pos: -3.5,10.5
       parent: 2
-  - uid: 331
+  - uid: 329
     components:
     - type: Transform
-      pos: -3.5,13.5
+      pos: 1.5,8.5
+      parent: 2
+  - uid: 331
+    components:
+    - type: Transform
+      pos: -3.5,13.5
       parent: 2
   - uid: 371
     components:
@@ -1513,11 +1688,6 @@ entities:
     - type: Transform
       pos: 1.5,5.5
       parent: 2
-  - uid: 416
-    components:
-    - type: Transform
-      pos: 0.5,0.5
-      parent: 2
   - uid: 427
     components:
     - type: Transform
@@ -1558,6 +1728,11 @@ entities:
     - type: Transform
       pos: -0.5,10.5
       parent: 2
+  - uid: 588
+    components:
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 2
 - proto: CableTerminal
   entities:
   - uid: 305
@@ -1634,21 +1809,13 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -4.5,20.5
       parent: 2
-- proto: ChairOfficeLight
-  entities:
-  - uid: 512
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,0.5
-      parent: 2
 - proto: ChairPilotSeat
   entities:
   - uid: 4
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,1.5
+      rot: -1.5707963267948966 rad
+      pos: -2.5,1.5
       parent: 2
   - uid: 20
     components:
@@ -1767,12 +1934,6 @@ entities:
     - type: Transform
       pos: -5.5,11.5
       parent: 2
-  - uid: 112
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,2.5
-      parent: 2
   - uid: 113
     components:
     - type: Transform
@@ -1868,6 +2029,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -4.5,6.5
       parent: 2
+  - uid: 294
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,2.5
+      parent: 2
   - uid: 304
     components:
     - type: Transform
@@ -1920,6 +2087,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,19.5
       parent: 2
+- proto: CigarSpent
+  entities:
+  - uid: 579
+    components:
+    - type: Transform
+      pos: -2.325366,8.777939
+      parent: 2
 - proto: ClosetEmergencyFilledRandom
   entities:
   - uid: 228
@@ -1946,11 +2120,6 @@ entities:
       parent: 2
 - proto: ClosetWallEmergencyFilledRandom
   entities:
-  - uid: 114
-    components:
-    - type: Transform
-      pos: 0.5,4.5
-      parent: 2
   - uid: 302
     components:
     - type: Transform
@@ -1963,11 +2132,30 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -5.5,20.5
       parent: 2
-  - uid: 554
+  - uid: 586
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -1.5,-0.5
+      pos: -1.5,4.5
+      parent: 2
+  - uid: 589
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,16.5
+      parent: 2
+- proto: ClosetWallEmergencyN2FilledRandom
+  entities:
+  - uid: 339
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,16.5
+      parent: 2
+  - uid: 591
+    components:
+    - type: Transform
+      pos: -6.5,20.5
       parent: 2
 - proto: ClosetWallFireFilledRandom
   entities:
@@ -1977,6 +2165,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -5.5,19.5
       parent: 2
+  - uid: 158
+    components:
+    - type: Transform
+      pos: 0.5,4.5
+      parent: 2
   - uid: 319
     components:
     - type: Transform
@@ -1989,6 +2182,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,19.5
       parent: 2
+  - uid: 590
+    components:
+    - type: Transform
+      pos: 4.5,20.5
+      parent: 2
 - proto: ComputerCrewMonitoring
   entities:
   - uid: 389
@@ -2010,19 +2208,12 @@ entities:
       parent: 2
 - proto: DefibrillatorCabinetFilled
   entities:
-  - uid: 471
+  - uid: 587
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -1.5,0.5
       parent: 2
-- proto: EmergencyRollerBed
-  entities:
-  - uid: 555
-    components:
-    - type: Transform
-      pos: -2.5,3.5
-      parent: 2
 - proto: GasOutletInjector
   entities:
   - uid: 36
@@ -2114,11 +2305,6 @@ entities:
     - type: Transform
       pos: 1.5,8.5
       parent: 2
-  - uid: 310
-    components:
-    - type: Transform
-      pos: 1.5,6.5
-      parent: 2
   - uid: 334
     components:
     - type: Transform
@@ -2193,6 +2379,60 @@ entities:
       rot: 3.141592653589793 rad
       pos: 1.5,5.5
       parent: 2
+  - uid: 559
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,10.5
+      parent: 2
+  - uid: 560
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,10.5
+      parent: 2
+  - uid: 561
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,10.5
+      parent: 2
+  - uid: 562
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,10.5
+      parent: 2
+  - uid: 563
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,11.5
+      parent: 2
+  - uid: 564
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,12.5
+      parent: 2
+  - uid: 565
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,13.5
+      parent: 2
+  - uid: 566
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,14.5
+      parent: 2
+  - uid: 567
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,6.5
+      parent: 2
 - proto: GasPipeTJunction
   entities:
   - uid: 119
@@ -2207,6 +2447,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -3.5,18.5
       parent: 2
+  - uid: 182
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,6.5
+      parent: 2
   - uid: 192
     components:
     - type: Transform
@@ -2305,6 +2551,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -3.5,2.5
       parent: 2
+  - uid: 568
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,6.5
+      parent: 2
 - proto: GeneratorBasic15kW
   entities:
   - uid: 205
@@ -2326,11 +2578,6 @@ entities:
       parent: 2
 - proto: Grille
   entities:
-  - uid: 7
-    components:
-    - type: Transform
-      pos: -5.5,3.5
-      parent: 2
   - uid: 21
     components:
     - type: Transform
@@ -2342,6 +2589,12 @@ entities:
     - type: Transform
       pos: 0.5,16.5
       parent: 2
+  - uid: 70
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,3.5
+      parent: 2
   - uid: 87
     components:
     - type: Transform
@@ -2376,8 +2629,8 @@ entities:
   - uid: 186
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,-1.5
+      rot: -1.5707963267948966 rad
+      pos: -5.5,4.5
       parent: 2
   - uid: 187
     components:
@@ -2462,16 +2715,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -1.5,21.5
       parent: 2
-  - uid: 441
+  - uid: 447
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -5.5,1.5
-      parent: 2
-  - uid: 443
-    components:
-    - type: Transform
-      pos: -5.5,4.5
+      pos: 3.5,2.5
       parent: 2
   - uid: 469
     components:
@@ -2501,13 +2749,28 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,-0.5
       parent: 2
-- proto: LockerMedicineFilled
+- proto: LockableButtonService
   entities:
-  - uid: 455
+  - uid: 571
     components:
     - type: Transform
-      pos: -2.5,4.5
+      rot: 3.141592653589793 rad
+      pos: 0.5,5.5
       parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        557:
+        - - Pressed
+          - Toggle
+        556:
+        - - Pressed
+          - Toggle
+        569:
+        - - Pressed
+          - Toggle
+        570:
+        - - Pressed
+          - Toggle
 - proto: LockerSecurityFilled
   entities:
   - uid: 552
@@ -2515,6 +2778,13 @@ entities:
     - type: Transform
       pos: -1.5,20.5
       parent: 2
+- proto: LockerWallMedicalFilled
+  entities:
+  - uid: 585
+    components:
+    - type: Transform
+      pos: -2.5,5.5
+      parent: 2
 - proto: MedicalBed
   entities:
   - uid: 25
@@ -2522,15 +2792,15 @@ entities:
     - type: Transform
       pos: -4.5,0.5
       parent: 2
-  - uid: 144
+  - uid: 435
     components:
     - type: Transform
-      pos: -2.5,2.5
+      pos: -4.5,4.5
       parent: 2
-  - uid: 435
+  - uid: 584
     components:
     - type: Transform
-      pos: -4.5,4.5
+      pos: -4.5,2.5
       parent: 2
 - proto: MedkitBruteFilled
   entities:
@@ -2548,10 +2818,17 @@ entities:
       parent: 2
 - proto: MedkitOxygenFilled
   entities:
-  - uid: 450
+  - uid: 114
     components:
     - type: Transform
-      pos: -2.4702473,1.5102254
+      pos: -4.6797056,1.7383938
+      parent: 2
+- proto: MedkitToxinFilled
+  entities:
+  - uid: 277
+    components:
+    - type: Transform
+      pos: -4.3810945,1.5160172
       parent: 2
 - proto: PlasmaReinforcedWindowDirectional
   entities:
@@ -2573,6 +2850,30 @@ entities:
       rot: 3.141592653589793 rad
       pos: 1.5,-2.5
       parent: 2
+  - uid: 455
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,19.5
+      parent: 2
+  - uid: 490
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,20.5
+      parent: 2
+  - uid: 512
+    components:
+    - type: Transform
+      pos: -4.5,19.5
+      parent: 2
+- proto: PlasmaWindoorSecureSecurityLocked
+  entities:
+  - uid: 483
+    components:
+    - type: Transform
+      pos: -3.5,19.5
+      parent: 2
 - proto: Poweredlight
   entities:
   - uid: 152
@@ -2593,12 +2894,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 2.5,19.5
       parent: 2
-  - uid: 182
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -6.5,16.5
-      parent: 2
   - uid: 183
     components:
     - type: Transform
@@ -2617,34 +2912,23 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 2.5,-1.5
       parent: 2
-  - uid: 337
-    components:
-    - type: Transform
-      pos: -2.5,4.5
-      parent: 2
-  - uid: 365
+  - uid: 310
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,-0.5
+      rot: -1.5707963267948966 rad
+      pos: -5.5,16.5
       parent: 2
-  - uid: 426
+  - uid: 337
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -0.5,2.5
-      parent: 2
-  - uid: 447
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,16.5
+      pos: 3.5,16.5
       parent: 2
-  - uid: 456
+  - uid: 357
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 2.5,3.5
+      pos: -2.5,-0.5
       parent: 2
   - uid: 461
     components:
@@ -2663,13 +2947,69 @@ entities:
     - type: Transform
       pos: -0.5,15.5
       parent: 2
+  - uid: 592
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,2.5
+      parent: 2
+  - uid: 593
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,1.5
+      parent: 2
+  - uid: 595
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,3.5
+      parent: 2
+- proto: Rack
+  entities:
+  - uid: 426
+    components:
+    - type: Transform
+      pos: 0.5,7.5
+      parent: 2
+- proto: RandomDrinkGlass
+  entities:
+  - uid: 580
+    components:
+    - type: Transform
+      pos: -0.5,8.5
+      parent: 2
+- proto: RandomDrinkSoda
+  entities:
+  - uid: 602
+    components:
+    - type: Transform
+      pos: -1.5,8.5
+      parent: 2
+- proto: RandomFoodSingle
+  entities:
+  - uid: 576
+    components:
+    - type: Transform
+      pos: 0.5,7.5
+      parent: 2
+  - uid: 577
+    components:
+    - type: Transform
+      pos: 0.5,7.5
+      parent: 2
+  - uid: 578
+    components:
+    - type: Transform
+      pos: 0.5,7.5
+      parent: 2
 - proto: Screen
   entities:
-  - uid: 70
+  - uid: 112
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -6.5,8.5
+      pos: 3.5,7.5
       parent: 2
   - uid: 166
     components:
@@ -2677,23 +3017,23 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 2.5,16.5
       parent: 2
-  - uid: 329
+  - uid: 181
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,8.5
+      rot: -1.5707963267948966 rad
+      pos: -0.5,19.5
       parent: 2
-  - uid: 423
+  - uid: 367
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -0.5,20.5
+      pos: -1.5,2.5
       parent: 2
-  - uid: 490
+  - uid: 384
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -1.5,2.5
+      pos: -5.5,7.5
       parent: 2
   - uid: 517
     components:
@@ -2728,6 +3068,30 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,21.5
       parent: 2
+  - uid: 556
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,8.5
+      parent: 2
+  - uid: 557
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,8.5
+      parent: 2
+  - uid: 569
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,8.5
+      parent: 2
+  - uid: 570
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,8.5
+      parent: 2
 - proto: ShuttersWindowOpen
   entities:
   - uid: 335
@@ -2765,11 +3129,6 @@ entities:
     - type: Transform
       pos: -2.5,16.5
       parent: 2
-  - uid: 140
-    components:
-    - type: Transform
-      pos: -7.5,13.5
-      parent: 2
   - uid: 141
     components:
     - type: Transform
@@ -2787,6 +3146,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -5.5,0.5
       parent: 2
+  - uid: 237
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,3.5
+      parent: 2
   - uid: 256
     components:
     - type: Transform
@@ -2797,11 +3162,6 @@ entities:
     - type: Transform
       pos: -7.5,15.5
       parent: 2
-  - uid: 300
-    components:
-    - type: Transform
-      pos: -5.5,1.5
-      parent: 2
   - uid: 306
     components:
     - type: Transform
@@ -2824,17 +3184,29 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 5.5,18.5
       parent: 2
-  - uid: 357
+  - uid: 365
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,2.5
+      parent: 2
+  - uid: 370
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -5.5,4.5
+      pos: -7.5,13.5
       parent: 2
   - uid: 376
     components:
     - type: Transform
       pos: -3.5,21.5
       parent: 2
+  - uid: 386
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,4.5
+      parent: 2
   - uid: 393
     components:
     - type: Transform
@@ -2850,11 +3222,6 @@ entities:
     - type: Transform
       pos: 1.5,21.5
       parent: 2
-  - uid: 411
-    components:
-    - type: Transform
-      pos: -5.5,3.5
-      parent: 2
   - uid: 420
     components:
     - type: Transform
@@ -2883,12 +3250,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -2.5,-1.5
       parent: 2
-  - uid: 483
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,-1.5
-      parent: 2
   - uid: 518
     components:
     - type: Transform
@@ -2920,13 +3281,17 @@ entities:
     - type: DeviceLinkSource
       linkedPorts:
         71:
-        - Pressed: Toggle
+        - - Pressed
+          - Toggle
         344:
-        - Pressed: Toggle
+        - - Pressed
+          - Toggle
         335:
-        - Pressed: Toggle
+        - - Pressed
+          - Toggle
         350:
-        - Pressed: Toggle
+        - - Pressed
+          - Toggle
 - proto: SignBridge
   entities:
   - uid: 129
@@ -3062,16 +3427,15 @@ entities:
       parent: 2
 - proto: TableGlass
   entities:
-  - uid: 81
+  - uid: 400
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,1.5
+      pos: -4.5,3.5
       parent: 2
-  - uid: 400
+  - uid: 456
     components:
     - type: Transform
-      pos: -4.5,3.5
+      pos: -4.5,1.5
       parent: 2
 - proto: TableReinforced
   entities:
@@ -3095,12 +3459,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -2.5,7.5
       parent: 2
-  - uid: 139
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,7.5
-      parent: 2
   - uid: 451
     components:
     - type: Transform
@@ -3133,6 +3491,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: 4.5,5.5
       parent: 2
+    - type: Thruster
+      enabled: False
   - uid: 154
     components:
     - type: Transform
@@ -3184,7 +3544,7 @@ entities:
       parent: 2
 - proto: VendingMachineMedical
   entities:
-  - uid: 339
+  - uid: 441
     components:
     - type: Transform
       pos: -4.5,-0.5
@@ -3308,35 +3668,23 @@ entities:
     - type: Transform
       pos: -7.5,20.5
       parent: 2
-  - uid: 132
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,0.5
-      parent: 2
-  - uid: 133
+  - uid: 121
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 3.5,4.5
+      pos: -3.5,-1.5
       parent: 2
-  - uid: 134
+  - uid: 132
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 3.5,2.5
+      pos: 3.5,0.5
       parent: 2
-  - uid: 135
+  - uid: 133
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 3.5,3.5
-      parent: 2
-  - uid: 159
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,2.5
+      pos: 3.5,4.5
       parent: 2
   - uid: 162
     components:
@@ -3384,6 +3732,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -1.5,1.5
       parent: 2
+  - uid: 233
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,1.5
+      parent: 2
   - uid: 243
     components:
     - type: Transform
@@ -3496,6 +3850,12 @@ entities:
     - type: Transform
       pos: 4.5,8.5
       parent: 2
+  - uid: 338
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,3.5
+      parent: 2
   - uid: 351
     components:
     - type: Transform
@@ -3567,6 +3927,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -4.5,17.5
       parent: 2
+  - uid: 450
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,2.5
+      parent: 2
   - uid: 453
     components:
     - type: Transform
@@ -3650,13 +4016,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 1.5,-1.5
       parent: 2
-- proto: WindoorSecureSecurityLocked
-  entities:
-  - uid: 88
-    components:
-    - type: Transform
-      pos: -3.5,19.5
-      parent: 2
 - proto: WindoorSecureServiceLocked
   entities:
   - uid: 358
@@ -3665,6 +4024,14 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 0.5,6.5
       parent: 2
+- proto: WindoorServiceLocked
+  entities:
+  - uid: 575
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,7.5
+      parent: 2
 - proto: WindowFrostedDirectional
   entities:
   - uid: 99
@@ -3686,44 +4053,32 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -2.5,6.5
       parent: 2
-  - uid: 178
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,1.5
-      parent: 2
-  - uid: 181
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,0.5
-      parent: 2
-  - uid: 213
-    components:
-    - type: Transform
-      pos: -4.5,19.5
-      parent: 2
   - uid: 275
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -2.5,7.5
       parent: 2
-  - uid: 370
+  - uid: 402
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,19.5
+      pos: -4.5,3.5
       parent: 2
-  - uid: 384
+  - uid: 471
+    components:
+    - type: Transform
+      pos: -4.5,1.5
+      parent: 2
+  - uid: 558
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -3.5,20.5
+      pos: 0.5,7.5
       parent: 2
-  - uid: 402
+  - uid: 574
     components:
     - type: Transform
-      pos: -4.5,3.5
+      rot: 3.141592653589793 rad
+      pos: 0.5,7.5
       parent: 2
 ...