From b6502b618363588d5a01c52d500daf7059a78955 Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Tue, 2 Jan 2024 10:57:47 +0000
Subject: [PATCH] saltern dressers update (#23349)

saltern update

Co-authored-by: deltanedas <@deltanedas:kde.org>
---
 Resources/Maps/saltern.yml | 253 ++++++++++++++++++++++---------------
 1 file changed, 154 insertions(+), 99 deletions(-)

diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index 9fe12bafc2..deaa1e3a13 100644
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -122,7 +122,7 @@ entities:
           version: 6
         2,-1:
           ind: 2,-1
-          tiles: AAAAAAAAeAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAACdgAAAAACEwAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAYAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAEwAAAAAGdgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAdgAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAEwAAAAAEeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAEwAAAAAAeQAAAAAAEwAAAAAEdgAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAACWQAAAAABWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAADWQAAAAABWQAAAAADWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAACWQAAAAAAWQAAAAABeQAAAAAAdgAAAAADdgAAAAACdgAAAAADdgAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAWQAAAAACWQAAAAACWQAAAAABWQAAAAADeQAAAAAAdgAAAAAAdgAAAAAAdgAAAAACdgAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAA
+          tiles: AAAAAAAAeAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAACdgAAAAACEwAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAYAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAEwAAAAAGdgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAdgAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAEwAAAAAEeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAEwAAAAAAeQAAAAAAEwAAAAAEdgAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAACWQAAAAABWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAADWQAAAAABWQAAAAADWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAACWQAAAAAAWQAAAAABeQAAAAAAdgAAAAADdgAAAAACdgAAAAADdgAAAAAAdgAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAWQAAAAACWQAAAAACWQAAAAABWQAAAAADeQAAAAAAdgAAAAAAdgAAAAAAdgAAAAACdgAAAAAAdgAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAA
           version: 6
         -1,-2:
           ind: -1,-2
@@ -6369,6 +6369,11 @@ entities:
     - pos: -3.5,-23.5
       parent: 31
       type: Transform
+  - uid: 1621
+    components:
+    - pos: 41.5,-1.5
+      parent: 31
+      type: Transform
   - uid: 1956
     components:
     - pos: -12.5,7.5
@@ -6439,11 +6444,6 @@ entities:
     - pos: 10.5,16.5
       parent: 31
       type: Transform
-  - uid: 9118
-    components:
-    - pos: 40.5,-1.5
-      parent: 31
-      type: Transform
   - uid: 9455
     components:
     - pos: -13.5,-37.5
@@ -6468,7 +6468,7 @@ entities:
   entities:
   - uid: 609
     components:
-    - pos: 40.5,-1.5
+    - pos: 41.5,-1.5
       parent: 31
       type: Transform
 - proto: BedsheetCMO
@@ -16119,6 +16119,11 @@ entities:
     - pos: 64.5,-3.5
       parent: 31
       type: Transform
+  - uid: 1623
+    components:
+    - pos: 43.5,-3.5
+      parent: 31
+      type: Transform
   - uid: 1631
     components:
     - pos: 65.5,-4.5
@@ -16319,24 +16324,14 @@ entities:
     - pos: -12.5,-35.5
       parent: 31
       type: Transform
-  - uid: 3279
-    components:
-    - pos: 42.5,-0.5
-      parent: 31
-      type: Transform
-  - uid: 3280
-    components:
-    - pos: 42.5,-1.5
-      parent: 31
-      type: Transform
   - uid: 3281
     components:
-    - pos: 42.5,-2.5
+    - pos: 43.5,-2.5
       parent: 31
       type: Transform
   - uid: 3282
     components:
-    - pos: 42.5,-3.5
+    - pos: 43.5,-1.5
       parent: 31
       type: Transform
   - uid: 3284
@@ -17479,6 +17474,11 @@ entities:
     - pos: 55.5,7.5
       parent: 31
       type: Transform
+  - uid: 4297
+    components:
+    - pos: 43.5,-4.5
+      parent: 31
+      type: Transform
   - uid: 4307
     components:
     - pos: -6.5,25.5
@@ -22867,6 +22867,16 @@ entities:
     - pos: -2.5,-1.5
       parent: 31
       type: Transform
+  - uid: 11388
+    components:
+    - pos: 40.5,-1.5
+      parent: 31
+      type: Transform
+  - uid: 11389
+    components:
+    - pos: 41.5,-1.5
+      parent: 31
+      type: Transform
 - proto: CarpetPink
   entities:
   - uid: 4103
@@ -23116,6 +23126,11 @@ entities:
     - pos: -9.5,-8.5
       parent: 31
       type: Transform
+  - uid: 1624
+    components:
+    - pos: 43.5,-4.5
+      parent: 31
+      type: Transform
   - uid: 1662
     components:
     - pos: 27.5,-8.5
@@ -23126,6 +23141,11 @@ entities:
     - pos: 27.5,-12.5
       parent: 31
       type: Transform
+  - uid: 2146
+    components:
+    - pos: 43.5,-3.5
+      parent: 31
+      type: Transform
   - uid: 2157
     components:
     - pos: 12.5,14.5
@@ -23156,6 +23176,11 @@ entities:
     - pos: 59.5,12.5
       parent: 31
       type: Transform
+  - uid: 3279
+    components:
+    - pos: 43.5,-2.5
+      parent: 31
+      type: Transform
   - uid: 3412
     components:
     - pos: -19.5,-31.5
@@ -23912,11 +23937,6 @@ entities:
     - pos: 60.5,12.5
       parent: 31
       type: Transform
-  - uid: 6894
-    components:
-    - pos: 42.5,-0.5
-      parent: 31
-      type: Transform
   - uid: 6908
     components:
     - pos: 31.5,20.5
@@ -23928,21 +23948,6 @@ entities:
       pos: 64.5,2.5
       parent: 31
       type: Transform
-  - uid: 6966
-    components:
-    - pos: 42.5,-1.5
-      parent: 31
-      type: Transform
-  - uid: 6968
-    components:
-    - pos: 42.5,-2.5
-      parent: 31
-      type: Transform
-  - uid: 7035
-    components:
-    - pos: 42.5,-3.5
-      parent: 31
-      type: Transform
   - uid: 7045
     components:
     - pos: 42.5,-4.5
@@ -31845,17 +31850,14 @@ entities:
     - pos: 10.5,20.5
       parent: 31
       type: Transform
-  - uid: 4297
+  - uid: 4735
     components:
-    - desc: A comfy-looking raccoon bed. You can even strap your pet in, in case the gravity turns off.
-      name: raccoon bed
-      type: MetaData
-    - pos: 26.5,10.5
+    - pos: 21.5,-9.5
       parent: 31
       type: Transform
-  - uid: 4735
+  - uid: 6966
     components:
-    - pos: 21.5,-9.5
+    - pos: 28.5,8.5
       parent: 31
       type: Transform
   - uid: 8419
@@ -31889,6 +31891,48 @@ entities:
     - pos: 7.5,16.5
       parent: 31
       type: Transform
+- proto: DresserCaptainFilled
+  entities:
+  - uid: 11383
+    components:
+    - pos: 11.5,23.5
+      parent: 31
+      type: Transform
+- proto: DresserChiefEngineerFilled
+  entities:
+  - uid: 6968
+    components:
+    - pos: 41.5,-0.5
+      parent: 31
+      type: Transform
+- proto: DresserChiefMedicalOfficerFilled
+  entities:
+  - uid: 11386
+    components:
+    - pos: 24.5,-11.5
+      parent: 31
+      type: Transform
+- proto: DresserHeadOfPersonnelFilled
+  entities:
+  - uid: 11384
+    components:
+    - pos: 9.5,16.5
+      parent: 31
+      type: Transform
+- proto: DresserHeadOfSecurityFilled
+  entities:
+  - uid: 11382
+    components:
+    - pos: -8.5,22.5
+      parent: 31
+      type: Transform
+- proto: DresserQuarterMasterFilled
+  entities:
+  - uid: 4909
+    components:
+    - pos: 26.5,10.5
+      parent: 31
+      type: Transform
 - proto: DrinkBottleRum
   entities:
   - uid: 10630
@@ -32569,11 +32613,6 @@ entities:
     - pos: 32.5,-5.5
       parent: 31
       type: Transform
-  - uid: 4909
-    components:
-    - pos: 41.5,-1.5
-      parent: 31
-      type: Transform
   - uid: 4913
     components:
     - pos: 17.5,8.5
@@ -32637,6 +32676,11 @@ entities:
     - pos: 55.5,-5.5
       parent: 31
       type: Transform
+  - uid: 11387
+    components:
+    - pos: 42.5,-1.5
+      parent: 31
+      type: Transform
 - proto: FaxMachineBase
   entities:
   - uid: 683
@@ -33141,7 +33185,7 @@ entities:
     - pos: 38.5,-5.5
       parent: 31
       type: Transform
-    - secondsUntilStateChange: -5373.1543
+    - secondsUntilStateChange: -5658.055
       state: Closing
       type: Door
   - uid: 4019
@@ -43811,6 +43855,8 @@ entities:
     - pos: 14.5,11.5
       parent: 31
       type: Transform
+    - joinedGrid: 31
+      type: AtmosDevice
     - color: '#0055CCFF'
       type: AtmosPipeColor
   - uid: 5495
@@ -44545,6 +44591,8 @@ entities:
       pos: 16.5,10.5
       parent: 31
       type: Transform
+    - joinedGrid: 31
+      type: AtmosDevice
     - color: '#990000FF'
       type: AtmosPipeColor
   - uid: 5496
@@ -51170,9 +51218,9 @@ entities:
       type: Transform
 - proto: PottedPlant15
   entities:
-  - uid: 2146
+  - uid: 6894
     components:
-    - pos: 24.695305,-11.887805
+    - pos: 23.784285,-11.850549
       parent: 31
       type: Transform
 - proto: PottedPlantBioluminscent
@@ -58560,9 +58608,9 @@ entities:
       type: Transform
 - proto: SpawnMobRaccoonMorticia
   entities:
-  - uid: 6244
+  - uid: 11385
     components:
-    - pos: 26.5,10.5
+    - pos: 28.5,8.5
       parent: 31
       type: Transform
 - proto: SpawnMobShiva
@@ -58593,28 +58641,6 @@ entities:
     - pos: 17.5,-0.5
       parent: 31
       type: Transform
-- proto: SpawnPointAssistant
-  entities:
-  - uid: 496
-    components:
-    - pos: -28.5,9.5
-      parent: 31
-      type: Transform
-  - uid: 4229
-    components:
-    - pos: -27.5,9.5
-      parent: 31
-      type: Transform
-  - uid: 7166
-    components:
-    - pos: -25.5,-7.5
-      parent: 31
-      type: Transform
-  - uid: 10141
-    components:
-    - pos: -22.5,-5.5
-      parent: 31
-      type: Transform
 - proto: SpawnPointAtmos
   entities:
   - uid: 9106
@@ -58821,6 +58847,28 @@ entities:
     - pos: 24.5,-5.5
       parent: 31
       type: Transform
+- proto: SpawnPointPassenger
+  entities:
+  - uid: 496
+    components:
+    - pos: -28.5,9.5
+      parent: 31
+      type: Transform
+  - uid: 4229
+    components:
+    - pos: -27.5,9.5
+      parent: 31
+      type: Transform
+  - uid: 7166
+    components:
+    - pos: -25.5,-7.5
+      parent: 31
+      type: Transform
+  - uid: 10141
+    components:
+    - pos: -22.5,-5.5
+      parent: 31
+      type: Transform
 - proto: SpawnPointQuartermaster
   entities:
   - uid: 6852
@@ -63225,13 +63273,6 @@ entities:
     - pos: 39.5,-2.5
       parent: 31
       type: Transform
-  - uid: 1621
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 41.5,-2.5
-      parent: 31
-      type: Transform
   - uid: 1622
     components:
     - flags: PvsPriority
@@ -63239,20 +63280,6 @@ entities:
     - pos: 40.5,-2.5
       parent: 31
       type: Transform
-  - uid: 1623
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 41.5,-1.5
-      parent: 31
-      type: Transform
-  - uid: 1624
-    components:
-    - flags: PvsPriority
-      type: MetaData
-    - pos: 41.5,-0.5
-      parent: 31
-      type: Transform
   - uid: 1625
     components:
     - flags: PvsPriority
@@ -64948,6 +64975,13 @@ entities:
     - pos: 22.5,-15.5
       parent: 31
       type: Transform
+  - uid: 3280
+    components:
+    - flags: PvsPriority
+      type: MetaData
+    - pos: 41.5,-2.5
+      parent: 31
+      type: Transform
   - uid: 3304
     components:
     - flags: PvsPriority
@@ -66442,6 +66476,13 @@ entities:
     - pos: 58.5,5.5
       parent: 31
       type: Transform
+  - uid: 6244
+    components:
+    - flags: PvsPriority
+      type: MetaData
+    - pos: 42.5,-0.5
+      parent: 31
+      type: Transform
   - uid: 6245
     components:
     - flags: PvsPriority
@@ -67073,6 +67114,13 @@ entities:
     - pos: 34.5,-18.5
       parent: 31
       type: Transform
+  - uid: 7035
+    components:
+    - flags: PvsPriority
+      type: MetaData
+    - pos: 42.5,-1.5
+      parent: 31
+      type: Transform
   - uid: 7047
     components:
     - flags: PvsPriority
@@ -68194,6 +68242,13 @@ entities:
     - pos: -25.5,-21.5
       parent: 31
       type: Transform
+  - uid: 9118
+    components:
+    - flags: PvsPriority
+      type: MetaData
+    - pos: 42.5,-2.5
+      parent: 31
+      type: Transform
   - uid: 9144
     components:
     - flags: PvsPriority
-- 
2.51.2