diff --git a/Resources/Maps/amber.yml b/Resources/Maps/amber.yml
index 5560ba782a9a..3ebff01c25a7 100644
--- a/Resources/Maps/amber.yml
+++ b/Resources/Maps/amber.yml
@@ -153,7 +153,7 @@ entities:
           version: 6
         -3,-4:
           ind: -3,-4
-          tiles: LgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAADgAAAAAACQAAAAADCQAAAAABCQAAAAADCQAAAAACLgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAADgAAAAAACQAAAAAACQAAAAABCQAAAAAACQAAAAACLgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAADgAAAAAACQAAAAADCQAAAAAACQAAAAAACQAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALAAAAAAADgAAAAAACQAAAAABCQAAAAACCQAAAAACCQAAAAADLAAAAAAALAAAAAAALgAAAAAALgAAAAAALgAAAAAALAAAAAAALgAAAAAALAAAAAAALgAAAAAALAAAAAAADgAAAAAADgAAAAAADgAAAAAACQAAAAADCQAAAAAACQAAAAADDgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAGwAAAAAAGwAAAAAACQAAAAACCQAAAAADCQAAAAAAHAAAAAABHAAAAAABHAAAAAACDgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAGwAAAAAADgAAAAAACQAAAAABCQAAAAADCQAAAAACHAAAAAADHAAAAAAAHAAAAAABDgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAACQAAAAACCQAAAAABCQAAAAABDgAAAAAADgAAAAAADgAAAAAADgAAAAAAGwAAAAAAGwAAAAAAJAAAAAAAJAAAAAAADgAAAAAAIwAAAAAAIwAAAAAAIwAAAAABDgAAAAAACQAAAAABCQAAAAABCQAAAAAAGwAAAAAAGwAAAAAAGwAAAAAADgAAAAAADgAAAAAADgAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAIwAAAAACIwAAAAACIwAAAAAADgAAAAAACQAAAAABCQAAAAAACQAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAJAAAAAAAJAAAAAAADgAAAAAAIwAAAAAAIwAAAAAAIwAAAAABDgAAAAAACQAAAAABCQAAAAACCQAAAAADGwAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAJAAAAAAAJAAAAAAADgAAAAAAHAAAAAABIwAAAAADIwAAAAABCQAAAAAACQAAAAADCQAAAAACCQAAAAACDgAAAAAAGwAAAAAAGwAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAHAAAAAABHAAAAAACHAAAAAACDgAAAAAACQAAAAABCQAAAAACCQAAAAACDgAAAAAAGwAAAAAAGwAAAAAADgAAAAAADgAAAAAAMQAAAAAAMQAAAAAAMQAAAAADDgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAACQAAAAABCQAAAAACCQAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAACQAAAAACCQAAAAAACQAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAGwAAAAAACQAAAAADCQAAAAABCQAAAAAB
+          tiles: LgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAADgAAAAAACQAAAAADCQAAAAABCQAAAAADCQAAAAACLgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAADgAAAAAACQAAAAAACQAAAAABCQAAAAAACQAAAAACLgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAADgAAAAAACQAAAAADCQAAAAAACQAAAAAACQAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALAAAAAAADgAAAAAACQAAAAABCQAAAAACCQAAAAACCQAAAAADLAAAAAAALAAAAAAALgAAAAAALgAAAAAALgAAAAAALAAAAAAALgAAAAAALAAAAAAALgAAAAAALAAAAAAADgAAAAAADgAAAAAADgAAAAAACQAAAAADCQAAAAAACQAAAAADDgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAGwAAAAAAGwAAAAAACQAAAAACCQAAAAADCQAAAAAAHAAAAAABHAAAAAABHAAAAAACDgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAGwAAAAAADgAAAAAACQAAAAABCQAAAAADCQAAAAACHAAAAAAAHAAAAAAAHAAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAACQAAAAACCQAAAAABCQAAAAABDgAAAAAADgAAAAAADgAAAAAADgAAAAAAGwAAAAAAGwAAAAAAJAAAAAAAJAAAAAAADgAAAAAAIwAAAAAAIwAAAAAAIwAAAAABDgAAAAAACQAAAAABCQAAAAABCQAAAAAAGwAAAAAAGwAAAAAAGwAAAAAADgAAAAAADgAAAAAADgAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAIwAAAAACIwAAAAACIwAAAAAADgAAAAAACQAAAAABCQAAAAAACQAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAJAAAAAAAJAAAAAAADgAAAAAAIwAAAAAAIwAAAAAAIwAAAAABDgAAAAAACQAAAAABCQAAAAACCQAAAAADGwAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAJAAAAAAAJAAAAAAADgAAAAAAHAAAAAABIwAAAAADIwAAAAABCQAAAAAACQAAAAADCQAAAAACCQAAAAACDgAAAAAAGwAAAAAAGwAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAHAAAAAABHAAAAAACHAAAAAACDgAAAAAACQAAAAABCQAAAAACCQAAAAACDgAAAAAAGwAAAAAAGwAAAAAADgAAAAAADgAAAAAAMQAAAAAAMQAAAAAAMQAAAAADDgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAACQAAAAABCQAAAAACCQAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAACQAAAAACCQAAAAAACQAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAGwAAAAAACQAAAAADCQAAAAABCQAAAAAB
           version: 6
         -3,-5:
           ind: -3,-5
@@ -225,7 +225,7 @@ entities:
           version: 6
         0,0:
           ind: 0,0
-          tiles: DgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAGwAAAAAAGwAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAGwAAAAAAGwAAAAAALAAAAAAAMAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAALAAAAAAADgAAAAAAGwAAAAAAGwAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAALAAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAALAAAAAAADgAAAAAAGwAAAAAAGwAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAALAAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAALAAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAALgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAALAAAAAAADgAAAAAADgAAAAAACQAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAALAAAAAAALgAAAAAALAAAAAAALAAAAAAALgAAAAAALAAAAAAALgAAAAAADgAAAAAADgAAAAAACQAAAAACDgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAALgAAAAAALAAAAAAALAAAAAAALAAAAAAAMAAAAAAFDgAAAAAADgAAAAAACQAAAAADCQAAAAADLgAAAAAALAAAAAAALAAAAAAAMAAAAAAADgAAAAAADgAAAAAAMAAAAAAFLAAAAAAALAAAAAAAMAAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAHAAAAAAAHAAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAACQAAAAADCQAAAAABCQAAAAABCQAAAAACCQAAAAABCQAAAAADCQAAAAACCQAAAAACCQAAAAABCQAAAAACCQAAAAABCQAAAAADCQAAAAACCQAAAAACCQAAAAABCQAAAAADCQAAAAABCQAAAAAALwAAAAAALwAAAAADLwAAAAACLwAAAAAALwAAAAADLwAAAAAALwAAAAAALwAAAAABLwAAAAADLwAAAAACLwAAAAACLwAAAAADLwAAAAACLwAAAAADDgAAAAAALwAAAAABCQAAAAABCQAAAAADCQAAAAADCQAAAAAACQAAAAACCQAAAAADCQAAAAABCQAAAAACCQAAAAACCQAAAAABCQAAAAACCQAAAAAACQAAAAADCQAAAAACDgAAAAAADgAAAAAADgAAAAAADgAAAAAACQAAAAADCQAAAAABCQAAAAADCQAAAAADCQAAAAACDgAAAAAADgAAAAAADgAAAAAACQAAAAABCQAAAAABCQAAAAADCQAAAAADDgAAAAAADgAAAAAALAAAAAAADgAAAAAACQAAAAADCQAAAAAACQAAAAADCQAAAAADCQAAAAABDgAAAAAALAAAAAAADgAAAAAACQAAAAACCQAAAAABCQAAAAACDgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAACQAAAAABDgAAAAAACQAAAAADCQAAAAACDgAAAAAADgAAAAAADgAAAAAADgAAAAAACQAAAAABCQAAAAADCQAAAAACGwAAAAAADgAAAAAADgAAAAAA
+          tiles: DgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAGwAAAAAAGwAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAGwAAAAAAGwAAAAAALAAAAAAAMAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAADgAAAAAAGwAAAAAAGwAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAALAAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAALAAAAAAADgAAAAAAGwAAAAAAGwAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAALAAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAALAAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAALgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAALAAAAAAADgAAAAAADgAAAAAACQAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAALAAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAALgAAAAAADgAAAAAADgAAAAAACQAAAAACDgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAALAAAAAAADgAAAAAACQAAAAADCQAAAAADLgAAAAAALAAAAAAALAAAAAAAMAAAAAAADgAAAAAADgAAAAAAMAAAAAAFLAAAAAAALgAAAAAALgAAAAAALAAAAAAALgAAAAAALAAAAAAADgAAAAAAHAAAAAAAHAAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAACQAAAAADCQAAAAABCQAAAAABCQAAAAACCQAAAAABCQAAAAADCQAAAAACCQAAAAACCQAAAAABCQAAAAACCQAAAAABCQAAAAADCQAAAAACCQAAAAACCQAAAAABCQAAAAADCQAAAAABCQAAAAAALwAAAAAALwAAAAADLwAAAAACLwAAAAAALwAAAAADLwAAAAAALwAAAAAALwAAAAABLwAAAAADLwAAAAACLwAAAAACLwAAAAADLwAAAAACLwAAAAADDgAAAAAALwAAAAABCQAAAAABCQAAAAADCQAAAAADCQAAAAAACQAAAAACCQAAAAADCQAAAAABCQAAAAACCQAAAAACCQAAAAABCQAAAAACCQAAAAAACQAAAAADCQAAAAACDgAAAAAADgAAAAAADgAAAAAADgAAAAAACQAAAAADCQAAAAABCQAAAAADCQAAAAADCQAAAAACDgAAAAAADgAAAAAADgAAAAAACQAAAAABCQAAAAABCQAAAAADCQAAAAADDgAAAAAADgAAAAAALAAAAAAADgAAAAAACQAAAAADCQAAAAAACQAAAAADCQAAAAADCQAAAAABDgAAAAAALAAAAAAADgAAAAAACQAAAAACCQAAAAABCQAAAAACDgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAACQAAAAABDgAAAAAACQAAAAADCQAAAAACDgAAAAAADgAAAAAADgAAAAAADgAAAAAACQAAAAABCQAAAAADCQAAAAACGwAAAAAADgAAAAAADgAAAAAA
           version: 6
         0,1:
           ind: 0,1
@@ -531,6 +531,8 @@ entities:
             18617: 28,-5
             18618: 27,-5
             18619: 26,-5
+            20038: -46,-57
+            20039: -48,-57
         - node:
             zIndex: 1
             color: '#FFFFFFFF'
@@ -750,30 +752,6 @@ entities:
             id: BrickTileDarkLineW
           decals:
             17968: 33,-5
-        - node:
-            zIndex: 1
-            color: '#95171093'
-            id: BrickTileSteelBox
-          decals:
-            17735: -47,-57
-        - node:
-            zIndex: 1
-            color: '#95171093'
-            id: BrickTileSteelCornerSe
-          decals:
-            17736: -46,-58
-        - node:
-            zIndex: 1
-            color: '#95171093'
-            id: BrickTileSteelCornerSw
-          decals:
-            17737: -48,-58
-        - node:
-            zIndex: 1
-            color: '#95171093'
-            id: BrickTileSteelLineE
-          decals:
-            17738: -46,-57
         - node:
             zIndex: 1
             color: '#FFFFFFFF'
@@ -781,12 +759,6 @@ entities:
           decals:
             18565: 27,2
             18566: 27,1
-        - node:
-            zIndex: 1
-            color: '#95171093'
-            id: BrickTileSteelLineS
-          decals:
-            17739: -47,-58
         - node:
             zIndex: 1
             color: '#FFFFFFFF'
@@ -796,12 +768,6 @@ entities:
             19368: 13,26
             19369: 12,26
             19370: 11,26
-        - node:
-            zIndex: 1
-            color: '#95171093'
-            id: BrickTileSteelLineW
-          decals:
-            17740: -48,-57
         - node:
             zIndex: 1
             color: '#3EB38896'
@@ -4843,9 +4809,6 @@ entities:
             18783: -51,-58
             18784: -51,-59
             18785: -51,-60
-            18786: -46,-57
-            18787: -47,-57
-            18788: -48,-57
             18789: -44,-58
             18790: -42,-58
             18791: -41,-58
@@ -6803,7 +6766,6 @@ entities:
             18863: -54,-59
             18864: -54,-58
             18865: -52,-56
-            18866: -47,-58
             18867: -37,-58
             18868: -35,-59
             18869: -35,-58
@@ -7922,12 +7884,6 @@ entities:
             18685: -50,-58
             18686: -50,-56
             18687: -50,-55
-            18688: -48,-57
-            18689: -48,-58
-            18690: -47,-58
-            18691: -46,-58
-            18692: -46,-57
-            18693: -47,-57
             18694: -44,-57
             18695: -44,-57
             18696: -44,-56
@@ -8640,12 +8596,6 @@ entities:
             id: HalfTileOverlayGreyscale
           decals:
             19354: 22,22
-        - node:
-            zIndex: 1
-            color: '#95171093'
-            id: HalfTileOverlayGreyscale
-          decals:
-            17731: -47,-58
         - node:
             color: '#D381C996'
             id: HalfTileOverlayGreyscale
@@ -8816,12 +8766,6 @@ entities:
             16321: -36,-24
             16322: -36,-23
             18573: 20,1
-        - node:
-            zIndex: 1
-            color: '#95171093'
-            id: HalfTileOverlayGreyscale270
-          decals:
-            17730: -46,-57
         - node:
             color: '#D381C996'
             id: HalfTileOverlayGreyscale270
@@ -8906,12 +8850,6 @@ entities:
             16309: -34,-23
             16310: -34,-24
             16311: -34,-25
-        - node:
-            zIndex: 1
-            color: '#95171093'
-            id: HalfTileOverlayGreyscale90
-          decals:
-            17729: -48,-57
         - node:
             color: '#D381C996'
             id: HalfTileOverlayGreyscale90
@@ -9073,12 +9011,6 @@ entities:
             19323: 27,23
             19324: 27,24
             19325: 27,25
-        - node:
-            zIndex: 1
-            color: '#95171093'
-            id: QuarterTileOverlayGreyscale
-          decals:
-            17733: -46,-58
         - node:
             zIndex: 1
             color: '#9FED5896'
@@ -9526,12 +9458,6 @@ entities:
             18616: 17,22
             19315: 15,25
             19384: 14,25
-        - node:
-            zIndex: 1
-            color: '#95171093'
-            id: QuarterTileOverlayGreyscale90
-          decals:
-            17732: -48,-58
         - node:
             zIndex: 1
             color: '#A4610696'
@@ -10093,6 +10019,7 @@ entities:
             10953: -4,-18
             10954: -3,-18
             10955: -2,-18
+            20041: -47,-58
         - node:
             zIndex: 1
             color: '#D381C996'
@@ -18808,21 +18735,13 @@ entities:
       parent: 2
     - type: DeviceLinkSink
       invokeCounter: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        10212:
-        - DoorStatus: DoorBolt
   - uid: 10212
     components:
     - type: Transform
       pos: -34.5,-4.5
       parent: 2
     - type: DeviceLinkSink
-      invokeCounter: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        3558:
-        - DoorStatus: DoorBolt
+      invokeCounter: 2
 - proto: AirlockSecurityLawyerGlassLocked
   entities:
   - uid: 170
@@ -19205,7 +19124,6 @@ entities:
   - uid: 13418
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
       pos: 10.5,-26.5
       parent: 2
     - type: DeviceNetwork
@@ -19280,7 +19198,6 @@ entities:
   - uid: 13664
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
       pos: 16.5,-30.5
       parent: 2
     - type: DeviceNetwork
@@ -19370,7 +19287,6 @@ entities:
   - uid: 14727
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
       pos: -23.5,-37.5
       parent: 2
     - type: DeviceNetwork
@@ -20661,26 +20577,6 @@ entities:
     - type: Transform
       pos: -9.5,3.5
       parent: 2
-  - uid: 4052
-    components:
-    - type: Transform
-      pos: 12.5,8.5
-      parent: 2
-  - uid: 4065
-    components:
-    - type: Transform
-      pos: 11.5,8.5
-      parent: 2
-  - uid: 9682
-    components:
-    - type: Transform
-      pos: 12.5,7.5
-      parent: 2
-  - uid: 9684
-    components:
-    - type: Transform
-      pos: 10.5,8.5
-      parent: 2
 - proto: AtmosDeviceFanDirectional
   entities:
   - uid: 2064
@@ -20873,21 +20769,6 @@ entities:
     - type: Transform
       pos: 63.5,7.5
       parent: 2
-  - uid: 867
-    components:
-    - type: Transform
-      pos: 10.5,4.5
-      parent: 2
-  - uid: 901
-    components:
-    - type: Transform
-      pos: 9.5,3.5
-      parent: 2
-  - uid: 1089
-    components:
-    - type: Transform
-      pos: 9.5,4.5
-      parent: 2
   - uid: 1171
     components:
     - type: Transform
@@ -20908,11 +20789,6 @@ entities:
     - type: Transform
       pos: 59.5,-41.5
       parent: 2
-  - uid: 1583
-    components:
-    - type: Transform
-      pos: 10.5,2.5
-      parent: 2
   - uid: 1657
     components:
     - type: Transform
@@ -21063,11 +20939,6 @@ entities:
     - type: Transform
       pos: 6.5,7.5
       parent: 2
-  - uid: 4821
-    components:
-    - type: Transform
-      pos: 10.5,3.5
-      parent: 2
   - uid: 5038
     components:
     - type: Transform
@@ -21318,11 +21189,6 @@ entities:
     - type: Transform
       pos: 2.5,-90.5
       parent: 2
-  - uid: 6918
-    components:
-    - type: Transform
-      pos: 8.5,2.5
-      parent: 2
   - uid: 6922
     components:
     - type: Transform
@@ -21838,11 +21704,6 @@ entities:
     - type: Transform
       pos: 4.5,5.5
       parent: 2
-  - uid: 7710
-    components:
-    - type: Transform
-      pos: 9.5,2.5
-      parent: 2
   - uid: 7711
     components:
     - type: Transform
@@ -22298,16 +22159,6 @@ entities:
     - type: Transform
       pos: 50.5,3.5
       parent: 2
-  - uid: 9423
-    components:
-    - type: Transform
-      pos: 11.5,3.5
-      parent: 2
-  - uid: 9592
-    components:
-    - type: Transform
-      pos: 7.5,3.5
-      parent: 2
   - uid: 9654
     components:
     - type: Transform
@@ -22328,16 +22179,6 @@ entities:
     - type: Transform
       pos: 61.5,4.5
       parent: 2
-  - uid: 10016
-    components:
-    - type: Transform
-      pos: 8.5,4.5
-      parent: 2
-  - uid: 10017
-    components:
-    - type: Transform
-      pos: 8.5,3.5
-      parent: 2
   - uid: 10112
     components:
     - type: Transform
@@ -22488,6 +22329,11 @@ entities:
     - type: Transform
       pos: -48.5,-19.5
       parent: 2
+  - uid: 13132
+    components:
+    - type: Transform
+      pos: 8.5,-7.5
+      parent: 2
   - uid: 13899
     components:
     - type: Transform
@@ -22933,6 +22779,11 @@ entities:
     - type: Transform
       pos: 69.5,-2.5
       parent: 2
+  - uid: 17456
+    components:
+    - type: Transform
+      pos: 8.5,-6.5
+      parent: 2
   - uid: 17577
     components:
     - type: Transform
@@ -23083,6 +22934,11 @@ entities:
     - type: Transform
       pos: 61.5,-3.5
       parent: 2
+  - uid: 18063
+    components:
+    - type: Transform
+      pos: 8.5,-8.5
+      parent: 2
   - uid: 18124
     components:
     - type: Transform
@@ -26768,11 +26624,6 @@ entities:
     - type: Transform
       pos: -39.5,14.5
       parent: 2
-  - uid: 22170
-    components:
-    - type: Transform
-      pos: 9.5,8.5
-      parent: 2
   - uid: 22179
     components:
     - type: Transform
@@ -26798,11 +26649,6 @@ entities:
     - type: Transform
       pos: 7.5,-8.5
       parent: 2
-  - uid: 22184
-    components:
-    - type: Transform
-      pos: 11.5,7.5
-      parent: 2
   - uid: 22411
     components:
     - type: Transform
@@ -27278,6 +27124,61 @@ entities:
     - type: Transform
       pos: 5.5,-99.5
       parent: 2
+  - uid: 23044
+    components:
+    - type: Transform
+      pos: 7.5,5.5
+      parent: 2
+  - uid: 23045
+    components:
+    - type: Transform
+      pos: 11.5,5.5
+      parent: 2
+  - uid: 23046
+    components:
+    - type: Transform
+      pos: 10.5,6.5
+      parent: 2
+  - uid: 23047
+    components:
+    - type: Transform
+      pos: 10.5,4.5
+      parent: 2
+  - uid: 23048
+    components:
+    - type: Transform
+      pos: 10.5,5.5
+      parent: 2
+  - uid: 23049
+    components:
+    - type: Transform
+      pos: 9.5,4.5
+      parent: 2
+  - uid: 23050
+    components:
+    - type: Transform
+      pos: 8.5,6.5
+      parent: 2
+  - uid: 23051
+    components:
+    - type: Transform
+      pos: 8.5,5.5
+      parent: 2
+  - uid: 23052
+    components:
+    - type: Transform
+      pos: 8.5,4.5
+      parent: 2
+  - uid: 23053
+    components:
+    - type: Transform
+      pos: 9.5,5.5
+      parent: 2
+  - uid: 23054
+    components:
+    - type: Transform
+      pos: 9.5,6.5
+      parent: 2
 - proto: AtmosFixFreezerMarker
   entities:
   - uid: 7764
@@ -27409,18 +27310,6 @@ entities:
     - type: Transform
       pos: -2.5,-95.5
       parent: 2
-- proto: BannerRevolution
-  entities:
-  - uid: 3549
-    components:
-    - type: Transform
-      pos: -45.5,-56.5
-      parent: 2
-  - uid: 3714
-    components:
-    - type: Transform
-      pos: -47.5,-56.5
-      parent: 2
 - proto: BannerSyndicate
   entities:
   - uid: 8365
@@ -27927,15 +27816,10 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 11.5,14.5
       parent: 2
-  - uid: 1268
-    components:
-    - type: Transform
-      pos: 7.5,3.5
-      parent: 2
-  - uid: 1324
+  - uid: 2010
     components:
     - type: Transform
-      pos: 11.5,3.5
+      pos: 7.5,5.5
       parent: 2
   - uid: 2954
     components:
@@ -28005,6 +27889,11 @@ entities:
     - type: Transform
       pos: 11.5,-96.5
       parent: 2
+  - uid: 15216
+    components:
+    - type: Transform
+      pos: 11.5,5.5
+      parent: 2
   - uid: 18130
     components:
     - type: Transform
@@ -28462,6 +28351,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 53.5,-39.5
       parent: 2
+  - uid: 4687
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -46.5,-55.5
+      parent: 2
 - proto: BoxLatexGloves
   entities:
   - uid: 12948
@@ -28476,11 +28371,6 @@ entities:
     - type: Transform
       pos: 46.489723,11.467377
       parent: 2
-  - uid: 16919
-    components:
-    - type: Transform
-      pos: -45.50232,-50.33289
-      parent: 2
 - proto: BoxLightMixed
   entities:
   - uid: 268
@@ -28491,7 +28381,7 @@ entities:
   - uid: 3887
     components:
     - type: Transform
-      pos: -2.455987,-25.326176
+      pos: -45.4646,-50.33177
       parent: 2
   - uid: 5918
     components:
@@ -28568,6 +28458,13 @@ entities:
     - type: Transform
       pos: 26.481653,-0.31531549
       parent: 2
+- proto: BoxWarmLightbulb
+  entities:
+  - uid: 16919
+    components:
+    - type: Transform
+      pos: -2.473158,-25.305653
+      parent: 2
 - proto: BrbSign
   entities:
   - uid: 902
@@ -29820,17 +29717,17 @@ entities:
   - uid: 1581
     components:
     - type: Transform
-      pos: -6.5,-44.5
+      pos: -11.5,-39.5
       parent: 2
   - uid: 1598
     components:
     - type: Transform
-      pos: -7.5,-44.5
+      pos: -8.5,-45.5
       parent: 2
   - uid: 1604
     components:
     - type: Transform
-      pos: -8.5,-44.5
+      pos: -5.5,-38.5
       parent: 2
   - uid: 1642
     components:
@@ -29840,7 +29737,7 @@ entities:
   - uid: 1658
     components:
     - type: Transform
-      pos: -9.5,-44.5
+      pos: -8.5,-46.5
       parent: 2
   - uid: 1661
     components:
@@ -30422,6 +30319,11 @@ entities:
     - type: Transform
       pos: 4.5,1.5
       parent: 2
+  - uid: 2484
+    components:
+    - type: Transform
+      pos: -7.5,-41.5
+      parent: 2
   - uid: 2487
     components:
     - type: Transform
@@ -31092,6 +30994,16 @@ entities:
     - type: Transform
       pos: -16.5,-1.5
       parent: 2
+  - uid: 4052
+    components:
+    - type: Transform
+      pos: -5.5,-41.5
+      parent: 2
+  - uid: 4065
+    components:
+    - type: Transform
+      pos: -6.5,-41.5
+      parent: 2
   - uid: 4117
     components:
     - type: Transform
@@ -31107,6 +31019,11 @@ entities:
     - type: Transform
       pos: 3.5,-37.5
       parent: 2
+  - uid: 4196
+    components:
+    - type: Transform
+      pos: -8.5,-43.5
+      parent: 2
   - uid: 4362
     components:
     - type: Transform
@@ -34280,12 +34197,12 @@ entities:
   - uid: 11704
     components:
     - type: Transform
-      pos: -2.5,-42.5
+      pos: -8.5,-42.5
       parent: 2
   - uid: 11705
     components:
     - type: Transform
-      pos: -2.5,-43.5
+      pos: -4.5,-40.5
       parent: 2
   - uid: 11706
     components:
@@ -34310,27 +34227,17 @@ entities:
   - uid: 11711
     components:
     - type: Transform
-      pos: -2.5,-41.5
-      parent: 2
-  - uid: 11712
-    components:
-    - type: Transform
-      pos: -2.5,-40.5
-      parent: 2
-  - uid: 11713
-    components:
-    - type: Transform
-      pos: -3.5,-40.5
+      pos: -5.5,-40.5
       parent: 2
   - uid: 11714
     components:
     - type: Transform
-      pos: -4.5,-40.5
+      pos: -11.5,-40.5
       parent: 2
   - uid: 11715
     components:
     - type: Transform
-      pos: -5.5,-40.5
+      pos: -3.5,-40.5
       parent: 2
   - uid: 11718
     components:
@@ -34695,7 +34602,7 @@ entities:
   - uid: 11851
     components:
     - type: Transform
-      pos: -10.5,-40.5
+      pos: -9.5,-41.5
       parent: 2
   - uid: 11852
     components:
@@ -35737,6 +35644,11 @@ entities:
     - type: Transform
       pos: 50.5,20.5
       parent: 2
+  - uid: 15037
+    components:
+    - type: Transform
+      pos: -11.5,-38.5
+      parent: 2
   - uid: 15060
     components:
     - type: Transform
@@ -38160,12 +38072,7 @@ entities:
   - uid: 17605
     components:
     - type: Transform
-      pos: -9.5,-41.5
-      parent: 2
-  - uid: 17606
-    components:
-    - type: Transform
-      pos: -8.5,-41.5
+      pos: -2.5,-40.5
       parent: 2
   - uid: 17611
     components:
@@ -41727,6 +41634,16 @@ entities:
     - type: Transform
       pos: 9.5,-44.5
       parent: 2
+  - uid: 21448
+    components:
+    - type: Transform
+      pos: 11.5,5.5
+      parent: 2
+  - uid: 21449
+    components:
+    - type: Transform
+      pos: 7.5,5.5
+      parent: 2
   - uid: 21457
     components:
     - type: Transform
@@ -42137,6 +42054,16 @@ entities:
     - type: Transform
       pos: 26.5,27.5
       parent: 2
+  - uid: 22145
+    components:
+    - type: Transform
+      pos: 9.5,3.5
+      parent: 2
+  - uid: 22170
+    components:
+    - type: Transform
+      pos: 9.5,2.5
+      parent: 2
   - uid: 22174
     components:
     - type: Transform
@@ -42397,6 +42324,91 @@ entities:
     - type: Transform
       pos: -12.5,-28.5
       parent: 2
+  - uid: 23003
+    components:
+    - type: Transform
+      pos: -19.5,-38.5
+      parent: 2
+  - uid: 23004
+    components:
+    - type: Transform
+      pos: -18.5,-38.5
+      parent: 2
+  - uid: 23005
+    components:
+    - type: Transform
+      pos: -17.5,-38.5
+      parent: 2
+  - uid: 23006
+    components:
+    - type: Transform
+      pos: -16.5,-38.5
+      parent: 2
+  - uid: 23007
+    components:
+    - type: Transform
+      pos: -15.5,-38.5
+      parent: 2
+  - uid: 23022
+    components:
+    - type: Transform
+      pos: -1.5,-43.5
+      parent: 2
+  - uid: 23023
+    components:
+    - type: Transform
+      pos: -8.5,-44.5
+      parent: 2
+  - uid: 23025
+    components:
+    - type: Transform
+      pos: -8.5,-41.5
+      parent: 2
+  - uid: 23026
+    components:
+    - type: Transform
+      pos: -5.5,-39.5
+      parent: 2
+  - uid: 23029
+    components:
+    - type: Transform
+      pos: 11.5,6.5
+      parent: 2
+  - uid: 23030
+    components:
+    - type: Transform
+      pos: 7.5,6.5
+      parent: 2
+  - uid: 23031
+    components:
+    - type: Transform
+      pos: 7.5,4.5
+      parent: 2
+  - uid: 23032
+    components:
+    - type: Transform
+      pos: 8.5,3.5
+      parent: 2
+  - uid: 23033
+    components:
+    - type: Transform
+      pos: 10.5,3.5
+      parent: 2
+  - uid: 23034
+    components:
+    - type: Transform
+      pos: 11.5,4.5
+      parent: 2
+  - uid: 23035
+    components:
+    - type: Transform
+      pos: 10.5,4.5
+      parent: 2
+  - uid: 23038
+    components:
+    - type: Transform
+      pos: 8.5,4.5
+      parent: 2
 - proto: CableApcStack
   entities:
   - uid: 1898
@@ -53934,6 +53946,11 @@ entities:
     - type: Transform
       pos: 44.5,14.5
       parent: 2
+  - uid: 22643
+    components:
+    - type: Transform
+      pos: -10.5,-38.5
+      parent: 2
   - uid: 22715
     components:
     - type: Transform
@@ -53944,6 +53961,11 @@ entities:
     - type: Transform
       pos: -25.5,18.5
       parent: 2
+  - uid: 23002
+    components:
+    - type: Transform
+      pos: -9.5,-38.5
+      parent: 2
 - proto: CableMVStack
   entities:
   - uid: 3393
@@ -58380,6 +58402,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 48.5,-50.5
       parent: 2
+  - uid: 10926
+    components:
+    - type: Transform
+      pos: 8.5,2.5
+      parent: 2
   - uid: 10965
     components:
     - type: Transform
@@ -58494,6 +58521,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -50.5,-13.5
       parent: 2
+  - uid: 11713
+    components:
+    - type: Transform
+      pos: 10.5,2.5
+      parent: 2
   - uid: 11772
     components:
     - type: Transform
@@ -58936,6 +58968,11 @@ entities:
     - type: Transform
       pos: 16.5,-6.5
       parent: 2
+  - uid: 16061
+    components:
+    - type: Transform
+      pos: 9.5,2.5
+      parent: 2
   - uid: 16107
     components:
     - type: Transform
@@ -62353,6 +62390,13 @@ entities:
           priority: 0
           component: ClothingSpeedModifier
         title: null
+- proto: ClothingBeltChampion
+  entities:
+  - uid: 3549
+    components:
+    - type: Transform
+      pos: -46.495018,-57.327484
+      parent: 2
 - proto: ClothingBeltChefFilled
   entities:
   - uid: 3884
@@ -62504,13 +62548,6 @@ entities:
     - type: Transform
       pos: -53.45067,-27.958363
       parent: 2
-- proto: ClothingHandsTacticalMaidGloves
-  entities:
-  - uid: 4687
-    components:
-    - type: Transform
-      pos: -46.700916,-56.692795
-      parent: 2
 - proto: ClothingHeadBandBotany
   entities:
   - uid: 21440
@@ -62544,7 +62581,7 @@ entities:
   - uid: 1014
     components:
     - type: Transform
-      pos: -7.5870266,17.820057
+      pos: -7.544902,17.78299
       parent: 2
 - proto: ClothingHeadHatBeretRND
   entities:
@@ -62673,13 +62710,6 @@ entities:
     - type: Transform
       pos: 47.35316,-9.274309
       parent: 2
-- proto: ClothingHeadHatTacticalMaidHeadband
-  entities:
-  - uid: 22985
-    components:
-    - type: Transform
-      pos: -46.231934,-56.578133
-      parent: 2
 - proto: ClothingHeadHatWarden
   entities:
   - uid: 14570
@@ -62777,6 +62807,13 @@ entities:
     - type: Transform
       pos: 21.531446,-49.442505
       parent: 2
+- proto: ClothingNeckCloakBi
+  entities:
+  - uid: 22995
+    components:
+    - type: Transform
+      pos: -12.49191,15.529358
+      parent: 2
 - proto: ClothingNeckCloakEnby
   entities:
   - uid: 16221
@@ -62791,6 +62828,13 @@ entities:
     - type: Transform
       pos: 45.549652,7.560146
       parent: 2
+- proto: ClothingNeckCloakIntersex
+  entities:
+  - uid: 12387
+    components:
+    - type: Transform
+      pos: -53.479164,-55.353416
+      parent: 2
 - proto: ClothingNeckCloakLesbian
   entities:
   - uid: 4815
@@ -63030,13 +63074,6 @@ entities:
     - type: Transform
       pos: 38.429108,-59.892277
       parent: 2
-- proto: ClothingUniformJumpskirtTacticalMaid
-  entities:
-  - uid: 22986
-    components:
-    - type: Transform
-      pos: -46.49248,-56.338383
-      parent: 2
 - proto: ClothingUniformJumpskirtYellowTurtleneckDress
   entities:
   - uid: 13909
@@ -64231,6 +64268,11 @@ entities:
     - type: Transform
       pos: -13.5,-95.5
       parent: 2
+  - uid: 10747
+    components:
+    - type: Transform
+      pos: 3.5,24.5
+      parent: 2
   - uid: 12753
     components:
     - type: Transform
@@ -64271,11 +64313,6 @@ entities:
     - type: Transform
       pos: 9.5,20.5
       parent: 2
-  - uid: 18063
-    components:
-    - type: Transform
-      pos: 5.5,24.5
-      parent: 2
   - uid: 18066
     components:
     - type: Transform
@@ -64572,13 +64609,6 @@ entities:
     - type: Transform
       pos: 47.5,-56.5
       parent: 2
-- proto: CrateServiceHolidayLights
-  entities:
-  - uid: 8448
-    components:
-    - type: Transform
-      pos: 3.5,18.5
-      parent: 2
 - proto: CrateServiceJanitorialSupplies
   entities:
   - uid: 4506
@@ -66744,12 +66774,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 28.5,6.5
       parent: 2
-  - uid: 4196
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -9.5,-41.5
-      parent: 2
   - uid: 4226
     components:
     - type: Transform
@@ -70165,6 +70189,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -27.5,-38.5
       parent: 2
+  - uid: 23024
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-41.5
+      parent: 2
 - proto: DisposalRouter
   entities:
   - uid: 384
@@ -71110,15 +71140,15 @@ entities:
     - type: Transform
       pos: -15.5,-46.5
       parent: 2
-  - uid: 9647
+  - uid: 9969
     components:
     - type: Transform
-      pos: -6.5,17.5
+      pos: -23.5,-53.5
       parent: 2
-  - uid: 9969
+  - uid: 10171
     components:
     - type: Transform
-      pos: -23.5,-53.5
+      pos: -8.5,19.5
       parent: 2
   - uid: 12175
     components:
@@ -71376,6 +71406,13 @@ entities:
     - type: Transform
       pos: 31.741688,-35.19893
       parent: 2
+- proto: DrinkManhattanGlass
+  entities:
+  - uid: 23016
+    components:
+    - type: Transform
+      pos: -7.242668,17.584934
+      parent: 2
 - proto: DrinkMilkCarton
   entities:
   - uid: 3244
@@ -71470,7 +71507,7 @@ entities:
   - uid: 20412
     components:
     - type: Transform
-      pos: -7.6339245,17.767937
+      pos: -6.7736864,17.657902
       parent: 2
 - proto: DrinkShotGlass
   entities:
@@ -71549,7 +71586,7 @@ entities:
   - uid: 20407
     components:
     - type: Transform
-      pos: -7.654758,17.79921
+      pos: -6.961279,17.855957
       parent: 2
 - proto: DrinkVodkaBottleFull
   entities:
@@ -71582,7 +71619,7 @@ entities:
   - uid: 20411
     components:
     - type: Transform
-      pos: -7.3526745,17.8826
+      pos: -6.5131397,17.855957
       parent: 2
 - proto: ElectricGuitarInstrument
   entities:
@@ -71599,11 +71636,15 @@ entities:
       rot: 3.141592653589793 rad
       pos: 12.5,-44.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 950
     components:
     - type: Transform
       pos: 2.5,20.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 1154
     components:
     - type: Transform
@@ -71626,6 +71667,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 23.5,-8.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 4936
     components:
     - type: Transform
@@ -71656,16 +71699,22 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -30.5,-10.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 6481
     components:
     - type: Transform
       pos: 24.5,22.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 6536
     components:
     - type: Transform
       pos: 20.5,22.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 6744
     components:
     - type: Transform
@@ -71687,17 +71736,23 @@ entities:
     - type: Transform
       pos: 12.5,-16.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 7879
     components:
     - type: Transform
       pos: 12.5,28.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 7880
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 2.5,22.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 8962
     components:
     - type: Transform
@@ -71710,18 +71765,30 @@ entities:
     - type: Transform
       pos: 26.5,3.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
+  - uid: 10056
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-2.5
+      parent: 2
   - uid: 11124
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 33.5,-1.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 12129
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 17.5,25.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 12379
     components:
     - type: Transform
@@ -71814,14 +71881,6 @@ entities:
       parent: 2
     - type: Battery
       startingCharge: 30000
-  - uid: 16701
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 11.5,-27.5
-      parent: 2
-    - type: Battery
-      startingCharge: 30000
   - uid: 16702
     components:
     - type: Transform
@@ -71928,6 +71987,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -24.5,-35.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 16751
     components:
     - type: Transform
@@ -72024,163 +72085,211 @@ entities:
     - type: Transform
       pos: 29.5,8.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 21380
     components:
     - type: Transform
       pos: 17.5,7.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 21381
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 11.5,10.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 21396
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 5.5,-19.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 21397
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,-20.5
       parent: 2
-  - uid: 21449
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 10.5,-3.5
-      parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 21844
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 27.5,24.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 21845
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 6.5,22.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 21954
     components:
     - type: Transform
       pos: 6.5,20.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 22142
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 10.5,15.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 22193
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -31.5,-29.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 22194
     components:
     - type: Transform
       pos: -38.5,-32.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 22195
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -36.5,-27.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 22196
     components:
     - type: Transform
       pos: -41.5,-27.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 22197
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -41.5,-32.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 22198
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -49.5,-32.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 22199
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -47.5,-40.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 22200
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -48.5,-35.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 22201
     components:
     - type: Transform
       pos: -46.5,-43.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 22202
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -31.5,-37.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 22203
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -39.5,-38.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 22204
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -45.5,-36.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 22205
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -37.5,-24.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 22206
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -42.5,-22.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 22207
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -50.5,-23.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 22208
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -22.5,-25.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 22209
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -37.5,-15.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
   - uid: 22288
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -8.5,-49.5
       parent: 2
+    - type: Battery
+      startingCharge: 30000
 - proto: EmergencyMedipen
   entities:
   - uid: 9502
@@ -75748,7 +75857,7 @@ entities:
   - uid: 9642
     components:
     - type: Transform
-      pos: -28.571066,-7.4939437
+      pos: -28.54685,-7.671031
       parent: 2
 - proto: FoodBoxPizzaFilled
   entities:
@@ -76158,10 +76267,10 @@ entities:
       parent: 2
 - proto: GasOutletInjector
   entities:
-  - uid: 2010
+  - uid: 501
     components:
     - type: Transform
-      pos: 4.5,4.5
+      pos: 8.5,4.5
       parent: 2
   - uid: 2012
     components:
@@ -76208,10 +76317,10 @@ entities:
     - type: Transform
       pos: 0.5,4.5
       parent: 2
-  - uid: 10015
+  - uid: 8448
     components:
     - type: Transform
-      pos: 8.5,2.5
+      pos: 2.5,4.5
       parent: 2
 - proto: GasPassiveVent
   entities:
@@ -76245,11 +76354,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 0.5,6.5
       parent: 2
-  - uid: 2009
-    components:
-    - type: Transform
-      pos: 2.5,4.5
-      parent: 2
   - uid: 2562
     components:
     - type: Transform
@@ -76276,10 +76380,10 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
-  - uid: 9527
+  - uid: 6918
     components:
     - type: Transform
-      pos: 10.5,2.5
+      pos: 4.5,4.5
       parent: 2
   - uid: 10809
     components:
@@ -76336,6 +76440,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -52.5,-15.5
       parent: 2
+  - uid: 18174
+    components:
+    - type: Transform
+      pos: 10.5,4.5
+      parent: 2
 - proto: GasPipeBend
   entities:
   - uid: 672
@@ -78005,6 +78114,11 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 303
+    components:
+    - type: Transform
+      pos: 8.5,3.5
+      parent: 2
   - uid: 317
     components:
     - type: Transform
@@ -78034,6 +78148,11 @@ entities:
     - type: Transform
       pos: 6.5,-5.5
       parent: 2
+  - uid: 461
+    components:
+    - type: Transform
+      pos: 10.5,3.5
+      parent: 2
   - uid: 528
     components:
     - type: Transform
@@ -78042,6 +78161,11 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 539
+    components:
+    - type: Transform
+      pos: 10.5,2.5
+      parent: 2
   - uid: 616
     components:
     - type: Transform
@@ -78271,6 +78395,11 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1212FF'
+  - uid: 1583
+    components:
+    - type: Transform
+      pos: 8.5,2.5
+      parent: 2
   - uid: 1596
     components:
     - type: Transform
@@ -92957,11 +93086,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 1614
-    components:
-    - type: Transform
-      pos: 2.5,0.5
-      parent: 2
   - uid: 1620
     components:
     - type: Transform
@@ -93022,6 +93146,17 @@ entities:
     - type: Transform
       pos: 10.5,0.5
       parent: 2
+  - uid: 9527
+    components:
+    - type: Transform
+      pos: 4.5,0.5
+      parent: 2
+  - uid: 9592
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,0.5
+      parent: 2
   - uid: 10122
     components:
     - type: Transform
@@ -93037,12 +93172,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 15216
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,0.5
-      parent: 2
 - proto: GasThermoMachineFreezer
   entities:
   - uid: 1626
@@ -96806,11 +96935,6 @@ entities:
     - type: Transform
       pos: -14.5,-19.5
       parent: 2
-  - uid: 501
-    components:
-    - type: Transform
-      pos: 10.5,5.5
-      parent: 2
   - uid: 601
     components:
     - type: Transform
@@ -97211,6 +97335,11 @@ entities:
     - type: Transform
       pos: 46.5,24.5
       parent: 2
+  - uid: 2009
+    components:
+    - type: Transform
+      pos: 7.5,4.5
+      parent: 2
   - uid: 2062
     components:
     - type: Transform
@@ -98312,11 +98441,6 @@ entities:
     - type: Transform
       pos: -42.5,-26.5
       parent: 2
-  - uid: 5549
-    components:
-    - type: Transform
-      pos: 7.5,4.5
-      parent: 2
   - uid: 5558
     components:
     - type: Transform
@@ -99383,6 +99507,16 @@ entities:
     - type: Transform
       pos: -50.5,6.5
       parent: 2
+  - uid: 9682
+    components:
+    - type: Transform
+      pos: 8.5,3.5
+      parent: 2
+  - uid: 9684
+    components:
+    - type: Transform
+      pos: 11.5,4.5
+      parent: 2
   - uid: 9813
     components:
     - type: Transform
@@ -99413,6 +99547,16 @@ entities:
     - type: Transform
       pos: 57.5,-39.5
       parent: 2
+  - uid: 10015
+    components:
+    - type: Transform
+      pos: 11.5,6.5
+      parent: 2
+  - uid: 10016
+    components:
+    - type: Transform
+      pos: 7.5,6.5
+      parent: 2
   - uid: 10020
     components:
     - type: Transform
@@ -99719,11 +99863,6 @@ entities:
     - type: Transform
       pos: -55.5,-55.5
       parent: 2
-  - uid: 10747
-    components:
-    - type: Transform
-      pos: 7.5,2.5
-      parent: 2
   - uid: 10753
     components:
     - type: Transform
@@ -99769,11 +99908,6 @@ entities:
     - type: Transform
       pos: 59.5,-43.5
       parent: 2
-  - uid: 10818
-    components:
-    - type: Transform
-      pos: 9.5,5.5
-      parent: 2
   - uid: 10832
     components:
     - type: Transform
@@ -99874,16 +100008,6 @@ entities:
     - type: Transform
       pos: 13.5,-23.5
       parent: 2
-  - uid: 10926
-    components:
-    - type: Transform
-      pos: 11.5,4.5
-      parent: 2
-  - uid: 10942
-    components:
-    - type: Transform
-      pos: 11.5,2.5
-      parent: 2
   - uid: 10958
     components:
     - type: Transform
@@ -100237,6 +100361,11 @@ entities:
     - type: Transform
       pos: 13.5,7.5
       parent: 2
+  - uid: 12555
+    components:
+    - type: Transform
+      pos: 10.5,3.5
+      parent: 2
   - uid: 12562
     components:
     - type: Transform
@@ -100272,11 +100401,6 @@ entities:
     - type: Transform
       pos: -23.5,-5.5
       parent: 2
-  - uid: 12672
-    components:
-    - type: Transform
-      pos: 8.5,5.5
-      parent: 2
   - uid: 12687
     components:
     - type: Transform
@@ -100562,7 +100686,7 @@ entities:
   - uid: 13683
     components:
     - type: Transform
-      pos: 5.5,-5.5
+      pos: 9.5,3.5
       parent: 2
   - uid: 13737
     components:
@@ -107075,9 +107199,9 @@ entities:
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
-        1268:
+        15216:
         - Pressed: Toggle
-        1324:
+        2010:
         - Pressed: Toggle
 - proto: LockableButtonBar
   entities:
@@ -107731,15 +107855,15 @@ entities:
         - Pressed: Toggle
         11838:
         - Pressed: Toggle
-        13992:
+        4644:
         - Pressed: Toggle
-        13795:
+        527:
         - Pressed: Toggle
         7944:
         - Pressed: Toggle
         17722:
         - Pressed: Toggle
-        20763:
+        1053:
         - Pressed: Toggle
 - proto: LockerAtmosphericsFilledHardsuit
   entities:
@@ -108757,6 +108881,13 @@ entities:
     - type: Transform
       pos: -19.5,18.5
       parent: 2
+- proto: LuxuryPen
+  entities:
+  - uid: 21411
+    components:
+    - type: Transform
+      pos: -7.5553236,17.54324
+      parent: 2
 - proto: MachineAnomalyGenerator
   entities:
   - uid: 4278
@@ -109087,11 +109218,6 @@ entities:
     - type: Transform
       pos: -53.5,-49.5
       parent: 2
-  - uid: 4429
-    components:
-    - type: Transform
-      pos: -53.5,-55.5
-      parent: 2
   - uid: 4722
     components:
     - type: Transform
@@ -109531,6 +109657,16 @@ entities:
     - type: Transform
       pos: -39.5,-40.5
       parent: 2
+  - uid: 23020
+    components:
+    - type: Transform
+      pos: 25.5,-9.5
+      parent: 2
+  - uid: 23021
+    components:
+    - type: Transform
+      pos: -53.5,-49.5
+      parent: 2
 - proto: MaintenanceWeaponSpawner
   entities:
   - uid: 2241
@@ -109926,10 +110062,10 @@ entities:
     - type: Transform
       pos: -2.5,-26.5
       parent: 2
-  - uid: 15747
+  - uid: 22985
     components:
     - type: Transform
-      pos: -47.5,-52.5
+      pos: -47.5,-54.5
       parent: 2
 - proto: MopBucketFull
   entities:
@@ -109945,11 +110081,6 @@ entities:
     - type: Transform
       pos: -2.5393615,-26.524923
       parent: 2
-  - uid: 16934
-    components:
-    - type: Transform
-      pos: -47.522087,-52.53586
-      parent: 2
   - uid: 20336
     components:
     - type: Transform
@@ -109960,6 +110091,11 @@ entities:
     - type: Transform
       pos: 28.489487,2.5330553
       parent: 2
+  - uid: 22996
+    components:
+    - type: Transform
+      pos: -47.5339,-54.50066
+      parent: 2
 - proto: Morgue
   entities:
   - uid: 442
@@ -110609,11 +110745,26 @@ entities:
     - type: Transform
       pos: 13.602551,-51.490356
       parent: 2
+  - uid: 13005
+    components:
+    - type: Transform
+      pos: -45.60556,-57.521103
+      parent: 2
+  - uid: 22675
+    components:
+    - type: Transform
+      pos: -45.803577,-57.29178
+      parent: 2
   - uid: 22784
     components:
     - type: Transform
       pos: -15.608757,-40.42956
       parent: 2
+  - uid: 22986
+    components:
+    - type: Transform
+      pos: -45.21995,-57.364746
+      parent: 2
 - proto: PaperBin10
   entities:
   - uid: 3040
@@ -110791,12 +110942,12 @@ entities:
   - uid: 19939
     components:
     - type: Transform
-      pos: 15.414982,25.616112
+      pos: 14.4848795,25.54261
       parent: 2
   - uid: 20133
     components:
     - type: Transform
-      pos: 15.560888,25.595263
+      pos: 14.495301,25.553032
       parent: 2
   - uid: 21618
     components:
@@ -111627,6 +111778,11 @@ entities:
     - type: Transform
       pos: 54.5,-22.5
       parent: 2
+  - uid: 10104
+    components:
+    - type: Transform
+      pos: 7.5,-21.5
+      parent: 2
   - uid: 10672
     components:
     - type: Transform
@@ -111717,6 +111873,16 @@ entities:
     - type: Transform
       pos: -13.5,-40.5
       parent: 2
+  - uid: 23042
+    components:
+    - type: Transform
+      pos: 33.5,-7.5
+      parent: 2
+  - uid: 23043
+    components:
+    - type: Transform
+      pos: 31.5,14.5
+      parent: 2
 - proto: PottedPlantRandomPlastic
   entities:
   - uid: 743
@@ -111906,12 +112072,6 @@ entities:
       parent: 2
 - proto: PoweredDimSmallLight
   entities:
-  - uid: 791
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 42.5,12.5
-      parent: 2
   - uid: 973
     components:
     - type: Transform
@@ -111936,18 +112096,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -29.5,16.5
       parent: 2
-  - uid: 2205
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -30.5,-19.5
-      parent: 2
-  - uid: 6121
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -10.5,24.5
-      parent: 2
   - uid: 6132
     components:
     - type: Transform
@@ -111960,11 +112108,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 37.5,-56.5
       parent: 2
-  - uid: 6665
-    components:
-    - type: Transform
-      pos: 0.5,-36.5
-      parent: 2
   - uid: 7058
     components:
     - type: Transform
@@ -112035,35 +112178,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 42.5,-52.5
       parent: 2
-  - uid: 12194
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -7.5,-42.5
-      parent: 2
-  - uid: 12386
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -11.5,-4.5
-      parent: 2
-  - uid: 12387
-    components:
-    - type: Transform
-      pos: -11.5,-1.5
-      parent: 2
-  - uid: 12407
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.5,13.5
-      parent: 2
-  - uid: 13005
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -11.5,0.5
-      parent: 2
   - uid: 13016
     components:
     - type: Transform
@@ -112074,57 +112188,18 @@ entities:
     - type: Transform
       pos: 15.5,-8.5
       parent: 2
-  - uid: 13795
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,-39.5
-      parent: 2
-    - type: PoweredLight
-      on: False
-  - uid: 13992
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,-39.5
-      parent: 2
-    - type: PoweredLight
-      on: False
   - uid: 14407
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 44.5,-41.5
       parent: 2
-  - uid: 14412
-    components:
-    - type: Transform
-      pos: 31.5,-33.5
-      parent: 2
-  - uid: 14774
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 31.5,-35.5
-      parent: 2
   - uid: 14854
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 46.5,-41.5
       parent: 2
-  - uid: 17159
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 25.5,-17.5
-      parent: 2
-  - uid: 17160
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 46.5,-27.5
-      parent: 2
   - uid: 17162
     components:
     - type: Transform
@@ -112148,12 +112223,6 @@ entities:
     - type: Transform
       pos: 23.5,-33.5
       parent: 2
-  - uid: 18174
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -29.5,22.5
-      parent: 2
   - uid: 18962
     components:
     - type: Transform
@@ -112171,42 +112240,40 @@ entities:
     - type: Transform
       pos: 56.5,-52.5
       parent: 2
-  - uid: 19601
+  - uid: 21443
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 40.5,12.5
+      pos: 1.5,-39.5
       parent: 2
-  - uid: 20123
+  - uid: 21786
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -12.5,-37.5
+      rot: 3.141592653589793 rad
+      pos: 33.5,24.5
       parent: 2
-  - uid: 20763
+  - uid: 21925
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-38.5
+      rot: -1.5707963267948966 rad
+      pos: 20.5,13.5
       parent: 2
-    - type: PoweredLight
-      on: False
-  - uid: 21443
+  - uid: 23010
     components:
     - type: Transform
-      pos: 1.5,-39.5
+      rot: -1.5707963267948966 rad
+      pos: -32.5,-8.5
       parent: 2
-  - uid: 21786
+  - uid: 23011
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 33.5,24.5
+      pos: -31.5,-16.5
       parent: 2
-  - uid: 21925
+  - uid: 23012
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 20.5,13.5
+      rot: 3.141592653589793 rad
+      pos: -20.5,-16.5
       parent: 2
 - proto: Poweredlight
   entities:
@@ -112274,35 +112341,17 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -38.5,-1.5
       parent: 2
-  - uid: 3058
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 21.5,-7.5
-      parent: 2
   - uid: 3604
     components:
     - type: Transform
       pos: -1.5,-55.5
       parent: 2
-  - uid: 3665
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 38.5,-11.5
-      parent: 2
   - uid: 3673
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 22.5,-36.5
       parent: 2
-  - uid: 3708
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 34.5,-11.5
-      parent: 2
   - uid: 3726
     components:
     - type: Transform
@@ -112380,11 +112429,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -6.5,-61.5
       parent: 2
-  - uid: 4670
-    components:
-    - type: Transform
-      pos: 21.5,-39.5
-      parent: 2
   - uid: 4982
     components:
     - type: Transform
@@ -112424,6 +112468,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -27.5,-48.5
       parent: 2
+  - uid: 6351
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-3.5
+      parent: 2
   - uid: 6367
     components:
     - type: Transform
@@ -112447,6 +112497,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -15.5,-31.5
       parent: 2
+  - uid: 6665
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -10.5,10.5
+      parent: 2
   - uid: 7052
     components:
     - type: Transform
@@ -112511,12 +112567,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 21.5,-16.5
       parent: 2
-  - uid: 8863
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,13.5
-      parent: 2
   - uid: 9123
     components:
     - type: Transform
@@ -112529,6 +112579,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -22.5,-5.5
       parent: 2
+  - uid: 9647
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -10.5,16.5
+      parent: 2
   - uid: 10073
     components:
     - type: Transform
@@ -112565,6 +112621,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 27.5,-8.5
       parent: 2
+  - uid: 10942
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-4.5
+      parent: 2
   - uid: 11053
     components:
     - type: Transform
@@ -112661,18 +112723,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 34.5,-17.5
       parent: 2
-  - uid: 11613
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 17.5,-48.5
-      parent: 2
-  - uid: 11614
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 21.5,-48.5
-      parent: 2
   - uid: 11616
     components:
     - type: Transform
@@ -112720,12 +112770,6 @@ entities:
     - type: Transform
       pos: -17.5,-50.5
       parent: 2
-  - uid: 11658
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -19.5,-30.5
-      parent: 2
   - uid: 11716
     components:
     - type: Transform
@@ -112807,12 +112851,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -5.5,-4.5
       parent: 2
-  - uid: 11964
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 33.5,10.5
-      parent: 2
   - uid: 12078
     components:
     - type: Transform
@@ -112859,12 +112897,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -1.5,-15.5
       parent: 2
-  - uid: 13362
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 20.5,-11.5
-      parent: 2
   - uid: 13743
     components:
     - type: Transform
@@ -112900,12 +112932,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 30.5,-38.5
       parent: 2
-  - uid: 14401
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 30.5,-28.5
-      parent: 2
   - uid: 14434
     components:
     - type: Transform
@@ -112923,12 +112949,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 35.5,-30.5
       parent: 2
-  - uid: 15037
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-45.5
-      parent: 2
   - uid: 15230
     components:
     - type: Transform
@@ -112953,12 +112973,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 40.5,-22.5
       parent: 2
-  - uid: 16061
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 10.5,-2.5
-      parent: 2
   - uid: 16478
     components:
     - type: Transform
@@ -112999,6 +113013,18 @@ entities:
     - type: Transform
       pos: -54.5,-11.5
       parent: 2
+  - uid: 16651
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 19.5,-11.5
+      parent: 2
+  - uid: 16935
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,13.5
+      parent: 2
   - uid: 16956
     components:
     - type: Transform
@@ -113049,6 +113075,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 8.5,22.5
       parent: 2
+  - uid: 17535
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-27.5
+      parent: 2
   - uid: 17593
     components:
     - type: Transform
@@ -113135,11 +113167,17 @@ entities:
     - type: Transform
       pos: 8.5,-87.5
       parent: 2
-  - uid: 20501
+  - uid: 20123
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 19.5,-0.5
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-23.5
+      parent: 2
+  - uid: 20602
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -55.5,-22.5
       parent: 2
   - uid: 21137
     components:
@@ -113164,34 +113202,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -26.5,-32.5
       parent: 2
-  - uid: 21263
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -30.5,-32.5
-      parent: 2
-  - uid: 21264
-    components:
-    - type: Transform
-      pos: -30.5,-27.5
-      parent: 2
   - uid: 21265
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -26.5,-24.5
       parent: 2
-  - uid: 21266
-    components:
-    - type: Transform
-      pos: -36.5,-26.5
-      parent: 2
-  - uid: 21267
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -36.5,-33.5
-      parent: 2
   - uid: 21268
     components:
     - type: Transform
@@ -113209,17 +113225,10 @@ entities:
     - type: Transform
       pos: -35.5,-22.5
       parent: 2
-  - uid: 21278
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -39.5,-28.5
-      parent: 2
   - uid: 21279
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -39.5,-31.5
+      pos: -9.5,-30.5
       parent: 2
   - uid: 21280
     components:
@@ -113236,13 +113245,8 @@ entities:
   - uid: 21283
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -45.5,-32.5
-      parent: 2
-  - uid: 21284
-    components:
-    - type: Transform
-      pos: -45.5,-27.5
+      rot: -1.5707963267948966 rad
+      pos: -6.5,-33.5
       parent: 2
   - uid: 21285
     components:
@@ -113261,12 +113265,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -41.5,-38.5
       parent: 2
-  - uid: 21290
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -45.5,-23.5
-      parent: 2
   - uid: 21291
     components:
     - type: Transform
@@ -113309,12 +113307,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -32.5,-37.5
       parent: 2
-  - uid: 21306
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -42.5,-24.5
-      parent: 2
   - uid: 21319
     components:
     - type: Transform
@@ -113326,12 +113318,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 11.5,22.5
       parent: 2
-  - uid: 22006
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 22.5,2.5
-      parent: 2
   - uid: 22123
     components:
     - type: Transform
@@ -113367,11 +113353,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -26.5,-6.5
       parent: 2
-  - uid: 22643
-    components:
-    - type: Transform
-      pos: 42.5,15.5
-      parent: 2
   - uid: 22649
     components:
     - type: Transform
@@ -113493,6 +113474,42 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 87.5,-25.5
       parent: 2
+  - uid: 23008
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-47.5
+      parent: 2
+  - uid: 23009
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -53.5,-31.5
+      parent: 2
+  - uid: 23018
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -12.5,8.5
+      parent: 2
+  - uid: 23019
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 21.5,-8.5
+      parent: 2
+  - uid: 23028
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -16.5,2.5
+      parent: 2
+  - uid: 23055
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-0.5
+      parent: 2
 - proto: PoweredlightEmpty
   entities:
   - uid: 21609
@@ -113515,12 +113532,81 @@ entities:
       rot: 3.141592653589793 rad
       pos: -29.5,10.5
       parent: 2
+  - uid: 8859
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 19.5,-0.5
+      parent: 2
+  - uid: 9119
+    components:
+    - type: Transform
+      pos: -30.5,-27.5
+      parent: 2
+  - uid: 9956
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -30.5,-32.5
+      parent: 2
+  - uid: 9970
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -36.5,-33.5
+      parent: 2
+  - uid: 11222
+    components:
+    - type: Transform
+      pos: -36.5,-26.5
+      parent: 2
+  - uid: 11442
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -45.5,-32.5
+      parent: 2
+  - uid: 11445
+    components:
+    - type: Transform
+      pos: -45.5,-27.5
+      parent: 2
+  - uid: 11452
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -39.5,-28.5
+      parent: 2
   - uid: 11555
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 39.5,-28.5
       parent: 2
+  - uid: 11585
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -39.5,-31.5
+      parent: 2
+  - uid: 11586
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -42.5,-24.5
+      parent: 2
+  - uid: 11613
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -45.5,-23.5
+      parent: 2
+  - uid: 11614
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,2.5
+      parent: 2
 - proto: PoweredLightPostSmall
   entities:
   - uid: 17113
@@ -113685,12 +113771,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 59.5,-56.5
       parent: 2
-  - uid: 262
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 15.5,5.5
-      parent: 2
   - uid: 391
     components:
     - type: Transform
@@ -113703,17 +113783,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -43.5,-53.5
       parent: 2
-  - uid: 527
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-43.5
-      parent: 2
-  - uid: 1053
+  - uid: 2205
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 34.5,14.5
+      pos: 40.5,12.5
       parent: 2
   - uid: 2310
     components:
@@ -113738,12 +113812,29 @@ entities:
       rot: 3.141592653589793 rad
       pos: -40.5,-57.5
       parent: 2
+  - uid: 3190
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -30.5,-19.5
+      parent: 2
   - uid: 3362
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 44.5,1.5
       parent: 2
+  - uid: 3665
+    components:
+    - type: Transform
+      pos: 31.5,-33.5
+      parent: 2
+  - uid: 3708
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 25.5,-17.5
+      parent: 2
   - uid: 3718
     components:
     - type: Transform
@@ -113758,45 +113849,16 @@ entities:
     - type: PointLight
       softness: 1.5
       energy: 0.5
-  - uid: 4010
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -37.5,-55.5
-      parent: 2
   - uid: 4508
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 5.5,-57.5
       parent: 2
-  - uid: 4585
-    components:
-    - type: Transform
-      pos: 18.5,8.5
-      parent: 2
-  - uid: 4643
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-33.5
-      parent: 2
-  - uid: 4644
-    components:
-    - type: Transform
-      pos: 6.5,-38.5
-      parent: 2
-  - uid: 4688
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-33.5
-      parent: 2
-  - uid: 4693
+  - uid: 4670
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 22.5,-43.5
+      pos: 0.5,-36.5
       parent: 2
   - uid: 4816
     components:
@@ -113810,18 +113872,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -18.5,29.5
       parent: 2
-  - uid: 4825
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -29.5,-52.5
-      parent: 2
-  - uid: 4826
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -29.5,-55.5
-      parent: 2
   - uid: 4975
     components:
     - type: Transform
@@ -113879,29 +113929,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 14.5,-63.5
       parent: 2
-  - uid: 6943
-    components:
-    - type: Transform
-      pos: -19.5,20.5
-      parent: 2
-  - uid: 7335
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -20.5,11.5
-      parent: 2
   - uid: 7794
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 29.5,-14.5
       parent: 2
-  - uid: 7923
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -54.5,-23.5
-      parent: 2
   - uid: 7939
     components:
     - type: Transform
@@ -113933,14 +113966,14 @@ entities:
   - uid: 8417
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-53.5
+      rot: -1.5707963267948966 rad
+      pos: 34.5,11.5
       parent: 2
   - uid: 8422
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 4.5,-53.5
+      pos: 43.5,14.5
       parent: 2
   - uid: 8427
     components:
@@ -113948,24 +113981,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 8.5,-36.5
       parent: 2
-  - uid: 8859
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 36.5,0.5
-      parent: 2
   - uid: 8862
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 36.5,7.5
       parent: 2
-  - uid: 9119
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 43.5,8.5
-      parent: 2
   - uid: 9137
     components:
     - type: Transform
@@ -114001,22 +114022,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -22.5,-52.5
       parent: 2
-  - uid: 9956
-    components:
-    - type: Transform
-      pos: -10.5,-50.5
-      parent: 2
-  - uid: 9970
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -26.5,-54.5
-      parent: 2
-  - uid: 10171
+  - uid: 10018
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -33.5,10.5
+      rot: 3.141592653589793 rad
+      pos: -29.5,22.5
       parent: 2
   - uid: 10383
     components:
@@ -114046,11 +114056,6 @@ entities:
     - type: Transform
       pos: -4.5,-73.5
       parent: 2
-  - uid: 11222
-    components:
-    - type: Transform
-      pos: 24.5,8.5
-      parent: 2
   - uid: 11234
     components:
     - type: Transform
@@ -114069,17 +114074,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -46.5,-57.5
       parent: 2
-  - uid: 11442
-    components:
-    - type: Transform
-      pos: 27.5,-33.5
-      parent: 2
-  - uid: 11445
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 27.5,-35.5
-      parent: 2
   - uid: 11473
     components:
     - type: Transform
@@ -114110,18 +114104,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 43.5,-11.5
       parent: 2
-  - uid: 11585
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 35.5,-3.5
-      parent: 2
-  - uid: 11586
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 39.5,-3.5
-      parent: 2
   - uid: 11640
     components:
     - type: Transform
@@ -114150,17 +114132,10 @@ entities:
       rot: 3.141592653589793 rad
       pos: -3.5,-32.5
       parent: 2
-  - uid: 11790
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-26.5
-      parent: 2
-  - uid: 11791
+  - uid: 11658
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -9.5,-25.5
+      pos: 24.5,8.5
       parent: 2
   - uid: 11837
     components:
@@ -114208,17 +114183,10 @@ entities:
     - type: Transform
       pos: -13.5,-40.5
       parent: 2
-  - uid: 12310
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,-24.5
-      parent: 2
-  - uid: 12631
+  - uid: 12672
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -41.5,-53.5
+      pos: 5.5,-6.5
       parent: 2
   - uid: 12716
     components:
@@ -114276,17 +114244,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -6.5,-78.5
       parent: 2
-  - uid: 13308
-    components:
-    - type: Transform
-      pos: -53.5,-21.5
-      parent: 2
-  - uid: 13398
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,-45.5
-      parent: 2
   - uid: 13399
     components:
     - type: Transform
@@ -114311,12 +114268,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -11.5,-27.5
       parent: 2
-  - uid: 13863
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 24.5,-14.5
-      parent: 2
   - uid: 13896
     components:
     - type: Transform
@@ -114395,6 +114346,12 @@ entities:
       parent: 2
     - type: PointLight
       energy: 0.5
+  - uid: 15747
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -11.5,-4.5
+      parent: 2
   - uid: 15755
     components:
     - type: Transform
@@ -114429,22 +114386,34 @@ entities:
     - type: Transform
       pos: -58.5,-12.5
       parent: 2
-  - uid: 16649
+  - uid: 16701
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 15.5,-40.5
+      pos: 15.5,5.5
       parent: 2
-  - uid: 16651
+  - uid: 16709
     components:
     - type: Transform
-      pos: 15.5,-35.5
+      rot: 3.141592653589793 rad
+      pos: 53.5,-26.5
       parent: 2
-  - uid: 16709
+  - uid: 16934
+    components:
+    - type: Transform
+      pos: -11.5,-1.5
+      parent: 2
+  - uid: 16939
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 16.5,9.5
+      parent: 2
+  - uid: 17160
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 53.5,-26.5
+      pos: 31.5,-35.5
       parent: 2
   - uid: 17200
     components:
@@ -114482,40 +114451,16 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 2.5,5.5
       parent: 2
-  - uid: 17471
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -9.5,-33.5
-      parent: 2
-  - uid: 17496
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,17.5
-      parent: 2
   - uid: 17722
     components:
     - type: Transform
       pos: -10.5,-36.5
       parent: 2
-  - uid: 17723
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,-30.5
-      parent: 2
   - uid: 17949
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-45.5
-      parent: 2
-  - uid: 18906
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 16.5,11.5
+      rot: 1.5707963267948966 rad
+      pos: 27.5,12.5
       parent: 2
   - uid: 19284
     components:
@@ -114529,17 +114474,17 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 48.5,-61.5
       parent: 2
-  - uid: 20220
+  - uid: 19601
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -4.5,-68.5
+      pos: 28.5,10.5
       parent: 2
-  - uid: 20602
+  - uid: 20220
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -9.5,-30.5
+      rot: 3.141592653589793 rad
+      pos: -4.5,-68.5
       parent: 2
   - uid: 20624
     components:
@@ -114551,6 +114496,12 @@ entities:
     - type: Transform
       pos: -41.5,-48.5
       parent: 2
+  - uid: 21263
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 25.5,-14.5
+      parent: 2
   - uid: 21272
     components:
     - type: Transform
@@ -114580,18 +114531,6 @@ entities:
     - type: Transform
       pos: -51.5,-29.5
       parent: 2
-  - uid: 21299
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -47.5,-22.5
-      parent: 2
-  - uid: 21301
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -50.5,-23.5
-      parent: 2
   - uid: 21307
     components:
     - type: Transform
@@ -114603,17 +114542,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -54.5,-53.5
       parent: 2
-  - uid: 21410
-    components:
-    - type: Transform
-      pos: 6.5,-44.5
-      parent: 2
-  - uid: 21411
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 6.5,-42.5
-      parent: 2
   - uid: 21633
     components:
     - type: Transform
@@ -114626,18 +114554,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 16.5,29.5
       parent: 2
-  - uid: 21763
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 27.5,4.5
-      parent: 2
-  - uid: 21821
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 27.5,12.5
-      parent: 2
   - uid: 21836
     components:
     - type: Transform
@@ -114650,6 +114566,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 24.5,-4.5
       parent: 2
+  - uid: 22334
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -63.5,-59.5
+      parent: 2
   - uid: 22374
     components:
     - type: Transform
@@ -114667,12 +114589,6 @@ entities:
     - type: Transform
       pos: -25.5,-40.5
       parent: 2
-  - uid: 22545
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,-22.5
-      parent: 2
   - uid: 22561
     components:
     - type: Transform
@@ -114691,37 +114607,404 @@ entities:
       rot: 3.141592653589793 rad
       pos: -29.5,-11.5
       parent: 2
-  - uid: 22730
+  - uid: 22998
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 39.5,0.5
+      rot: 3.141592653589793 rad
+      pos: -12.5,0.5
+      parent: 2
+  - uid: 22999
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 35.5,-6.5
+      parent: 2
+  - uid: 23013
+    components:
+    - type: Transform
+      pos: -36.5,13.5
+      parent: 2
+  - uid: 23014
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -36.5,9.5
+      parent: 2
+  - uid: 23017
+    components:
+    - type: Transform
+      pos: -17.5,20.5
+      parent: 2
+  - uid: 23027
+    components:
+    - type: Transform
+      pos: 9.5,6.5
+      parent: 2
+  - uid: 23040
+    components:
+    - type: Transform
+      pos: 7.5,2.5
+      parent: 2
+  - uid: 23041
+    components:
+    - type: Transform
+      pos: 11.5,2.5
       parent: 2
 - proto: PoweredSmallLightEmpty
   entities:
+  - uid: 9504
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 14.5,-5.5
+      parent: 2
+- proto: PoweredWarmSmallLight
+  entities:
+  - uid: 527
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-38.5
+      parent: 2
+    - type: PoweredLight
+      on: False
+  - uid: 1053
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-39.5
+      parent: 2
+    - type: PoweredLight
+      on: False
+  - uid: 3058
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 27.5,-35.5
+      parent: 2
+  - uid: 4010
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 46.5,-27.5
+      parent: 2
+  - uid: 4585
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -10.5,24.5
+      parent: 2
+  - uid: 4643
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -12.5,-37.5
+      parent: 2
+  - uid: 4644
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-39.5
+      parent: 2
+    - type: PoweredLight
+      on: False
+  - uid: 4688
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 38.5,-11.5
+      parent: 2
+  - uid: 4693
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 34.5,-11.5
+      parent: 2
+  - uid: 4825
+    components:
+    - type: Transform
+      pos: 21.5,-39.5
+      parent: 2
+  - uid: 4826
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 21.5,-47.5
+      parent: 2
+  - uid: 6121
+    components:
+    - type: Transform
+      pos: 42.5,12.5
+      parent: 2
+  - uid: 6943
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-45.5
+      parent: 2
+  - uid: 7335
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 30.5,-26.5
+      parent: 2
+  - uid: 7923
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -19.5,-30.5
+      parent: 2
   - uid: 8858
     components:
     - type: Transform
-      pos: 38.5,3.5
+      rot: -1.5707963267948966 rad
+      pos: 30.5,-29.5
       parent: 2
-  - uid: 9504
+  - uid: 8863
+    components:
+    - type: Transform
+      pos: 18.5,8.5
+      parent: 2
+  - uid: 11096
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 14.5,-5.5
+      pos: -0.5,-45.5
       parent: 2
-  - uid: 11452
+  - uid: 11790
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-43.5
+      parent: 2
+  - uid: 11791
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 34.5,15.5
+      parent: 2
+  - uid: 11964
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -37.5,-55.5
+      parent: 2
+  - uid: 12194
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,-33.5
+      parent: 2
+  - uid: 12310
+    components:
+    - type: Transform
+      pos: 6.5,-44.5
+      parent: 2
+  - uid: 12631
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-33.5
+      parent: 2
+  - uid: 13308
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 22.5,-43.5
+      parent: 2
+  - uid: 13362
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -29.5,-52.5
+      parent: 2
+  - uid: 13398
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -29.5,-55.5
+      parent: 2
+  - uid: 13795
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -20.5,11.5
+      parent: 2
+  - uid: 13863
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,-53.5
+      parent: 2
+  - uid: 13992
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-53.5
+      parent: 2
+  - uid: 14401
+    components:
+    - type: Transform
+      pos: 38.5,3.5
+      parent: 2
+  - uid: 14412
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 48.5,8.5
       parent: 2
+  - uid: 14774
+    components:
+    - type: Transform
+      pos: -10.5,-50.5
+      parent: 2
+  - uid: 16649
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -26.5,-54.5
+      parent: 2
+  - uid: 17159
+    components:
+    - type: Transform
+      pos: 27.5,-33.5
+      parent: 2
   - uid: 17421
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 35.5,-3.5
+      parent: 2
+  - uid: 17471
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 39.5,-3.5
+      parent: 2
+  - uid: 17496
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -9.5,-25.5
+      parent: 2
+  - uid: 17606
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-42.5
+      parent: 2
+  - uid: 17723
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-26.5
+      parent: 2
+  - uid: 20501
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -41.5,-54.5
+      parent: 2
+  - uid: 20763
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-45.5
+      parent: 2
+  - uid: 21264
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 15.5,-40.5
+      parent: 2
+  - uid: 21266
+    components:
+    - type: Transform
+      pos: 15.5,-35.5
+      parent: 2
+  - uid: 21267
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -8.5,17.5
+      parent: 2
+  - uid: 21278
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -6.5,17.5
+      parent: 2
+  - uid: 21284
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -47.5,-22.5
+      parent: 2
+  - uid: 21290
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -50.5,-21.5
+      parent: 2
+  - uid: 21299
+    components:
+    - type: Transform
+      pos: 6.5,-38.5
+      parent: 2
+  - uid: 21301
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,-42.5
+      parent: 2
+  - uid: 21306
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 27.5,4.5
+      parent: 2
+  - uid: 21763
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 39.5,0.5
+      parent: 2
+  - uid: 21821
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 36.5,0.5
+      parent: 2
+  - uid: 22006
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 43.5,8.5
+      parent: 2
+  - uid: 22545
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 50.5,12.5
       parent: 2
+  - uid: 23000
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 17.5,-49.5
+      parent: 2
+  - uid: 23001
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -53.5,-23.5
+      parent: 2
+  - uid: 23039
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,-25.5
+      parent: 2
 - proto: PrefilledSyringe
   entities:
   - uid: 6049
@@ -114869,12 +115152,6 @@ entities:
     - type: Transform
       pos: 6.5,-16.5
       parent: 2
-  - uid: 3190
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 14.5,25.5
-      parent: 2
   - uid: 3242
     components:
     - type: Transform
@@ -115653,7 +115930,7 @@ entities:
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 15.5,25.5
+      pos: 14.5,25.5
       parent: 2
   - uid: 22458
     components:
@@ -116434,15 +116711,20 @@ entities:
       parent: 2
 - proto: RandomArtifactSpawner20
   entities:
-  - uid: 5755
+  - uid: 4821
     components:
     - type: Transform
-      pos: 38.5,-46.5
+      pos: 5.5,24.5
       parent: 2
-  - uid: 17456
+  - uid: 5549
     components:
     - type: Transform
-      pos: 3.5,24.5
+      pos: 3.5,18.5
+      parent: 2
+  - uid: 5755
+    components:
+    - type: Transform
+      pos: 38.5,-46.5
       parent: 2
   - uid: 19881
     components:
@@ -116961,6 +117243,11 @@ entities:
     - type: Transform
       pos: -8.5,23.5
       parent: 2
+  - uid: 18906
+    components:
+    - type: Transform
+      pos: -48.5,-57.5
+      parent: 2
   - uid: 19870
     components:
     - type: Transform
@@ -117031,11 +117318,6 @@ entities:
     - type: Transform
       pos: 38.5,12.5
       parent: 2
-  - uid: 22675
-    components:
-    - type: Transform
-      pos: -48.5,-57.5
-      parent: 2
   - uid: 22688
     components:
     - type: Transform
@@ -117780,6 +118062,11 @@ entities:
     - type: Transform
       pos: 30.5,-56.5
       parent: 2
+  - uid: 12407
+    components:
+    - type: Transform
+      pos: -47.5,-52.5
+      parent: 2
   - uid: 15871
     components:
     - type: Transform
@@ -117816,11 +118103,6 @@ entities:
     - type: Transform
       pos: 33.5,-57.5
       parent: 2
-  - uid: 16935
-    components:
-    - type: Transform
-      pos: -46.5,-51.5
-      parent: 2
   - uid: 17261
     components:
     - type: Transform
@@ -118390,21 +118672,11 @@ entities:
       parent: 2
 - proto: ReinforcedPlasmaWindow
   entities:
-  - uid: 461
-    components:
-    - type: Transform
-      pos: 9.5,1.5
-      parent: 2
   - uid: 531
     components:
     - type: Transform
       pos: 3.5,7.5
       parent: 2
-  - uid: 539
-    components:
-    - type: Transform
-      pos: 11.5,4.5
-      parent: 2
   - uid: 544
     components:
     - type: Transform
@@ -118413,17 +118685,42 @@ entities:
   - uid: 576
     components:
     - type: Transform
-      pos: 11.5,2.5
+      pos: 9.5,3.5
       parent: 2
   - uid: 612
     components:
     - type: Transform
       pos: 4.5,7.5
       parent: 2
+  - uid: 791
+    components:
+    - type: Transform
+      pos: 11.5,6.5
+      parent: 2
+  - uid: 867
+    components:
+    - type: Transform
+      pos: 10.5,3.5
+      parent: 2
+  - uid: 901
+    components:
+    - type: Transform
+      pos: 7.5,6.5
+      parent: 2
+  - uid: 1089
+    components:
+    - type: Transform
+      pos: 7.5,4.5
+      parent: 2
+  - uid: 1268
+    components:
+    - type: Transform
+      pos: 11.5,4.5
+      parent: 2
   - uid: 1325
     components:
     - type: Transform
-      pos: 10.5,1.5
+      pos: 8.5,3.5
       parent: 2
   - uid: 1411
     components:
@@ -118490,11 +118787,6 @@ entities:
     - type: Transform
       pos: 4.5,3.5
       parent: 2
-  - uid: 2484
-    components:
-    - type: Transform
-      pos: 10.5,5.5
-      parent: 2
   - uid: 4475
     components:
     - type: Transform
@@ -118520,26 +118812,6 @@ entities:
     - type: Transform
       pos: 41.5,-46.5
       parent: 2
-  - uid: 6351
-    components:
-    - type: Transform
-      pos: 8.5,1.5
-      parent: 2
-  - uid: 10018
-    components:
-    - type: Transform
-      pos: 7.5,2.5
-      parent: 2
-  - uid: 10056
-    components:
-    - type: Transform
-      pos: 8.5,5.5
-      parent: 2
-  - uid: 10104
-    components:
-    - type: Transform
-      pos: 7.5,4.5
-      parent: 2
   - uid: 10195
     components:
     - type: Transform
@@ -118565,21 +118837,11 @@ entities:
     - type: Transform
       pos: 7.5,-9.5
       parent: 2
-  - uid: 12018
-    components:
-    - type: Transform
-      pos: 5.5,-5.5
-      parent: 2
   - uid: 12517
     components:
     - type: Transform
       pos: 7.5,-5.5
       parent: 2
-  - uid: 13132
-    components:
-    - type: Transform
-      pos: 9.5,5.5
-      parent: 2
   - uid: 13258
     components:
     - type: Transform
@@ -120625,6 +120887,11 @@ entities:
     - type: Transform
       pos: 77.5,-47.5
       parent: 2
+  - uid: 10818
+    components:
+    - type: Transform
+      pos: 9.5,1.5
+      parent: 2
   - uid: 10828
     components:
     - type: Transform
@@ -120760,6 +121027,11 @@ entities:
     - type: Transform
       pos: 28.5,-59.5
       parent: 2
+  - uid: 11712
+    components:
+    - type: Transform
+      pos: 8.5,1.5
+      parent: 2
   - uid: 11782
     components:
     - type: Transform
@@ -120775,6 +121047,11 @@ entities:
     - type: Transform
       pos: -30.5,-12.5
       parent: 2
+  - uid: 12018
+    components:
+    - type: Transform
+      pos: 10.5,1.5
+      parent: 2
   - uid: 12024
     components:
     - type: Transform
@@ -121736,13 +122013,6 @@ entities:
         - Pressed: Toggle
         6578:
         - Pressed: Toggle
-  - uid: 11096
-    components:
-    - type: MetaData
-      name: Salvage Dock Remote
-    - type: Transform
-      pos: 14.520121,25.664625
-      parent: 2
   - uid: 17983
     components:
     - type: MetaData
@@ -125953,10 +126223,10 @@ entities:
     - type: Transform
       pos: -45.5,-44.5
       parent: 2
-  - uid: 17535
+  - uid: 23015
     components:
     - type: Transform
-      pos: -6.5,17.5
+      pos: -8.5,19.5
       parent: 2
 - proto: SpawnMobReindeerBuck
   entities:
@@ -127828,14 +128098,6 @@ entities:
       parent: 2
     - type: SurveillanceCamera
       id: Gravity Generator
-  - uid: 21448
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.5,-0.5
-      parent: 2
-    - type: SurveillanceCamera
-      id: Atmos - East
   - uid: 21608
     components:
     - type: Transform
@@ -128055,13 +128317,6 @@ entities:
       parent: 2
     - type: SurveillanceCamera
       id: Hall - Detective's Garden
-  - uid: 22145
-    components:
-    - type: Transform
-      pos: 15.5,5.5
-      parent: 2
-    - type: SurveillanceCamera
-      id: Hall - Coffee Hall
   - uid: 22147
     components:
     - type: Transform
@@ -130015,6 +130270,11 @@ entities:
       parent: 2
 - proto: TableFancyOrange
   entities:
+  - uid: 262
+    components:
+    - type: Transform
+      pos: -6.5,17.5
+      parent: 2
   - uid: 9564
     components:
     - type: Transform
@@ -130054,6 +130314,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 13.5,-30.5
       parent: 2
+  - uid: 4429
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -46.5,-57.5
+      parent: 2
   - uid: 7808
     components:
     - type: Transform
@@ -131262,6 +131528,18 @@ entities:
       parent: 2
 - proto: ToiletEmpty
   entities:
+  - uid: 3714
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -45.5,-56.5
+      parent: 2
+  - uid: 12386
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -47.5,-56.5
+      parent: 2
   - uid: 12756
     components:
     - type: Transform
@@ -131424,7 +131702,7 @@ entities:
   - uid: 16081
     components:
     - type: Transform
-      pos: -28.404318,-7.233346
+      pos: -28.463476,-7.285346
       parent: 2
   - uid: 16275
     components:
@@ -132302,10 +132580,10 @@ entities:
     - type: Transform
       pos: -4.5,-55.5
       parent: 2
-  - uid: 22334
+  - uid: 21410
     components:
     - type: Transform
-      pos: 16.5,17.5
+      pos: 15.5,25.5
       parent: 2
 - proto: VendingMachineTheater
   entities:
@@ -132569,11 +132847,6 @@ entities:
     - type: Transform
       pos: -24.5,18.5
       parent: 2
-  - uid: 303
-    components:
-    - type: Transform
-      pos: 11.5,5.5
-      parent: 2
   - uid: 311
     components:
     - type: Transform
@@ -133475,6 +133748,11 @@ entities:
     - type: Transform
       pos: -18.5,-3.5
       parent: 2
+  - uid: 1614
+    components:
+    - type: Transform
+      pos: 11.5,7.5
+      parent: 2
   - uid: 1645
     components:
     - type: Transform
@@ -136151,6 +136429,11 @@ entities:
     - type: Transform
       pos: -33.5,-9.5
       parent: 2
+  - uid: 7710
+    components:
+    - type: Transform
+      pos: 7.5,3.5
+      parent: 2
   - uid: 7731
     components:
     - type: Transform
@@ -136593,6 +136876,11 @@ entities:
     - type: Transform
       pos: -19.5,-14.5
       parent: 2
+  - uid: 9423
+    components:
+    - type: Transform
+      pos: 11.5,3.5
+      parent: 2
   - uid: 9495
     components:
     - type: Transform
@@ -139064,6 +139352,12 @@ entities:
     - type: Transform
       pos: 18.5,23.5
       parent: 2
+  - uid: 22184
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,7.5
+      parent: 2
   - uid: 22639
     components:
     - type: Transform
@@ -139153,6 +139447,11 @@ entities:
     - type: Transform
       pos: 13.5,8.5
       parent: 2
+  - uid: 1324
+    components:
+    - type: Transform
+      pos: 7.5,7.5
+      parent: 2
   - uid: 1448
     components:
     - type: Transform
@@ -140303,6 +140602,11 @@ entities:
     - type: Transform
       pos: 58.5,-43.5
       parent: 2
+  - uid: 10017
+    components:
+    - type: Transform
+      pos: 5.5,-5.5
+      parent: 2
   - uid: 10023
     components:
     - type: Transform
@@ -140749,11 +141053,6 @@ entities:
     - type: Transform
       pos: -19.5,2.5
       parent: 2
-  - uid: 12555
-    components:
-    - type: Transform
-      pos: 7.5,5.5
-      parent: 2
   - uid: 12561
     components:
     - type: Transform
@@ -142014,6 +142313,18 @@ entities:
     - type: Transform
       pos: 43.5,13.5
       parent: 2
+  - uid: 23036
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 9.5,7.5
+      parent: 2
+  - uid: 23037
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,7.5
+      parent: 2
 - proto: WallSolid
   entities:
   - uid: 11
@@ -147084,6 +147395,13 @@ entities:
     - type: Transform
       pos: 16.5,-25.5
       parent: 2
+- proto: WarmLightBulb
+  entities:
+  - uid: 22730
+    components:
+    - type: Transform
+      pos: -23.50722,22.240725
+      parent: 2
 - proto: WarningCO2
   entities:
   - uid: 1965
@@ -147179,11 +147497,6 @@ entities:
     - type: Transform
       pos: -7.5,12.5
       parent: 2
-  - uid: 16939
-    components:
-    - type: Transform
-      pos: -47.5,-54.5
-      parent: 2
   - uid: 17165
     components:
     - type: Transform
@@ -147204,6 +147517,11 @@ entities:
     - type: Transform
       pos: -17.5,-36.5
       parent: 2
+  - uid: 22997
+    components:
+    - type: Transform
+      pos: -47.5,-57.5
+      parent: 2
 - proto: WaterTankHighCapacity
   entities:
   - uid: 3914
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
index 9fed1755a16f..7c515eafacfe 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -54,6 +54,16 @@
       - id: LightBulb
         amount: 12
 
+- type: entity
+  name: lightbulb box warm
+  parent: BoxLightbulb
+  id: BoxWarmLightbulb
+  components:
+  - type: StorageFill
+    contents:
+      - id: WarmLightBulb
+        amount: 12
+
 - type: entity
   name: lighttube box
   parent: BoxLightbulb
diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml
index bb52000a8608..0e4d0056c734 100644
--- a/Resources/Prototypes/Entities/Objects/Power/lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml
@@ -167,6 +167,23 @@
     - LightBulb
     - Trash
 
+- type: entity
+  parent: BaseLightbulb
+  name: warm light bulb
+  id: WarmLightBulb
+  description: A warm light bulb for a more cozy atmosphere.
+  components:
+  - type: LightBulb
+    bulb: Bulb
+    color: "#ff9833" # 2200k color temp
+    lightEnergy: 1
+    lightRadius: 6
+    lightSoftness: 3
+  - type: Tag
+    tags:
+    - LightBulb
+    - Trash
+
 - type: entity
   parent: LightBulb
   name: old incandescent light bulb
diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
index 7c430227b779..baa90189cfc5 100644
--- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
@@ -393,6 +393,27 @@
         Heat: 1
     popupText: powered-light-component-burn-hand
 
+- type: entity
+  id: PoweredWarmSmallLight
+  suffix: Warm
+  parent: PoweredSmallLightEmpty
+  components:
+  - type: Sprite
+    state: base
+  - type: PointLight
+    enabled: true
+    radius: 6
+    energy: 1
+    softness: 3
+    color: "#FF8A0C"
+  - type: PoweredLight
+    hasLampOnSpawn: WarmLightBulb
+  - type: DamageOnInteract
+    damage:
+      types:
+        Heat: 2
+    popupText: powered-light-component-burn-hand
+
 - type: entity
   id: PoweredSmallLight
   suffix: ""
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 619f7ec01f5b..1638b5d84e25 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -151,6 +151,7 @@
       - LightBulb
       - LedLightBulb
       - DimLightBulb
+      - WarmLightBulb
       - Bucket
       - DrinkMug
       - DrinkMugMetal
diff --git a/Resources/Prototypes/Recipes/Lathes/misc.yml b/Resources/Prototypes/Recipes/Lathes/misc.yml
index 8bb94fb7e005..a9ae608674ef 100644
--- a/Resources/Prototypes/Recipes/Lathes/misc.yml
+++ b/Resources/Prototypes/Recipes/Lathes/misc.yml
@@ -55,6 +55,11 @@
   id: DimLightBulb
   result: DimLightBulb
 
+- type: latheRecipe
+  parent: BaseLightRecipe
+  id: WarmLightBulb
+  result: WarmLightBulb
+
 - type: latheRecipe
   parent: BaseLightRecipe
   id: GlowstickRed