diff --git a/Resources/Maps/_NF/POI/nfsd.yml b/Resources/Maps/_NF/POI/nfsd.yml
index 1ae1d35d448..93787af6cc5 100644
--- a/Resources/Maps/_NF/POI/nfsd.yml
+++ b/Resources/Maps/_NF/POI/nfsd.yml
@@ -32,7 +32,7 @@ entities:
       chunks:
         0,0:
           ind: 0,0
-          tiles: WgAAAAAAWgAAAAAAegAAAAAAJwAAAAAAJwAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAaQAAAAAAaQAAAAAAWgAAAAAAWgAAAAAAZQAAAAAAWgAAAAAAWgAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAaQAAAAAAaQAAAAAAWgAAAAAAWgAAAAAAZQAAAAAAWgAAAAAAWgAAAAAAegAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAegAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAegAAAAAAWgAAAAAAWgAAAAAAZQAAAAAAegAAAAAAegAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAegAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAegAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAZQAAAAAAegAAAAAAegAAAAAAegAAAAAAZQAAAAAAegAAAAAAegAAAAAAZQAAAAAAegAAAAAAZQAAAAAAegAAAAAAegAAAAAAegAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAegAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAegAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAZQAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAegAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAegAAAAAAegAAAAAAegAAAAAAdwAAAAAAdwAAAAAAegAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAegAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAegAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAegAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAegAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAZQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAegAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAFAAAAAAAegAAAAAAWgAAAAAAWgAAAAAAWgAAAAAA
+          tiles: WgAAAAAAWgAAAAAAegAAAAAAJwAAAAAAJwAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAaQAAAAAAaQAAAAAAWgAAAAAAWgAAAAAAZQAAAAAAWgAAAAAAWgAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAaQAAAAAAaQAAAAAAWgAAAAAAWgAAAAAAZQAAAAAAWgAAAAAAWgAAAAAAegAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAegAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAegAAAAAAWgAAAAAAWgAAAAAAZQAAAAAAegAAAAAAegAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAegAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAegAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAZQAAAAAAegAAAAAAegAAAAAAegAAAAAAZQAAAAAAegAAAAAAHgAAAAAAHgAAAAAAegAAAAAAegAAAAAAIwAAAAAAegAAAAAAegAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAegAAAAAAHgAAAAAAHgAAAAAAegAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAegAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAegAAAAAAHgAAAAAAHgAAAAAAegAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAIwAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAegAAAAAAegAAAAAAegAAAAAAdwAAAAAAdwAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAegAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAAAHgAAAAAAIwAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAegAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAegAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAIwAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAegAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAegAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAZQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAIgAAAAAAegAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAFAAAAAAAegAAAAAAWgAAAAAAWgAAAAAAWgAAAAAA
           version: 6
         -1,0:
           ind: -1,0
@@ -72,7 +72,7 @@ entities:
           version: 6
         1,0:
           ind: 1,0
-          tiles: aQAAAAAAegAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAegAAAAAAbQAAAAAAbQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAegAAAAAAbQAAAAAAbQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAbQAAAAAAbQAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAegAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: aQAAAAAAegAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAbQAAAAAAbQAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAegAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         1,-1:
           ind: 1,-1
@@ -108,6 +108,12 @@ entities:
       chunkCollection:
         version: 2
         nodes:
+        - node:
+            angle: -3.141592653589793 rad
+            color: '#FFFFFFFF'
+            id: Arrows
+          decals:
+            916: 12,5
         - node:
             color: '#FFFFFFFF'
             id: Bot
@@ -357,7 +363,6 @@ entities:
             247: -8,0
             248: -7,0
             298: 15,2
-            299: 13,3
             300: 11,2
             301: 9,3
             302: 7,2
@@ -461,7 +466,6 @@ entities:
             465: 15,2
             466: 18,4
             474: 14,8
-            475: 14,10
             477: 13,9
             482: 15,13
             483: 14,13
@@ -474,13 +478,11 @@ entities:
             490: 0,1
             491: 0,4
             496: 11,8
-            497: 10,9
             498: 7,9
             499: 7,8
             500: 6,8
             505: 6,11
             506: 5,12
-            507: 7,13
             508: 9,12
             509: 10,12
             510: 10,13
@@ -636,6 +638,8 @@ entities:
             844: 18,8
             845: 19,8
             846: 19,9
+            921: 17,4
+            922: 17,3
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -656,17 +660,18 @@ entities:
             829: 5,19
             830: 4,19
             847: 18,9
+            932: 18,7
+            933: 17,6
+            934: 18,6
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtLight
           decals:
             459: 8,3
-            460: 13,3
             461: 13,5
             462: 14,4
             463: 15,3
-            470: 18,7
             471: 15,8
             473: 13,8
             479: 15,8
@@ -674,7 +679,6 @@ entities:
             481: 15,10
             512: 9,13
             513: 11,12
-            514: 10,11
             515: 6,1
             521: 12,1
             522: 15,0
@@ -846,11 +850,19 @@ entities:
             678: -15,18
             679: -14,17
             689: -17,21
-            848: 18,6
             904: 15,3
             905: 16,3
-            906: 13,3
             907: 18,3
+        - node:
+            color: '#8CB7E8FF'
+            id: HalfTileOverlayGreyscale270
+          decals:
+            917: 18,4
+        - node:
+            color: '#FFA500CD'
+            id: HalfTileOverlayGreyscale270
+          decals:
+            928: 18,7
         - node:
             angle: 3.141592653589793 rad
             color: '#9FED5896'
@@ -946,10 +958,15 @@ entities:
             108: -17,-6
             109: -18,-6
         - node:
-            color: '#52B4E996'
+            color: '#8CB7E8FF'
+            id: QuarterTileOverlayGreyscale
+          decals:
+            920: 18,3
+        - node:
+            color: '#FFA500CD'
             id: QuarterTileOverlayGreyscale
           decals:
-            424: 18,6
+            929: 18,6
         - node:
             color: '#4B653E96'
             id: QuarterTileOverlayGreyscale180
@@ -971,10 +988,17 @@ entities:
             129: 5,-10
             130: 6,-9
         - node:
-            color: '#52B4E996'
+            color: '#8CB7E8FF'
+            id: QuarterTileOverlayGreyscale180
+          decals:
+            918: 17,4
+            919: 18,4
+        - node:
+            color: '#FFA500CD'
             id: QuarterTileOverlayGreyscale180
           decals:
-            425: 17,7
+            930: 18,7
+            931: 17,7
         - node:
             color: '#4B653E96'
             id: QuarterTileOverlayGreyscale270
@@ -1043,18 +1067,23 @@ entities:
             69: 4,-1
             180: 0,6
             181: 4,6
-            182: 5,8
-            183: 7,6
-            184: 12,12
-            185: 6,10
             376: 12,22
             377: 12,21
             524: 14,14
         - node:
-            color: '#52B4E996'
-            id: ThreeQuarterTileOverlayGreyscale270
+            angle: 1.5707963267948966 rad
+            color: '#493926FF'
+            id: StandClearGreyscale
+          decals:
+            912: 12,8
+            913: 8,10
+            914: 12,12
+        - node:
+            angle: -1.5707963267948966 rad
+            color: '#8FD3FFFF'
+            id: StandClearGreyscale
           decals:
-            423: 18,7
+            915: 16,6
         - node:
             color: '#FFFFFFFF'
             id: WarnCornerNE
@@ -1127,9 +1156,6 @@ entities:
             16: 1,17
             28: -1,24
             29: -1,23
-            55: 7,13
-            56: 7,12
-            57: 7,11
             356: -1,21
             357: -1,22
             358: -1,25
@@ -1179,9 +1205,6 @@ entities:
             26: 0,24
             27: 0,25
             36: -17,22
-            52: 8,11
-            53: 8,12
-            54: 8,13
             870: 19,-6
             871: 19,-7
             872: 19,-8
@@ -1340,9 +1363,9 @@ entities:
           1,0:
             0: 64989
           1,1:
-            0: 55807
+            0: 56831
           1,2:
-            0: 61663
+            0: 64541
           1,3:
             0: 28927
           1,-1:
@@ -1352,11 +1375,11 @@ entities:
           2,0:
             0: 64989
           2,1:
-            0: 62207
-          2,2:
-            0: 61695
+            0: 58623
           2,3:
-            0: 61695
+            0: 61678
+          2,2:
+            0: 3822
           2,4:
             0: 48031
           3,0:
@@ -1364,14 +1387,14 @@ entities:
           3,1:
             0: 61183
           3,2:
-            0: 61166
+            0: 61167
           3,3:
-            0: 58606
+            0: 58607
           3,4:
             0: 61166
           4,0:
             0: 53521
-            3: 140
+            1: 140
           4,1:
             0: 61389
           4,2:
@@ -1402,11 +1425,11 @@ entities:
             0: 61917
           -3,3:
             0: 4367
-            1: 3072
+            2: 3072
           -3,4:
             0: 4369
-            2: 12
-            3: 3072
+            3: 12
+            1: 3072
           -2,0:
             0: 63351
           -2,1:
@@ -1415,11 +1438,11 @@ entities:
             0: 61559
           -2,3:
             0: 52429
-            1: 256
+            2: 256
           -2,4:
-            2: 1
+            3: 1
             0: 3276
-            3: 256
+            1: 256
           -1,3:
             0: 12561
           -1,-1:
@@ -1431,7 +1454,7 @@ entities:
           -5,-2:
             0: 4095
           -5,-1:
-            3: 52476
+            1: 52476
           -3,-2:
             0: 4095
           -2,-2:
@@ -1465,25 +1488,25 @@ entities:
           3,-2:
             0: 4095
           3,-1:
-            3: 3080
+            1: 3080
           4,-2:
             0: 4095
           4,-1:
-            3: 26613
+            1: 26613
           -6,0:
-            3: 40738
+            1: 40738
           -6,1:
-            3: 4377
+            1: 4377
           -6,2:
-            3: 57233
+            1: 57233
           -6,3:
-            3: 4377
+            1: 4377
           -6,4:
-            3: 63761
+            1: 63761
           -6,-1:
-            3: 8930
+            1: 8930
           -5,0:
-            3: 292
+            1: 292
             0: 24576
           -5,4:
             0: 61166
@@ -1501,107 +1524,107 @@ entities:
             0: 65520
           0,6:
             0: 255
-            3: 57344
+            1: 57344
           -1,6:
             0: 255
-            3: 4096
+            1: 4096
           0,7:
-            3: 3890
+            1: 3890
           -1,7:
-            3: 3857
+            1: 3857
           1,5:
             0: 65524
           1,6:
             0: 255
-            3: 32768
+            1: 32768
           1,7:
-            3: 3840
+            1: 3840
           2,5:
             0: 20472
           2,6:
-            3: 4096
+            1: 4096
             0: 238
           2,7:
-            3: 3857
+            1: 3857
           3,5:
             0: 61438
           3,7:
-            3: 3976
+            1: 3976
           3,6:
             0: 14
-            3: 49152
+            1: 49152
           4,4:
             0: 4095
           4,5:
             0: 24831
           4,7:
-            3: 31
+            1: 31
           -4,5:
             0: 10994
           -5,5:
             0: 3264
           -4,6:
             0: 142
-            3: 8960
+            1: 8960
           -5,6:
-            3: 3184
+            1: 3184
           -4,7:
-            3: 3635
+            1: 3635
           -5,7:
-            3: 15
+            1: 15
           -3,5:
             0: 35216
           -3,6:
             0: 153
-            3: 49152
+            1: 49152
           -3,7:
-            3: 4036
+            1: 4036
           -2,5:
             0: 65456
           -2,6:
             0: 191
-            3: 61440
+            1: 61440
           -2,7:
-            3: 3976
+            1: 3976
           -6,5:
-            3: 39321
+            1: 39321
           -6,6:
-            3: 50937
+            1: 50937
           -6,7:
-            3: 8
+            1: 8
           4,6:
             0: 70
-            3: 17920
+            1: 17920
           5,5:
-            3: 61952
+            1: 61952
           5,6:
-            3: 28323
+            1: 28323
           5,7:
-            3: 3
+            1: 3
           6,5:
-            3: 4369
+            1: 4369
           6,6:
-            3: 17
+            1: 17
           6,4:
-            3: 4369
+            1: 4369
           6,3:
-            3: 4369
+            1: 4369
           5,0:
-            3: 4088
+            1: 4088
           5,1:
-            3: 11808
+            1: 11808
           5,2:
-            3: 2
+            1: 2
           5,3:
-            3: 11938
+            1: 11938
           5,-1:
-            3: 35064
+            1: 35064
           6,0:
-            3: 4352
+            1: 4352
           6,1:
-            3: 4369
+            1: 4369
           6,2:
-            3: 4369
+            1: 4369
           5,-3:
             0: 22384
           5,-2:
@@ -1609,7 +1632,7 @@ entities:
           6,-2:
             0: 819
           6,-1:
-            3: 17
+            1: 17
           -1,-7:
             0: 65416
           -1,-6:
@@ -1643,10 +1666,10 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.15
+          immutable: True
           moles:
           - 0
-          - 6666.982
+          - 0
           - 0
           - 0
           - 0
@@ -1660,8 +1683,8 @@ entities:
         - volume: 2500
           temperature: 293.15
           moles:
-          - 6666.982
           - 0
+          - 6666.982
           - 0
           - 0
           - 0
@@ -1673,9 +1696,9 @@ entities:
           - 0
           - 0
         - volume: 2500
-          immutable: True
+          temperature: 293.15
           moles:
-          - 0
+          - 6666.982
           - 0
           - 0
           - 0
@@ -1730,12 +1753,10 @@ entities:
       - 1867
       - 1866
       - 1889
-      - 1886
-      - 1887
       - 1895
       - 1894
       - 1893
-      - 110
+      - 2792
       - 1884
       - 2235
       - 2171
@@ -1755,24 +1776,19 @@ entities:
       - 2744
       - 2743
       - 2742
-  - uid: 2109
+  - uid: 1420
     components:
     - type: Transform
-      pos: 8.5,10.5
+      pos: 9.5,11.5
       parent: 1
     - type: DeviceList
       devices:
-      - 1887
+      - 1010
+      - 1166
       - 1886
-      - 1888
-      - 2236
-      - 2235
-      - 2177
-      - 2176
       - 1813
-      - 1824
-      - 1826
-      - 1825
+      - 616
+      - 713
   - uid: 2159
     components:
     - type: Transform
@@ -1797,7 +1813,6 @@ entities:
       - 1891
       - 1890
       - 1889
-      - 1888
       - 2178
       - 1812
       - 1827
@@ -1957,6 +1972,43 @@ entities:
       - 1689
       - 1691
       - 2739
+  - uid: 2690
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,12.5
+      parent: 1
+    - type: DeviceList
+      devices:
+      - 2235
+      - 1772
+      - 1892
+  - uid: 2718
+    components:
+    - type: Transform
+      pos: 8.5,6.5
+      parent: 1
+  - uid: 2790
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 20.5,6.5
+      parent: 1
+    - type: DeviceList
+      devices:
+      - 2788
+      - 2789
+      - 814
+      - 81
+      - 2691
+      - 2792
+- proto: AirlockChemistryGlassLocked
+  entities:
+  - uid: 415
+    components:
+    - type: Transform
+      pos: 16.5,6.5
+      parent: 1
 - proto: AirlockExternalGlass
   entities:
   - uid: 1432
@@ -2182,19 +2234,12 @@ entities:
     - type: Transform
       pos: 4.5,6.5
       parent: 1
-  - uid: 140
-    components:
-    - type: MetaData
-      name: Sheriff
-    - type: Transform
-      pos: 5.5,8.5
-      parent: 1
-- proto: AirlockMedicalGlassLockedSecurity
+- proto: AirlockMedical
   entities:
-  - uid: 2718
+  - uid: 1009
     components:
     - type: Transform
-      pos: 16.5,6.5
+      pos: 12.5,12.5
       parent: 1
 - proto: AirlockNfsd
   entities:
@@ -2206,12 +2251,10 @@ entities:
       parent: 1
 - proto: AirlockNfsdArmoryGlassLocked
   entities:
-  - uid: 91
+  - uid: 286
     components:
-    - type: MetaData
-      name: Bailiff
     - type: Transform
-      pos: 7.5,6.5
+      pos: 12.5,8.5
       parent: 1
 - proto: AirlockNfsdBrigGlassLocked
   entities:
@@ -2488,18 +2531,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 5.5,23.5
       parent: 1
-  - uid: 2176
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,12.5
-      parent: 1
-  - uid: 2177
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.5,8.5
-      parent: 1
   - uid: 2178
     components:
     - type: Transform
@@ -2569,11 +2600,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,6.5
       parent: 1
-  - uid: 526
-    components:
-    - type: Transform
-      pos: 7.5,10.5
-      parent: 1
   - uid: 700
     components:
     - type: Transform
@@ -2601,6 +2627,12 @@ entities:
     - type: Transform
       pos: 16.5,22.5
       parent: 1
+  - uid: 2109
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,11.5
+      parent: 1
 - proto: AtmosDeviceFanDirectional
   entities:
   - uid: 848
@@ -3624,6 +3656,13 @@ entities:
     - type: Transform
       pos: -18.48111,19.641876
       parent: 1
+- proto: BoxLighttube
+  entities:
+  - uid: 2781
+    components:
+    - type: Transform
+      pos: -3.2727077,11.743489
+      parent: 1
 - proto: BoxMagazinePistolRubber
   entities:
   - uid: 342
@@ -3678,11 +3717,6 @@ entities:
       parent: 1
 - proto: CableApcExtension
   entities:
-  - uid: 20
-    components:
-    - type: Transform
-      pos: 7.5,11.5
-      parent: 1
   - uid: 31
     components:
     - type: Transform
@@ -3693,11 +3727,6 @@ entities:
     - type: Transform
       pos: -14.5,22.5
       parent: 1
-  - uid: 40
-    components:
-    - type: Transform
-      pos: 9.5,12.5
-      parent: 1
   - uid: 43
     components:
     - type: Transform
@@ -3748,11 +3777,6 @@ entities:
     - type: Transform
       pos: -14.5,1.5
       parent: 1
-  - uid: 102
-    components:
-    - type: Transform
-      pos: 6.5,12.5
-      parent: 1
   - uid: 105
     components:
     - type: Transform
@@ -3808,11 +3832,6 @@ entities:
     - type: Transform
       pos: 18.5,7.5
       parent: 1
-  - uid: 209
-    components:
-    - type: Transform
-      pos: 5.5,12.5
-      parent: 1
   - uid: 229
     components:
     - type: Transform
@@ -3958,41 +3977,16 @@ entities:
     - type: Transform
       pos: 0.5,16.5
       parent: 1
-  - uid: 509
-    components:
-    - type: Transform
-      pos: 4.5,12.5
-      parent: 1
   - uid: 521
     components:
     - type: Transform
       pos: -2.5,19.5
       parent: 1
-  - uid: 523
-    components:
-    - type: Transform
-      pos: 10.5,12.5
-      parent: 1
   - uid: 525
     components:
     - type: Transform
       pos: 17.5,5.5
       parent: 1
-  - uid: 547
-    components:
-    - type: Transform
-      pos: 11.5,12.5
-      parent: 1
-  - uid: 548
-    components:
-    - type: Transform
-      pos: 7.5,12.5
-      parent: 1
-  - uid: 552
-    components:
-    - type: Transform
-      pos: 7.5,10.5
-      parent: 1
   - uid: 627
     components:
     - type: Transform
@@ -4138,11 +4132,6 @@ entities:
     - type: Transform
       pos: -0.5,17.5
       parent: 1
-  - uid: 763
-    components:
-    - type: Transform
-      pos: 8.5,12.5
-      parent: 1
   - uid: 766
     components:
     - type: Transform
@@ -4203,31 +4192,6 @@ entities:
     - type: Transform
       pos: 0.5,4.5
       parent: 1
-  - uid: 781
-    components:
-    - type: Transform
-      pos: 7.5,8.5
-      parent: 1
-  - uid: 782
-    components:
-    - type: Transform
-      pos: 8.5,8.5
-      parent: 1
-  - uid: 783
-    components:
-    - type: Transform
-      pos: 9.5,8.5
-      parent: 1
-  - uid: 784
-    components:
-    - type: Transform
-      pos: 10.5,8.5
-      parent: 1
-  - uid: 785
-    components:
-    - type: Transform
-      pos: 9.5,7.5
-      parent: 1
   - uid: 788
     components:
     - type: Transform
@@ -4473,11 +4437,6 @@ entities:
     - type: Transform
       pos: 15.5,1.5
       parent: 1
-  - uid: 888
-    components:
-    - type: Transform
-      pos: 7.5,9.5
-      parent: 1
   - uid: 954
     components:
     - type: Transform
@@ -5368,11 +5327,56 @@ entities:
     - type: Transform
       pos: 18.5,27.5
       parent: 1
+  - uid: 2430
+    components:
+    - type: Transform
+      pos: 8.5,11.5
+      parent: 1
+  - uid: 2436
+    components:
+    - type: Transform
+      pos: 7.5,11.5
+      parent: 1
+  - uid: 2439
+    components:
+    - type: Transform
+      pos: 6.5,11.5
+      parent: 1
   - uid: 2440
     components:
     - type: Transform
       pos: 18.5,8.5
       parent: 1
+  - uid: 2475
+    components:
+    - type: Transform
+      pos: 8.5,10.5
+      parent: 1
+  - uid: 2477
+    components:
+    - type: Transform
+      pos: 9.5,10.5
+      parent: 1
+  - uid: 2478
+    components:
+    - type: Transform
+      pos: 10.5,10.5
+      parent: 1
+  - uid: 2479
+    components:
+    - type: Transform
+      pos: 10.5,9.5
+      parent: 1
+  - uid: 2500
+    components:
+    - type: Transform
+      pos: 10.5,8.5
+      parent: 1
+  - uid: 2688
+    components:
+    - type: Transform
+      pos: 6.5,10.5
+      parent: 1
   - uid: 2697
     components:
     - type: Transform
@@ -5457,6 +5461,16 @@ entities:
       parent: 1
 - proto: CableMV
   entities:
+  - uid: 20
+    components:
+    - type: Transform
+      pos: 8.5,11.5
+      parent: 1
+  - uid: 68
+    components:
+    - type: Transform
+      pos: 10.5,10.5
+      parent: 1
   - uid: 75
     components:
     - type: Transform
@@ -5502,6 +5516,11 @@ entities:
     - type: Transform
       pos: 14.5,16.5
       parent: 1
+  - uid: 399
+    components:
+    - type: Transform
+      pos: 9.5,10.5
+      parent: 1
   - uid: 431
     components:
     - type: Transform
@@ -5527,11 +5546,36 @@ entities:
     - type: Transform
       pos: 1.5,-0.5
       parent: 1
-  - uid: 487
+  - uid: 471
+    components:
+    - type: Transform
+      pos: 10.5,9.5
+      parent: 1
+  - uid: 473
+    components:
+    - type: Transform
+      pos: 10.5,7.5
+      parent: 1
+  - uid: 487
     components:
     - type: Transform
       pos: 5.5,1.5
       parent: 1
+  - uid: 509
+    components:
+    - type: Transform
+      pos: 8.5,10.5
+      parent: 1
+  - uid: 523
+    components:
+    - type: Transform
+      pos: 7.5,10.5
+      parent: 1
+  - uid: 526
+    components:
+    - type: Transform
+      pos: 10.5,8.5
+      parent: 1
   - uid: 527
     components:
     - type: Transform
@@ -5542,6 +5586,11 @@ entities:
     - type: Transform
       pos: -0.5,-0.5
       parent: 1
+  - uid: 548
+    components:
+    - type: Transform
+      pos: 7.5,11.5
+      parent: 1
   - uid: 556
     components:
     - type: Transform
@@ -5717,31 +5766,6 @@ entities:
     - type: Transform
       pos: 4.5,8.5
       parent: 1
-  - uid: 598
-    components:
-    - type: Transform
-      pos: 5.5,8.5
-      parent: 1
-  - uid: 599
-    components:
-    - type: Transform
-      pos: 6.5,8.5
-      parent: 1
-  - uid: 600
-    components:
-    - type: Transform
-      pos: 7.5,8.5
-      parent: 1
-  - uid: 601
-    components:
-    - type: Transform
-      pos: 7.5,9.5
-      parent: 1
-  - uid: 602
-    components:
-    - type: Transform
-      pos: 7.5,10.5
-      parent: 1
   - uid: 603
     components:
     - type: Transform
@@ -6162,6 +6186,26 @@ entities:
     - type: Transform
       pos: -1.5,-1.5
       parent: 1
+  - uid: 1769
+    components:
+    - type: Transform
+      pos: 13.5,8.5
+      parent: 1
+  - uid: 1770
+    components:
+    - type: Transform
+      pos: 10.5,6.5
+      parent: 1
+  - uid: 1790
+    components:
+    - type: Transform
+      pos: 10.5,5.5
+      parent: 1
+  - uid: 1800
+    components:
+    - type: Transform
+      pos: 12.5,8.5
+      parent: 1
   - uid: 2092
     components:
     - type: Transform
@@ -6177,6 +6221,11 @@ entities:
     - type: Transform
       pos: 16.5,22.5
       parent: 1
+  - uid: 2266
+    components:
+    - type: Transform
+      pos: 11.5,8.5
+      parent: 1
   - uid: 2711
     components:
     - type: Transform
@@ -6359,6 +6408,12 @@ entities:
     - type: Transform
       pos: 0.5,4.5
       parent: 1
+  - uid: 91
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,7.5
+      parent: 1
   - uid: 128
     components:
     - type: Transform
@@ -6371,12 +6426,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -0.5,8.5
       parent: 1
-  - uid: 181
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 10.5,8.5
-      parent: 1
   - uid: 294
     components:
     - type: Transform
@@ -6447,7 +6496,8 @@ entities:
   - uid: 2726
     components:
     - type: Transform
-      pos: 19.477762,4.1549616
+      rot: -6.283185307179586 rad
+      pos: 19.507961,4.1895127
       parent: 1
 - proto: ClothingBeltUtilityEngineering
   entities:
@@ -6589,6 +6639,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 0.5,-1.5
       parent: 1
+  - uid: 808
+    components:
+    - type: Transform
+      pos: 6.5,8.5
+      parent: 1
 - proto: ComputerComms
   entities:
   - uid: 459
@@ -6606,10 +6661,11 @@ entities:
       parent: 1
 - proto: ComputerCrewMonitoring
   entities:
-  - uid: 180
+  - uid: 1824
     components:
     - type: Transform
-      pos: 9.5,9.5
+      rot: 1.5707963267948966 rad
+      pos: 9.5,7.5
       parent: 1
 - proto: ComputerCriminalRecords
   entities:
@@ -6619,10 +6675,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,0.5
       parent: 1
-  - uid: 179
+  - uid: 287
     components:
     - type: Transform
-      pos: 11.5,9.5
+      rot: -1.5707963267948966 rad
+      pos: 11.5,7.5
       parent: 1
 - proto: ComputerId
   entities:
@@ -6678,10 +6735,19 @@ entities:
       parent: 1
 - proto: ComputerSurveillanceWirelessCameraMonitor
   entities:
-  - uid: 415
+  - uid: 552
     components:
     - type: Transform
-      pos: 10.5,9.5
+      rot: 1.5707963267948966 rad
+      pos: 9.5,8.5
+      parent: 1
+- proto: ComputerTabletopCriminalRecords
+  entities:
+  - uid: 2236
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -13.5,1.5
       parent: 1
 - proto: ContrabandPallet
   entities:
@@ -6785,6 +6851,31 @@ entities:
     - type: Transform
       pos: -13.419492,19.564522
       parent: 1
+- proto: Crematorium
+  entities:
+  - uid: 1262
+    components:
+    - type: Transform
+      pos: 9.5,13.5
+      parent: 1
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14923
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
 - proto: CurtainsGreenOpen
   entities:
   - uid: 98
@@ -6804,16 +6895,16 @@ entities:
       parent: 1
 - proto: DefibrillatorCabinetFilled
   entities:
-  - uid: 2717
+  - uid: 2464
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 17.5,4.5
+      rot: 3.141592653589793 rad
+      pos: 17.5,2.5
       parent: 1
-  - uid: 2766
+  - uid: 2783
     components:
     - type: Transform
-      pos: 12.5,6.5
+      pos: 5.5,6.5
       parent: 1
 - proto: DisposalBend
   entities:
@@ -6834,11 +6925,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 14.5,23.5
       parent: 1
-  - uid: 2479
-    components:
-    - type: Transform
-      pos: 7.5,7.5
-      parent: 1
   - uid: 2480
     components:
     - type: Transform
@@ -6893,12 +6979,6 @@ entities:
       parent: 1
 - proto: DisposalJunction
   entities:
-  - uid: 1040
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,3.5
-      parent: 1
   - uid: 1708
     components:
     - type: Transform
@@ -6912,36 +6992,12 @@ entities:
       parent: 1
 - proto: DisposalJunctionFlipped
   entities:
-  - uid: 555
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 14.5,3.5
-      parent: 1
-  - uid: 1166
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 10.5,3.5
-      parent: 1
-  - uid: 1255
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,3.5
-      parent: 1
   - uid: 2442
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 14.5,15.5
       parent: 1
-  - uid: 2475
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,4.5
-      parent: 1
   - uid: 2476
     components:
     - type: Transform
@@ -6956,47 +7012,16 @@ entities:
       parent: 1
 - proto: DisposalPipe
   entities:
-  - uid: 17
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 6.5,1.5
-      parent: 1
-  - uid: 68
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 6.5,2.5
-      parent: 1
-  - uid: 94
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 13.5,3.5
-      parent: 1
-  - uid: 116
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 14.5,2.5
-      parent: 1
-  - uid: 169
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 14.5,1.5
-      parent: 1
-  - uid: 713
+  - uid: 400
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 15.5,3.5
+      pos: 4.5,3.5
       parent: 1
-  - uid: 811
+  - uid: 404
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 10.5,1.5
+      rot: 1.5707963267948966 rad
+      pos: 7.5,4.5
       parent: 1
   - uid: 955
     components:
@@ -7004,48 +7029,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -12.5,15.5
       parent: 1
-  - uid: 1167
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 11.5,3.5
-      parent: 1
-  - uid: 1262
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 12.5,3.5
-      parent: 1
-  - uid: 1363
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,3.5
-      parent: 1
-  - uid: 1420
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,3.5
-      parent: 1
-  - uid: 1614
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 9.5,3.5
-      parent: 1
   - uid: 1670
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -7.5,4.5
       parent: 1
-  - uid: 2089
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,3.5
-      parent: 1
   - uid: 2432
     components:
     - type: Transform
@@ -7198,18 +7187,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 8.5,4.5
       parent: 1
-  - uid: 2477
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 7.5,6.5
-      parent: 1
-  - uid: 2478
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 7.5,5.5
-      parent: 1
   - uid: 2481
     components:
     - type: Transform
@@ -7470,32 +7447,14 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -13.5,15.5
       parent: 1
-  - uid: 2688
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 10.5,2.5
-      parent: 1
 - proto: DisposalTrunk
   entities:
-  - uid: 382
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 6.5,0.5
-      parent: 1
   - uid: 1084
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -11.5,14.5
       parent: 1
-  - uid: 1892
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 16.5,3.5
-      parent: 1
   - uid: 2423
     components:
     - type: Transform
@@ -7520,30 +7479,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -14.5,9.5
       parent: 1
-  - uid: 2439
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,7.5
-      parent: 1
   - uid: 2441
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 13.5,15.5
       parent: 1
-  - uid: 2689
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 14.5,0.5
-      parent: 1
-  - uid: 2690
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 10.5,0.5
-      parent: 1
   - uid: 2734
     components:
     - type: Transform
@@ -7552,11 +7493,6 @@ entities:
       parent: 1
 - proto: DisposalUnit
   entities:
-  - uid: 111
-    components:
-    - type: Transform
-      pos: 16.5,3.5
-      parent: 1
   - uid: 2424
     components:
     - type: Transform
@@ -7577,11 +7513,6 @@ entities:
     - type: Transform
       pos: 13.5,15.5
       parent: 1
-  - uid: 2430
-    components:
-    - type: Transform
-      pos: 6.5,7.5
-      parent: 1
   - uid: 2438
     components:
     - type: Transform
@@ -7679,8 +7610,6 @@ entities:
       - 1867
       - 1866
       - 1889
-      - 1886
-      - 1887
       - 1895
       - 1894
       - 1893
@@ -7698,12 +7627,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 5.5,9.5
       parent: 1
-    - type: DeviceList
-      devices:
-      - 1886
-      - 1887
-      - 1888
-      - 2236
   - uid: 2215
     components:
     - type: Transform
@@ -7715,7 +7638,6 @@ entities:
       - 1891
       - 1890
       - 1889
-      - 1888
       - 2178
   - uid: 2216
     components:
@@ -7872,8 +7794,36 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 850
+  - uid: 2792
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,3.5
+      parent: 1
+    - type: DeviceNetwork
+      configurators:
+      - invalid
+      deviceLists:
+      - 2790
+      - 850
 - proto: FirelockGlass
   entities:
+  - uid: 616
+    components:
+    - type: Transform
+      pos: 12.5,8.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1420
+  - uid: 713
+    components:
+    - type: Transform
+      pos: 8.5,10.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1420
   - uid: 885
     components:
     - type: Transform
@@ -8072,32 +8022,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 850
-  - uid: 1886
-    components:
-    - type: Transform
-      pos: 7.5,6.5
-      parent: 1
-    - type: DeviceNetwork
-      deviceLists:
-      - 850
-      - 2214
-  - uid: 1887
-    components:
-    - type: Transform
-      pos: 9.5,6.5
-      parent: 1
-    - type: DeviceNetwork
-      deviceLists:
-      - 850
-      - 2214
-  - uid: 1888
-    components:
-    - type: Transform
-      pos: 5.5,8.5
-      parent: 1
-    - type: DeviceNetwork
-      deviceLists:
-      - 2214
   - uid: 1889
     components:
     - type: Transform
@@ -8165,20 +8089,12 @@ entities:
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 12.5,12.5
-      parent: 1
-    - type: DeviceNetwork
-      deviceLists:
-      - 850
-  - uid: 2236
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,10.5
+      pos: 12.5,12.5
       parent: 1
     - type: DeviceNetwork
       deviceLists:
-      - 2214
+      - 850
+      - 2690
   - uid: 2240
     components:
     - type: Transform
@@ -8192,9 +8108,12 @@ entities:
       pos: 16.5,6.5
       parent: 1
     - type: DeviceNetwork
+      configurators:
+      - invalid
       deviceLists:
       - 850
       - 2213
+      - 2790
   - uid: 2729
     components:
     - type: Transform
@@ -8207,6 +8126,13 @@ entities:
       - 2213
 - proto: FloorDrain
   entities:
+  - uid: 1577
+    components:
+    - type: Transform
+      pos: 10.5,12.5
+      parent: 1
+    - type: Fixtures
+      fixtures: {}
   - uid: 2721
     components:
     - type: Transform
@@ -8322,21 +8248,21 @@ entities:
       color: '#990000FF'
 - proto: GasPipeBend
   entities:
-  - uid: 718
+  - uid: 17
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 18.5,7.5
+      pos: 7.5,12.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 822
+      color: '#990000FF'
+  - uid: 718
     components:
     - type: Transform
-      pos: 18.5,6.5
+      rot: -1.5707963267948966 rad
+      pos: 18.5,7.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#0055CCFF'
   - uid: 1063
     components:
     - type: Transform
@@ -8452,11 +8378,11 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1768
+  - uid: 1751
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 6.5,8.5
+      rot: 1.5707963267948966 rad
+      pos: 9.5,13.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -8518,6 +8444,27 @@ entities:
       color: '#990000FF'
 - proto: GasPipeFourway
   entities:
+  - uid: 784
+    components:
+    - type: Transform
+      pos: 14.5,12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 880
+    components:
+    - type: Transform
+      pos: 10.5,5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 884
+    components:
+    - type: Transform
+      pos: 6.5,5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 1331
     components:
     - type: Transform
@@ -8574,8 +8521,45 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 2787
+    components:
+    - type: Transform
+      pos: 15.5,4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GasPipeStraight
   entities:
+  - uid: 110
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 17.5,4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 307
+    components:
+    - type: Transform
+      pos: 7.5,7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 308
+    components:
+    - type: Transform
+      pos: 7.5,9.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 382
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 383
     components:
     - type: Transform
@@ -8584,6 +8568,38 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 396
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 397
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 464
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 547
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 765
     components:
     - type: Transform
@@ -8592,6 +8608,21 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 781
+    components:
+    - type: Transform
+      pos: 14.5,8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 785
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,5.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 816
     components:
     - type: Transform
@@ -8608,6 +8639,14 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 1040
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 1054
     components:
     - type: Transform
@@ -8711,6 +8750,22 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 1167
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1180
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 1245
     components:
     - type: Transform
@@ -8718,6 +8773,13 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 1255
+    components:
+    - type: Transform
+      pos: 7.5,8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 1334
     components:
     - type: Transform
@@ -8773,6 +8835,22 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 1613
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1614
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 1634
     components:
     - type: Transform
@@ -9488,60 +9566,31 @@ entities:
   - uid: 1763
     components:
     - type: Transform
-      pos: 7.5,6.5
+      rot: -1.5707963267948966 rad
+      pos: 13.5,13.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1764
     components:
     - type: Transform
-      pos: 7.5,7.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1766
-    components:
-    - type: Transform
-      pos: 9.5,6.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1767
-    components:
-    - type: Transform
-      pos: 9.5,7.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 1769
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 6.5,9.5
+      rot: -1.5707963267948966 rad
+      pos: 14.5,8.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1770
+  - uid: 1768
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 6.5,10.5
+      rot: -1.5707963267948966 rad
+      pos: 13.5,8.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1771
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 6.5,11.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1773
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,12.5
+      pos: 7.5,6.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -9617,8 +9666,7 @@ entities:
   - uid: 1785
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 15.5,8.5
+      pos: 7.5,11.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -9646,14 +9694,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1790
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 15.5,13.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 1791
     components:
     - type: Transform
@@ -9717,14 +9757,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 1800
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 14.5,8.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 1801
     components:
     - type: Transform
@@ -9793,18 +9825,33 @@ entities:
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 15.5,12.5
+      pos: 15.5,12.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 1823
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 17.5,11.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 1825
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 13.5,12.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 1823
+  - uid: 1826
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 17.5,11.5
+      pos: 10.5,6.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#0055CCFF'
   - uid: 1828
     components:
     - type: Transform
@@ -9813,6 +9860,14 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 1888
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 1896
     components:
     - type: Transform
@@ -10704,6 +10759,14 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 2089
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,9.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 2110
     components:
     - type: Transform
@@ -10975,6 +11038,20 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 2176
+    components:
+    - type: Transform
+      pos: 7.5,10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 2177
+    components:
+    - type: Transform
+      pos: 6.5,10.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 2408
     components:
     - type: Transform
@@ -11045,6 +11122,14 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 2717
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 16.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 2727
     components:
     - type: Transform
@@ -11126,13 +11211,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 2752
-    components:
-    - type: Transform
-      pos: 14.5,3.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 2753
     components:
     - type: Transform
@@ -11233,6 +11311,22 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 2784
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 17.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 2785
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 15.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasPipeTJunction
   entities:
   - uid: 86
@@ -11251,14 +11345,22 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 890
+  - uid: 782
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 14.5,12.5
+      rot: -1.5707963267948966 rad
+      pos: 15.5,13.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#990000FF'
+  - uid: 783
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 15.5,8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 1083
     components:
     - type: Transform
@@ -11376,14 +11478,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 1751
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 9.5,5.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 1753
     components:
     - type: Transform
@@ -11399,29 +11493,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1765
-    components:
-    - type: Transform
-      pos: 7.5,8.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1772
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,12.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1782
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 15.5,4.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 1783
     components:
     - type: Transform
@@ -11506,20 +11577,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 2436
-    components:
-    - type: Transform
-      pos: 6.5,5.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 2500
-    components:
-    - type: Transform
-      pos: 10.5,5.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 2767
     components:
     - type: Transform
@@ -11535,6 +11592,14 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 2786
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasPressurePumpOn
   entities:
   - uid: 2161
@@ -11564,6 +11629,7 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 850
+      - 2790
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 815
@@ -11577,6 +11643,16 @@ entities:
       - 850
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 1010
+    components:
+    - type: Transform
+      pos: 10.5,7.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1420
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 1342
     components:
     - type: Transform
@@ -11623,6 +11699,17 @@ entities:
       - 2207
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 1772
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 11.5,12.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 2690
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 1810
     components:
     - type: Transform
@@ -11646,13 +11733,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 1813
-    components:
-    - type: Transform
-      pos: 9.5,8.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 1815
     components:
     - type: Transform
@@ -11672,6 +11752,16 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 1886
+    components:
+    - type: Transform
+      pos: 6.5,11.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1420
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 2018
     components:
     - type: Transform
@@ -11791,17 +11881,28 @@ entities:
       - 2207
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 2788
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 18.5,3.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 2790
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasVentScrubber
   entities:
-  - uid: 110
+  - uid: 814
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 18.5,5.5
+      rot: -1.5707963267948966 rad
+      pos: 18.5,6.5
       parent: 1
     - type: DeviceNetwork
       deviceLists:
-      - 850
+      - 2790
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 986
@@ -11820,6 +11921,17 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 1166
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,8.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1420
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 1361
     components:
     - type: Transform
@@ -11858,6 +11970,17 @@ entities:
       - 2207
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 1813
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,12.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 1420
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 1816
     components:
     - type: Transform
@@ -11913,29 +12036,6 @@ entities:
       - 850
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1824
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,8.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1825
-    components:
-    - type: Transform
-      pos: 6.5,13.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1826
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,12.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 1827
     components:
     - type: Transform
@@ -11981,6 +12081,17 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 1892
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 9.5,12.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 2690
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 2021
     components:
     - type: Transform
@@ -12062,6 +12173,17 @@ entities:
       - 2207
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 2789
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 18.5,4.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 2790
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GeneratorBasic15kW
   entities:
   - uid: 1004
@@ -12188,21 +12310,20 @@ entities:
     - type: Transform
       pos: 8.5,24.5
       parent: 1
-  - uid: 164
+  - uid: 177
     components:
     - type: Transform
-      pos: 11.5,6.5
+      pos: 12.5,7.5
       parent: 1
-  - uid: 168
+  - uid: 179
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 10.5,6.5
+      pos: 9.5,6.5
       parent: 1
-  - uid: 172
+  - uid: 181
     components:
     - type: Transform
-      pos: 12.5,8.5
+      pos: 11.5,6.5
       parent: 1
   - uid: 182
     components:
@@ -12270,6 +12391,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -7.5,-0.5
       parent: 1
+  - uid: 207
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,7.5
+      parent: 1
   - uid: 230
     components:
     - type: Transform
@@ -12715,11 +12842,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,-4.5
       parent: 1
-  - uid: 1613
-    components:
-    - type: Transform
-      pos: 12.5,9.5
-      parent: 1
   - uid: 1617
     components:
     - type: Transform
@@ -13454,19 +13576,10 @@ entities:
       parent: 1
 - proto: HighSecArmoryLocked
   entities:
-  - uid: 399
-    components:
-    - type: MetaData
-      name: Armory
-    - type: Transform
-      pos: 6.5,10.5
-      parent: 1
-  - uid: 471
+  - uid: 811
     components:
-    - type: MetaData
-      name: Evidence storage
     - type: Transform
-      pos: 12.5,12.5
+      pos: 8.5,10.5
       parent: 1
 - proto: IntercomCommon
   entities:
@@ -13518,6 +13631,40 @@ entities:
     - type: Transform
       pos: 18.435602,13.615202
       parent: 1
+- proto: LightTubeCrystalBlue
+  entities:
+  - uid: 2782
+    components:
+    - type: Transform
+      pos: -3.4528081,11.562986
+      parent: 1
+- proto: LockableButtonSecurity
+  entities:
+  - uid: 2780
+    components:
+    - type: Transform
+      pos: 12.5,6.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        924:
+        - Pressed: Toggle
+        923:
+        - Pressed: Toggle
+        922:
+        - Pressed: Toggle
+        926:
+        - Pressed: Toggle
+        925:
+        - Pressed: Toggle
+        932:
+        - Pressed: Toggle
+        931:
+        - Pressed: Toggle
+        930:
+        - Pressed: Toggle
+        2237:
+        - Pressed: Toggle
 - proto: LockerJanitorFilled
   entities:
   - uid: 114
@@ -13527,13 +13674,11 @@ entities:
       parent: 1
 - proto: LockerNfsdBailiff
   entities:
-  - uid: 255
+  - uid: 1765
     components:
     - type: Transform
-      pos: 8.5,9.5
+      pos: 11.5,10.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: LockerNfsdCopper
   entities:
   - uid: 327
@@ -13553,11 +13698,6 @@ entities:
       parent: 1
 - proto: LockerNfsdEvidence
   entities:
-  - uid: 207
-    components:
-    - type: Transform
-      pos: 11.5,11.5
-      parent: 1
   - uid: 212
     components:
     - type: Transform
@@ -13573,20 +13713,15 @@ entities:
     - type: Transform
       pos: 14.5,2.5
       parent: 1
-  - uid: 223
-    components:
-    - type: Transform
-      pos: 8.5,11.5
-      parent: 1
-  - uid: 307
+  - uid: 601
     components:
     - type: Transform
-      pos: 10.5,11.5
+      pos: 7.5,12.5
       parent: 1
-  - uid: 308
+  - uid: 888
     components:
     - type: Transform
-      pos: 9.5,11.5
+      pos: 7.5,13.5
       parent: 1
 - proto: LockerNfsdSheriff
   entities:
@@ -13641,12 +13776,14 @@ entities:
   - uid: 74
     components:
     - type: Transform
-      pos: 4.864033,13.80185
+      rot: -6.283185307179586 rad
+      pos: 5.0687227,13.463688
       parent: 1
   - uid: 387
     components:
     - type: Transform
-      pos: 5.096078,13.750259
+      rot: -6.283185307179586 rad
+      pos: 4.8708057,13.567927
       parent: 1
 - proto: MagazineBoxPistolPractice
   entities:
@@ -13660,7 +13797,8 @@ entities:
   - uid: 62
     components:
     - type: Transform
-      pos: 6.5645413,13.63418
+      rot: -6.283185307179586 rad
+      pos: 4.3499727,13.609623
       parent: 1
   - uid: 340
     components:
@@ -13677,7 +13815,8 @@ entities:
   - uid: 281
     components:
     - type: Transform
-      pos: 5.573057,13.763157
+      rot: -6.283185307179586 rad
+      pos: 5.5374727,13.620047
       parent: 1
 - proto: MagazineBoxRiflePractice
   entities:
@@ -13691,7 +13830,8 @@ entities:
   - uid: 76
     components:
     - type: Transform
-      pos: 6.177801,13.788953
+      rot: -6.283185307179586 rad
+      pos: 4.5270557,13.557503
       parent: 1
 - proto: MagazinePistolPractice
   entities:
@@ -13754,6 +13894,18 @@ entities:
     - type: Transform
       pos: 19.477762,3.696628
       parent: 1
+- proto: Morgue
+  entities:
+  - uid: 209
+    components:
+    - type: Transform
+      pos: 11.5,13.5
+      parent: 1
+  - uid: 1363
+    components:
+    - type: Transform
+      pos: 10.5,13.5
+      parent: 1
 - proto: NFClosetBombFilled
   entities:
   - uid: 865
@@ -13868,6 +14020,12 @@ entities:
       parent: 1
 - proto: PlastitaniumWindow
   entities:
+  - uid: 111
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,7.5
+      parent: 1
   - uid: 122
     components:
     - type: Transform
@@ -13947,30 +14105,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -6.5,-0.5
       parent: 1
-  - uid: 427
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 12.5,8.5
-      parent: 1
-  - uid: 433
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 11.5,6.5
-      parent: 1
   - uid: 455
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -0.5,-0.5
       parent: 1
-  - uid: 464
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 10.5,6.5
-      parent: 1
   - uid: 486
     components:
     - type: Transform
@@ -14057,6 +14197,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,3.5
       parent: 1
+  - uid: 555
+    components:
+    - type: Transform
+      pos: 12.5,7.5
+      parent: 1
   - uid: 568
     components:
     - type: Transform
@@ -14067,6 +14212,11 @@ entities:
     - type: Transform
       pos: 3.5,11.5
       parent: 1
+  - uid: 602
+    components:
+    - type: Transform
+      pos: 11.5,6.5
+      parent: 1
   - uid: 623
     components:
     - type: Transform
@@ -14276,10 +14426,10 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -5.5,21.5
       parent: 1
-  - uid: 1180
+  - uid: 1214
     components:
     - type: Transform
-      pos: 12.5,9.5
+      pos: 9.5,6.5
       parent: 1
   - uid: 1392
     components:
@@ -14563,6 +14713,14 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -2.5,14.5
       parent: 1
+- proto: PosterLegitAnatomyPoster
+  entities:
+  - uid: 2791
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 18.5,2.5
+      parent: 1
 - proto: PosterLegitCleanliness
   entities:
   - uid: 1368
@@ -14586,14 +14744,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -13.5,10.5
       parent: 1
-- proto: PosterLegitHelpOthers
-  entities:
-  - uid: 1343
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 12.5,13.5
-      parent: 1
 - proto: PosterLegitJustAWeekAway
   entities:
   - uid: 1344
@@ -14628,8 +14778,26 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 6.5,-3.5
       parent: 1
+- proto: PosterLegitSMPills
+  entities:
+  - uid: 433
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 19.5,10.5
+      parent: 1
 - proto: PottedPlantRandom
   entities:
+  - uid: 503
+    components:
+    - type: Transform
+      pos: 10.5,10.5
+      parent: 1
+  - uid: 881
+    components:
+    - type: Transform
+      pos: 7.5,6.5
+      parent: 1
   - uid: 975
     components:
     - type: Transform
@@ -14645,11 +14813,6 @@ entities:
     - type: Transform
       pos: -3.5,7.5
       parent: 1
-  - uid: 985
-    components:
-    - type: Transform
-      pos: 7.5,9.5
-      parent: 1
   - uid: 1005
     components:
     - type: Transform
@@ -14670,11 +14833,6 @@ entities:
     - type: Transform
       pos: 13.5,11.5
       parent: 1
-  - uid: 1577
-    components:
-    - type: Transform
-      pos: 12.5,5.5
-      parent: 1
   - uid: 2188
     components:
     - type: Transform
@@ -14712,6 +14870,12 @@ entities:
     - type: Transform
       pos: -4.5,25.5
       parent: 1
+  - uid: 169
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,9.5
+      parent: 1
   - uid: 192
     components:
     - type: Transform
@@ -14746,22 +14910,12 @@ entities:
     - type: Transform
       pos: 18.5,13.5
       parent: 1
-  - uid: 881
-    components:
-    - type: Transform
-      pos: 12.5,5.5
-      parent: 1
   - uid: 882
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 15.5,10.5
       parent: 1
-  - uid: 884
-    components:
-    - type: Transform
-      pos: 9.5,9.5
-      parent: 1
   - uid: 889
     components:
     - type: Transform
@@ -14822,11 +14976,6 @@ entities:
     - type: Transform
       pos: 5.5,13.5
       parent: 1
-  - uid: 1214
-    components:
-    - type: Transform
-      pos: 10.5,13.5
-      parent: 1
   - uid: 1216
     components:
     - type: Transform
@@ -15012,6 +15161,11 @@ entities:
     - type: Transform
       pos: 0.5,-27.5
       parent: 1
+  - uid: 2689
+    components:
+    - type: Transform
+      pos: 7.5,8.5
+      parent: 1
   - uid: 2720
     components:
     - type: Transform
@@ -15040,6 +15194,12 @@ entities:
     - type: Transform
       pos: -17.5,22.5
       parent: 1
+  - uid: 1767
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,12.5
+      parent: 1
 - proto: PoweredlightExterior
   entities:
   - uid: 2422
@@ -15152,6 +15312,21 @@ entities:
       parent: 1
 - proto: RandomPosterLegit
   entities:
+  - uid: 40
+    components:
+    - type: Transform
+      pos: 12.5,9.5
+      parent: 1
+  - uid: 403
+    components:
+    - type: Transform
+      pos: 7.5,9.5
+      parent: 1
+  - uid: 427
+    components:
+    - type: Transform
+      pos: 10.5,11.5
+      parent: 1
   - uid: 2260
     components:
     - type: Transform
@@ -15182,11 +15357,6 @@ entities:
     - type: Transform
       pos: 5.5,7.5
       parent: 1
-  - uid: 2266
-    components:
-    - type: Transform
-      pos: 10.5,10.5
-      parent: 1
   - uid: 2267
     components:
     - type: Transform
@@ -15219,6 +15389,13 @@ entities:
     - type: Transform
       pos: 2.4312053,8.810738
       parent: 1
+- proto: SellOnlyMothershipComputer
+  entities:
+  - uid: 428
+    components:
+    - type: Transform
+      pos: 7.5,8.5
+      parent: 1
 - proto: ShelfChemistry
   entities:
   - uid: 142
@@ -15271,42 +15448,16 @@ entities:
   - uid: 2237
     components:
     - type: Transform
-      pos: 16.5,-0.5
-      parent: 1
-- proto: SignalButtonDirectional
-  entities:
-  - uid: 721
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,19.5
-      parent: 1
-  - uid: 880
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 6.5,6.5
-      parent: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        924:
-        - Pressed: Toggle
-        923:
-        - Pressed: Toggle
-        922:
-        - Pressed: Toggle
-        926:
-        - Pressed: Toggle
-        925:
-        - Pressed: Toggle
-        932:
-        - Pressed: Toggle
-        931:
-        - Pressed: Toggle
-        930:
-        - Pressed: Toggle
-        2237:
-        - Pressed: Toggle
+      pos: 16.5,-0.5
+      parent: 1
+- proto: SignalButtonDirectional
+  entities:
+  - uid: 721
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,19.5
+      parent: 1
 - proto: SignalSwitchDirectional
   entities:
   - uid: 1338
@@ -15340,28 +15491,43 @@ entities:
     - type: Transform
       pos: 13.5,-0.5
       parent: 1
-- proto: SignNfsdArmoury
+- proto: SignMorgue
   entities:
-  - uid: 175
+  - uid: 763
     components:
     - type: Transform
-      pos: 8.5,6.5
+      pos: 12.5,13.5
       parent: 1
-- proto: SignNfsdInterrogation
+- proto: SignNfsdArmoury
   entities:
-  - uid: 290
+  - uid: 172
     components:
     - type: Transform
-      pos: 16.5,12.5
+      pos: 8.5,9.5
       parent: 1
-- proto: SignMedical
+- proto: SignNfsdBrigmed
   entities:
-  - uid: 616
+  - uid: 1773
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
+      rot: 3.141592653589793 rad
       pos: 16.5,5.5
       parent: 1
+- proto: SignNfsdDetective
+  entities:
+  - uid: 600
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -13.5,3.5
+      parent: 1
+- proto: SignNfsdInterrogation
+  entities:
+  - uid: 290
+    components:
+    - type: Transform
+      pos: 16.5,12.5
+      parent: 1
 - proto: Sink
   entities:
   - uid: 2722
@@ -15511,6 +15677,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: -13.5,16.5
       parent: 1
+- proto: StructureGunRackNfsd
+  entities:
+  - uid: 985
+    components:
+    - type: Transform
+      pos: 6.5,13.5
+      parent: 1
 - proto: SubstationWallBasic
   entities:
   - uid: 1104
@@ -15571,10 +15744,11 @@ entities:
     - type: Transform
       pos: -12.5,19.5
       parent: 1
-  - uid: 92
+  - uid: 94
     components:
     - type: Transform
-      pos: 9.5,6.5
+      rot: -1.5707963267948966 rad
+      pos: 10.5,6.5
       parent: 1
   - uid: 126
     components:
@@ -15633,12 +15807,6 @@ entities:
     - type: Transform
       pos: 0.5,22.5
       parent: 1
-  - uid: 473
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,13.5
-      parent: 1
   - uid: 488
     components:
     - type: Transform
@@ -16170,6 +16338,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 19.5,22.5
       parent: 1
+  - uid: 92
+    components:
+    - type: Transform
+      pos: 12.5,9.5
+      parent: 1
   - uid: 99
     components:
     - type: Transform
@@ -16188,11 +16361,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,26.5
       parent: 1
-  - uid: 103
+  - uid: 102
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 8.5,10.5
+      pos: 9.5,11.5
       parent: 1
   - uid: 112
     components:
@@ -16233,6 +16406,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 12.5,25.5
       parent: 1
+  - uid: 140
+    components:
+    - type: Transform
+      pos: 8.5,12.5
+      parent: 1
   - uid: 144
     components:
     - type: Transform
@@ -16297,6 +16475,12 @@ entities:
     - type: Transform
       pos: -9.5,23.5
       parent: 1
+  - uid: 164
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,11.5
+      parent: 1
   - uid: 165
     components:
     - type: Transform
@@ -16309,6 +16493,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 13.5,26.5
       parent: 1
+  - uid: 168
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,11.5
+      parent: 1
   - uid: 171
     components:
     - type: Transform
@@ -16321,12 +16511,22 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 12.5,26.5
       parent: 1
+  - uid: 176
+    components:
+    - type: Transform
+      pos: 8.5,8.5
+      parent: 1
   - uid: 178
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 3.5,26.5
       parent: 1
+  - uid: 180
+    components:
+    - type: Transform
+      pos: 12.5,6.5
+      parent: 1
   - uid: 191
     components:
     - type: Transform
@@ -16386,6 +16586,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 19.5,23.5
       parent: 1
+  - uid: 223
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,8.5
+      parent: 1
   - uid: 231
     components:
     - type: Transform
@@ -16468,6 +16674,11 @@ entities:
     - type: Transform
       pos: -1.5,-28.5
       parent: 1
+  - uid: 255
+    components:
+    - type: Transform
+      pos: 8.5,9.5
+      parent: 1
   - uid: 258
     components:
     - type: Transform
@@ -16533,18 +16744,6 @@ entities:
     - type: Transform
       pos: -10.5,20.5
       parent: 1
-  - uid: 286
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 8.5,6.5
-      parent: 1
-  - uid: 287
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 6.5,6.5
-      parent: 1
   - uid: 289
     components:
     - type: Transform
@@ -16729,24 +16928,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -1.5,14.5
       parent: 1
-  - uid: 396
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 9.5,10.5
-      parent: 1
-  - uid: 397
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 7.5,10.5
-      parent: 1
-  - uid: 400
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 12.5,6.5
-      parent: 1
   - uid: 401
     components:
     - type: Transform
@@ -16759,18 +16940,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 6.5,14.5
       parent: 1
-  - uid: 403
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 11.5,10.5
-      parent: 1
-  - uid: 404
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 10.5,10.5
-      parent: 1
   - uid: 406
     components:
     - type: Transform
@@ -17054,12 +17223,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 5.5,7.5
       parent: 1
-  - uid: 503
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,6.5
-      parent: 1
   - uid: 510
     components:
     - type: Transform
@@ -17137,6 +17300,16 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,-1.5
       parent: 1
+  - uid: 598
+    components:
+    - type: Transform
+      pos: 8.5,6.5
+      parent: 1
+  - uid: 599
+    components:
+    - type: Transform
+      pos: 7.5,9.5
+      parent: 1
   - uid: 629
     components:
     - type: Transform
@@ -17451,17 +17624,6 @@ entities:
     - type: Transform
       pos: 5.5,20.5
       parent: 1
-  - uid: 808
-    components:
-    - type: Transform
-      pos: 12.5,7.5
-      parent: 1
-  - uid: 814
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 17.5,3.5
-      parent: 1
   - uid: 851
     components:
     - type: Transform
@@ -17539,6 +17701,11 @@ entities:
     - type: Transform
       pos: 12.5,19.5
       parent: 1
+  - uid: 890
+    components:
+    - type: Transform
+      pos: 8.5,13.5
+      parent: 1
   - uid: 893
     components:
     - type: Transform
@@ -17950,6 +18117,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -6.5,-8.5
       parent: 1
+  - uid: 1343
+    components:
+    - type: Transform
+      pos: 8.5,11.5
+      parent: 1
   - uid: 1353
     components:
     - type: Transform
@@ -18267,6 +18439,11 @@ entities:
     - type: Transform
       pos: 2.5,-22.5
       parent: 1
+  - uid: 1766
+    components:
+    - type: Transform
+      pos: 6.5,9.5
+      parent: 1
   - uid: 1833
     components:
     - type: Transform
@@ -18284,6 +18461,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 16.5,7.5
       parent: 1
+  - uid: 1887
+    components:
+    - type: Transform
+      pos: 5.5,6.5
+      parent: 1
   - uid: 2016
     components:
     - type: Transform
@@ -18408,12 +18590,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 19.5,25.5
       parent: 1
-  - uid: 2464
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 17.5,4.5
-      parent: 1
   - uid: 2467
     components:
     - type: Transform
@@ -18772,21 +18948,19 @@ entities:
       parent: 1
 - proto: WindoorSecureArmoryLocked
   entities:
-  - uid: 177
+  - uid: 116
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 9.5,6.5
+      pos: 10.5,6.5
       parent: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        176:
-        - DoorStatus: Close
-  - uid: 1010
+- proto: WindoorSecureChemistryLocked
+  entities:
+  - uid: 822
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,13.5
+      rot: 3.141592653589793 rad
+      pos: 18.5,5.5
       parent: 1
 - proto: WindoorSecureFrontierCommandLocked
   entities:
@@ -18817,15 +18991,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 0.5,21.5
       parent: 1
-  - uid: 176
+  - uid: 175
     components:
     - type: Transform
-      pos: 9.5,6.5
+      rot: 3.141592653589793 rad
+      pos: 6.5,6.5
       parent: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        177:
-        - DoorStatus: Close
   - uid: 919
     components:
     - type: Transform
@@ -18844,8 +19015,20 @@ entities:
       rot: 3.141592653589793 rad
       pos: 7.5,1.5
       parent: 1
+  - uid: 1782
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 17.5,3.5
+      parent: 1
 - proto: WindowReinforcedDirectional
   entities:
+  - uid: 103
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,6.5
+      parent: 1
   - uid: 241
     components:
     - type: Transform
@@ -18866,12 +19049,6 @@ entities:
     - type: Transform
       pos: 0.5,23.5
       parent: 1
-  - uid: 428
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,11.5
-      parent: 1
   - uid: 787
     components:
     - type: Transform
@@ -18908,12 +19085,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 10.5,1.5
       parent: 1
-  - uid: 1009
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,12.5
-      parent: 1
   - uid: 1019
     components:
     - type: Transform
@@ -18926,4 +19097,16 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,16.5
       parent: 1
+  - uid: 2752
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 17.5,4.5
+      parent: 1
+  - uid: 2766
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 19.5,5.5
+      parent: 1
 ...
diff --git a/Resources/Prototypes/_NF/Access/security.yml b/Resources/Prototypes/_NF/Access/security.yml
index f9dea17e060..f1d0a443d50 100644
--- a/Resources/Prototypes/_NF/Access/security.yml
+++ b/Resources/Prototypes/_NF/Access/security.yml
@@ -35,3 +35,16 @@
   - Maintenance
   - External
   - Brig
+  
+- type: accessGroup
+  id: GeneralNfsdBrigmedicAccess
+  tags:
+  - Maintenance
+  - External
+  - Command
+  - Brig
+  - Security
+  - Mercenary # Frontier
+  - Captain # Frontier
+  - Chemistry
+  - Medical
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/brigmedic.yml b/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/brigmedic.yml
index bbcdc3bd68b..1780d26eee4 100644
--- a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/brigmedic.yml
+++ b/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/brigmedic.yml
@@ -20,7 +20,7 @@
   displayWeight: 35
   canBeAntag: false
   accessGroups:
-  - GeneralNfsdAccess
+  - GeneralNfsdBrigmedicAccess
   special:
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant, TrackingImplant ]