atlas dresser update (#23351)

atlas update

Co-authored-by: deltanedas <@deltanedas:kde.org>

diff --git a/Resources/Maps/atlas.yml b/Resources/Maps/atlas.yml
index e56f1cc218de87c263c0c9260b50c945357ddc34..06fa2b4a55d1fe4604e13c4b68ba92efcdd9325a 100644 (file)
--- a/Resources/Maps/atlas.yml
+++ b/Resources/Maps/atlas.yml
@@ -56,7 +56,7 @@ entities:
           version: 6
         -1,-1:
           ind: -1,-1
-          tiles: eQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAALwAAAAAALwAAAAAALwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAPAAAAAAAPAAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAbAAAAAAAPAAAAAAAPAAAAAAAeQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAA
+          tiles: eQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAFAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAALwAAAAAALwAAAAAALwAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAPAAAAAAAPAAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAbAAAAAAAPAAAAAAAPAAAAAAAeQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAA
           version: 6
         0,0:
           ind: 0,0
@@ -92,7 +92,7 @@ entities:
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: dgAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAWQAAAAAAWQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAdQAAAAAAdQAAAAAAdQAAAAAAdQAAAAAAeQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAWQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAdQAAAAAAdQAAAAAAdQAAAAAAdQAAAAAAeQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAWQAAAAAA
+          tiles: dgAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAeQAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAWQAAAAAAWQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAdQAAAAAAdQAAAAAAdQAAAAAAdQAAAAAAeQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAWQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAdQAAAAAAdQAAAAAAdQAAAAAAdQAAAAAAeQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAeQAAAAAAWQAAAAAA
           version: 6
         -1,-2:
           ind: -1,-2
@@ -2530,6 +2530,16 @@ entities:
     - type: GridPathfinding
     - type: GasTileOverlay
     - type: RadiationGridResistance
+- proto: ActionToggleLight
+  entities:
+  - uid: 1976
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 1523
+      type: Transform
+    - container: 1523
+      type: InstantAction
 - proto: AirAlarm
   entities:
   - uid: 1942
@@ -3214,15 +3224,6 @@ entities:
     - pos: 1.5,-12.5
       parent: 30
       type: Transform
-- proto: AirlockChiefMedicalOfficerLocked
-  entities:
-  - uid: 2699
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -0.5,-13.5
-      parent: 30
-      type: Transform
 - proto: AirlockCommandGlassLocked
   entities:
   - uid: 221
@@ -15710,16 +15711,16 @@ entities:
       pos: 2.5,15.5
       parent: 30
       type: Transform
-  - uid: 1639
+  - uid: 5925
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 3.5,15.5
+    - rot: 1.5707963267948966 rad
+      pos: -0.5,12.5
       parent: 30
       type: Transform
-  - uid: 5925
+  - uid: 7725
     components:
     - rot: 1.5707963267948966 rad
-      pos: -0.5,12.5
+      pos: 3.5,15.5
       parent: 30
       type: Transform
 - proto: CarpetBlack
@@ -17402,12 +17403,6 @@ entities:
     - pos: -15.5,-13.5
       parent: 30
       type: Transform
-  - uid: 4891
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -20.5,-10.5
-      parent: 30
-      type: Transform
   - uid: 5548
     components:
     - pos: -28.5,20.5
@@ -18396,18 +18391,18 @@ entities:
     - pos: -1.5,26.5
       parent: 30
       type: Transform
-  - uid: 1550
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 2.5,16.5
-      parent: 30
-      type: Transform
   - uid: 1997
     components:
     - rot: -1.5707963267948966 rad
       pos: 3.5,11.5
       parent: 30
       type: Transform
+  - uid: 2024
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 3.5,16.5
+      parent: 30
+      type: Transform
   - uid: 3338
     components:
     - rot: 3.141592653589793 rad
@@ -18570,6 +18565,12 @@ entities:
     - pos: 35.5,4.5
       parent: 30
       type: Transform
+  - uid: 509
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 2.5,15.5
+      parent: 30
+      type: Transform
   - uid: 953
     components:
     - pos: 15.5,7.5
@@ -18583,9 +18584,10 @@ entities:
       pos: 25.5,-1.5
       parent: 30
       type: Transform
-  - uid: 1665
+  - uid: 2699
     components:
-    - pos: 2.5,17.5
+    - rot: 1.5707963267948966 rad
+      pos: 2.5,16.5
       parent: 30
       type: Transform
   - uid: 4128
@@ -21718,6 +21720,16 @@ entities:
     - pos: -2.5,-8.5
       parent: 30
       type: Transform
+  - uid: 2720
+    components:
+    - pos: 0.5,-13.5
+      parent: 30
+      type: Transform
+  - uid: 4891
+    components:
+    - pos: 7.5,13.5
+      parent: 30
+      type: Transform
   - uid: 5839
     components:
     - pos: -29.5,20.5
@@ -21748,14 +21760,30 @@ entities:
       type: Physics
 - proto: Dresser
   entities:
-  - uid: 177
+  - uid: 2458
+    components:
+    - pos: -19.5,-10.5
+      parent: 30
+      type: Transform
+- proto: DresserCaptainFilled
+  entities:
+  - uid: 1639
     components:
     - pos: 34.5,8.5
       parent: 30
       type: Transform
-  - uid: 509
+- proto: DresserChiefEngineerFilled
+  entities:
+  - uid: 5087
     components:
-    - pos: 32.5,-1.5
+    - pos: -38.5,8.5
+      parent: 30
+      type: Transform
+- proto: DresserChiefMedicalOfficerFilled
+  entities:
+  - uid: 6377
+    components:
+    - pos: -1.5,-13.5
       parent: 30
       type: Transform
 - proto: DresserFilled
@@ -21775,6 +21803,27 @@ entities:
     - pos: -44.5,-10.5
       parent: 30
       type: Transform
+- proto: DresserHeadOfPersonnelFilled
+  entities:
+  - uid: 1665
+    components:
+    - pos: 32.5,-1.5
+      parent: 30
+      type: Transform
+- proto: DresserHeadOfSecurityFilled
+  entities:
+  - uid: 7722
+    components:
+    - pos: 4.5,15.5
+      parent: 30
+      type: Transform
+- proto: DresserQuarterMasterFilled
+  entities:
+  - uid: 7727
+    components:
+    - pos: -26.5,21.5
+      parent: 30
+      type: Transform
 - proto: DrinkBottleOfNothingFull
   entities:
   - uid: 1601
@@ -35633,9 +35682,25 @@ entities:
       type: Transform
   - uid: 1523
     components:
-    - pos: 3.5725179,17.534464
+    - pos: 3.0430589,17.833725
       parent: 30
       type: Transform
+    - toggleActionEntity: 1976
+      type: HandheldLight
+    - containers:
+        cell_slot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+        actions: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 1976
+      type: ContainerContainer
+    - canCollide: True
+      type: Physics
+    - type: ActionsContainer
   - uid: 2704
     components:
     - pos: -1.5114588,-14.286842
@@ -36056,24 +36121,16 @@ entities:
       type: Transform
 - proto: MagazinePistolSubMachineGunTopMounted
   entities:
-  - uid: 1522
+  - uid: 2025
     components:
-    - pos: 3.5881429,16.925089
+    - pos: 2.5563116,17.625486
       parent: 30
       type: Transform
-    - unspawnedCount: 30
-      type: BallisticAmmoProvider
-    - canCollide: False
-      type: Physics
-  - uid: 2458
+  - uid: 5523
     components:
-    - pos: 3.4631429,17.018839
+    - pos: 2.3375616,17.766111
       parent: 30
       type: Transform
-    - unspawnedCount: 30
-      type: BallisticAmmoProvider
-    - canCollide: False
-      type: Physics
 - proto: MagazineRiflePractice
   entities:
   - uid: 3597
@@ -37211,9 +37268,9 @@ entities:
       type: ContainerContainer
 - proto: PottedPlantRD
   entities:
-  - uid: 5087
+  - uid: 1519
     components:
-    - pos: -19.5,-10.5
+    - pos: -20.5,-10.5
       parent: 30
       type: Transform
 - proto: PowerCellHighPrinted
@@ -37297,29 +37354,6 @@ entities:
     - pos: -20.5,-9.5
       parent: 30
       type: Transform
-  - uid: 6377
-    components:
-    - pos: -38.5,8.5
-      parent: 30
-      type: Transform
-    - containers:
-        charger-slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-        machine_board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        machine_parts: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        charger_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-      type: ContainerContainer
   - uid: 7012
     components:
     - pos: -31.5,-0.5
@@ -39540,15 +39574,6 @@ entities:
     - pos: -30.5,9.5
       parent: 30
       type: Transform
-- proto: RCD
-  entities:
-  - uid: 7400
-    components:
-    - pos: -38.5,8.5
-      parent: 30
-      type: Transform
-    - canCollide: False
-      type: Physics
 - proto: ReagentContainerFlour
   entities:
   - uid: 7108
@@ -42501,9 +42526,9 @@ entities:
       type: Transform
 - proto: SpawnMobCat
   entities:
-  - uid: 5523
+  - uid: 7400
     components:
-    - pos: -0.5,-12.5
+    - pos: 0.5,-13.5
       parent: 30
       type: Transform
 - proto: SpawnMobCorgi
@@ -42555,9 +42580,9 @@ entities:
       type: Transform
 - proto: SpawnMobShiva
   entities:
-  - uid: 2025
+  - uid: 2696
     components:
-    - pos: 3.5,15.5
+    - pos: 7.5,13.5
       parent: 30
       type: Transform
 - proto: SpawnMobSlothPaperwork
@@ -42581,23 +42606,6 @@ entities:
     - pos: -2.5,-8.5
       parent: 30
       type: Transform
-- proto: SpawnPointAssistant
-  entities:
-  - uid: 4243
-    components:
-    - pos: -12.5,15.5
-      parent: 30
-      type: Transform
-  - uid: 4244
-    components:
-    - pos: -11.5,15.5
-      parent: 30
-      type: Transform
-  - uid: 4245
-    components:
-    - pos: -10.5,15.5
-      parent: 30
-      type: Transform
 - proto: SpawnPointAtmos
   entities:
   - uid: 280
@@ -42840,6 +42848,23 @@ entities:
     - pos: 8.5,2.5
       parent: 30
       type: Transform
+- proto: SpawnPointPassenger
+  entities:
+  - uid: 4243
+    components:
+    - pos: -12.5,15.5
+      parent: 30
+      type: Transform
+  - uid: 4244
+    components:
+    - pos: -11.5,15.5
+      parent: 30
+      type: Transform
+  - uid: 4245
+    components:
+    - pos: -10.5,15.5
+      parent: 30
+      type: Transform
 - proto: SpawnPointQuartermaster
   entities:
   - uid: 5539
@@ -44085,11 +44110,6 @@ entities:
     - pos: -27.5,21.5
       parent: 30
       type: Transform
-  - uid: 5989
-    components:
-    - pos: -38.5,8.5
-      parent: 30
-      type: Transform
   - uid: 6161
     components:
     - pos: -34.5,16.5
@@ -44631,9 +44651,9 @@ entities:
     - pos: -2.5,25.5
       parent: 30
       type: Transform
-  - uid: 1976
+  - uid: 1522
     components:
-    - pos: 3.5,16.5
+    - pos: 2.5,17.5
       parent: 30
       type: Transform
   - uid: 1999
@@ -45421,10 +45441,10 @@ entities:
       type: Transform
 - proto: WallmountTelescreen
   entities:
-  - uid: 2024
+  - uid: 5989
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 1.5,16.5
+    - rot: 3.141592653589793 rad
+      pos: 3.5,14.5
       parent: 30
       type: Transform
 - proto: WallReinforced
@@ -47171,20 +47191,6 @@ entities:
     - pos: -32.5,22.5
       parent: 30
       type: Transform
-  - uid: 2696
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 0.5,-13.5
-      parent: 30
-      type: Transform
-  - uid: 2720
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: -1.5,-13.5
-      parent: 30
-      type: Transform
   - uid: 2760
     components:
     - flags: PvsPriority
@@ -52155,13 +52161,11 @@ entities:
       type: Physics
 - proto: WeaponSubMachineGunWt550
   entities:
-  - uid: 1519
+  - uid: 1550
     components:
-    - pos: 3.4787679,16.643839
+    - pos: 2.3688116,17.453611
       parent: 30
       type: Transform
-    - canCollide: False
-      type: Physics
 - proto: Welder
   entities:
   - uid: 2379
@@ -52242,6 +52246,12 @@ entities:
       pos: -30.5,0.5
       parent: 30
       type: Transform
+  - uid: 7724
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -0.5,-13.5
+      parent: 30
+      type: Transform
 - proto: WindoorHydroponicsLocked
   entities:
   - uid: 319
@@ -52656,11 +52666,23 @@ entities:
       type: Transform
 - proto: WindowDirectional
   entities:
+  - uid: 177
+    components:
+    - rot: 3.141592653589793 rad
+      pos: -1.5,-13.5
+      parent: 30
+      type: Transform
   - uid: 5879
     components:
     - pos: 16.5,-10.5
       parent: 30
       type: Transform
+  - uid: 7723
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 0.5,-13.5
+      parent: 30
+      type: Transform
 - proto: WindowFrostedDirectional
   entities:
   - uid: 119