From 826431c700fd17f238edb940c6a8992d8e21eae2 Mon Sep 17 00:00:00 2001
From: Emisse <99158783+Emisse@users.noreply.github.com>
Date: Tue, 2 Jan 2024 00:52:18 -0700
Subject: [PATCH] fland update (#23360)

---
 Resources/Maps/fland.yml | 317 +++++++++++++++++----------------------
 1 file changed, 139 insertions(+), 178 deletions(-)

diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml
index b785e4ea1e..07f22d2544 100644
--- a/Resources/Maps/fland.yml
+++ b/Resources/Maps/fland.yml
@@ -97017,6 +97017,13 @@ entities:
     - pos: 60.558964,5.5990562
       parent: 13329
       type: Transform
+- proto: ClothingHeadHatBeretWarden
+  entities:
+  - uid: 10507
+    components:
+    - pos: 27.296652,12.539995
+      parent: 13329
+      type: Transform
 - proto: ClothingHeadHatBunny
   entities:
   - uid: 26738
@@ -98116,13 +98123,6 @@ entities:
     - pos: 29.434042,-31.389341
       parent: 13329
       type: Transform
-- proto: ClothingUniformJumpskirtHoSParadeMale
-  entities:
-  - uid: 10701
-    components:
-    - pos: 37.479042,26.722422
-      parent: 13329
-      type: Transform
 - proto: ClothingUniformJumpsuitAncient
   entities:
   - uid: 32231
@@ -98163,13 +98163,6 @@ entities:
     - pos: 78.61583,-18.435736
       parent: 13329
       type: Transform
-- proto: ClothingUniformJumpsuitHoSParadeMale
-  entities:
-  - uid: 10700
-    components:
-    - pos: 37.572792,26.613047
-      parent: 13329
-      type: Transform
 - proto: ClothingUniformJumpsuitLawyerBlack
   entities:
   - uid: 26094
@@ -100653,31 +100646,6 @@ entities:
         - 0
         - 0
       type: EntityStorage
-- proto: CrateEngineeringSecure
-  entities:
-  - uid: 26694
-    components:
-    - pos: 81.5,-16.5
-      parent: 13329
-      type: Transform
-    - air:
-        volume: 200
-        immutable: False
-        temperature: 293.1495
-        moles:
-        - 3.0981817
-        - 11.655066
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-      type: EntityStorage
 - proto: CrateEngineeringSingularityEmitter
   entities:
   - uid: 32729
@@ -111615,11 +111583,6 @@ entities:
     - pos: 27.5,12.5
       parent: 13329
       type: Transform
-  - uid: 11718
-    components:
-    - pos: -5.5,-23.5
-      parent: 13329
-      type: Transform
   - uid: 18468
     components:
     - pos: 20.5,36.5
@@ -111630,6 +111593,11 @@ entities:
     - pos: 22.5,57.5
       parent: 13329
       type: Transform
+  - uid: 25021
+    components:
+    - pos: -5.5,-24.5
+      parent: 13329
+      type: Transform
   - uid: 30685
     components:
     - pos: 83.5,45.5
@@ -111696,16 +111664,6 @@ entities:
     - pos: -11.5,8.5
       parent: 13329
       type: Transform
-  - uid: 10507
-    components:
-    - pos: 39.5,26.5
-      parent: 13329
-      type: Transform
-  - uid: 18915
-    components:
-    - pos: 27.5,64.5
-      parent: 13329
-      type: Transform
   - uid: 29244
     components:
     - pos: 87.5,22.5
@@ -111721,16 +111679,6 @@ entities:
     - pos: 77.5,25.5
       parent: 13329
       type: Transform
-  - uid: 30690
-    components:
-    - pos: 83.5,49.5
-      parent: 13329
-      type: Transform
-  - uid: 31555
-    components:
-    - pos: 64.5,51.5
-      parent: 13329
-      type: Transform
   - uid: 31713
     components:
     - pos: 8.5,20.5
@@ -111751,6 +111699,55 @@ entities:
     - pos: 41.5,40.5
       parent: 13329
       type: Transform
+- proto: DresserCaptainFilled
+  entities:
+  - uid: 13405
+    components:
+    - pos: 83.5,49.5
+      parent: 13329
+      type: Transform
+- proto: DresserChiefEngineerFilled
+  entities:
+  - uid: 26270
+    components:
+    - pos: 84.5,-16.5
+      parent: 13329
+      type: Transform
+- proto: DresserChiefMedicalOfficerFilled
+  entities:
+  - uid: 11719
+    components:
+    - pos: 27.5,64.5
+      parent: 13329
+      type: Transform
+- proto: DresserFilled
+  entities:
+  - uid: 26271
+    components:
+    - pos: 52.5,-37.5
+      parent: 13329
+      type: Transform
+- proto: DresserHeadOfPersonnelFilled
+  entities:
+  - uid: 18915
+    components:
+    - pos: 64.5,51.5
+      parent: 13329
+      type: Transform
+- proto: DresserHeadOfSecurityFilled
+  entities:
+  - uid: 10438
+    components:
+    - pos: 39.5,26.5
+      parent: 13329
+      type: Transform
+- proto: DresserQuarterMasterFilled
+  entities:
+  - uid: 10701
+    components:
+    - pos: -5.5,-23.5
+      parent: 13329
+      type: Transform
 - proto: DrinkAbsintheBottleFull
   entities:
   - uid: 1176
@@ -178254,6 +178251,7 @@ entities:
           canMix: False
           canReact: True
           maxVol: 1000
+          name: null
           reagents:
           - data: null
             ReagentId: Ale
@@ -192566,9 +192564,9 @@ entities:
       type: Transform
 - proto: SpawnMobRaccoonMorticia
   entities:
-  - uid: 11719
+  - uid: 26285
     components:
-    - pos: -5.5,-23.5
+    - pos: -5.5,-24.5
       parent: 13329
       type: Transform
 - proto: SpawnMobShiva
@@ -192599,68 +192597,6 @@ entities:
     - pos: 20.5,36.5
       parent: 13329
       type: Transform
-- proto: SpawnPointAssistant
-  entities:
-  - uid: 6981
-    components:
-    - pos: 4.5,24.5
-      parent: 13329
-      type: Transform
-  - uid: 6982
-    components:
-    - pos: 3.5,25.5
-      parent: 13329
-      type: Transform
-  - uid: 6983
-    components:
-    - pos: 3.5,26.5
-      parent: 13329
-      type: Transform
-  - uid: 6984
-    components:
-    - pos: 4.5,27.5
-      parent: 13329
-      type: Transform
-  - uid: 19210
-    components:
-    - pos: 6.5,24.5
-      parent: 13329
-      type: Transform
-  - uid: 19211
-    components:
-    - pos: 6.5,25.5
-      parent: 13329
-      type: Transform
-  - uid: 19212
-    components:
-    - pos: 6.5,26.5
-      parent: 13329
-      type: Transform
-  - uid: 19213
-    components:
-    - pos: 6.5,27.5
-      parent: 13329
-      type: Transform
-  - uid: 19214
-    components:
-    - pos: 3.5,24.5
-      parent: 13329
-      type: Transform
-  - uid: 19215
-    components:
-    - pos: 3.5,27.5
-      parent: 13329
-      type: Transform
-  - uid: 19216
-    components:
-    - pos: 4.5,25.5
-      parent: 13329
-      type: Transform
-  - uid: 19217
-    components:
-    - pos: 4.5,26.5
-      parent: 13329
-      type: Transform
 - proto: SpawnPointAtmos
   entities:
   - uid: 34619
@@ -192976,6 +192912,68 @@ entities:
     - pos: 5.5,49.5
       parent: 13329
       type: Transform
+- proto: SpawnPointPassenger
+  entities:
+  - uid: 6981
+    components:
+    - pos: 4.5,24.5
+      parent: 13329
+      type: Transform
+  - uid: 6982
+    components:
+    - pos: 3.5,25.5
+      parent: 13329
+      type: Transform
+  - uid: 6983
+    components:
+    - pos: 3.5,26.5
+      parent: 13329
+      type: Transform
+  - uid: 6984
+    components:
+    - pos: 4.5,27.5
+      parent: 13329
+      type: Transform
+  - uid: 19210
+    components:
+    - pos: 6.5,24.5
+      parent: 13329
+      type: Transform
+  - uid: 19211
+    components:
+    - pos: 6.5,25.5
+      parent: 13329
+      type: Transform
+  - uid: 19212
+    components:
+    - pos: 6.5,26.5
+      parent: 13329
+      type: Transform
+  - uid: 19213
+    components:
+    - pos: 6.5,27.5
+      parent: 13329
+      type: Transform
+  - uid: 19214
+    components:
+    - pos: 3.5,24.5
+      parent: 13329
+      type: Transform
+  - uid: 19215
+    components:
+    - pos: 3.5,27.5
+      parent: 13329
+      type: Transform
+  - uid: 19216
+    components:
+    - pos: 4.5,25.5
+      parent: 13329
+      type: Transform
+  - uid: 19217
+    components:
+    - pos: 4.5,26.5
+      parent: 13329
+      type: Transform
 - proto: SpawnPointQuartermaster
   entities:
   - uid: 11708
@@ -194417,9 +194415,9 @@ entities:
       type: Transform
 - proto: SuitStorageCE
   entities:
-  - uid: 13405
+  - uid: 10700
     components:
-    - pos: 84.5,-16.5
+    - pos: 81.5,-16.5
       parent: 13329
       type: Transform
 - proto: SuitStorageCMO
@@ -194499,9 +194497,9 @@ entities:
       type: Transform
 - proto: SuitStorageRD
   entities:
-  - uid: 10438
+  - uid: 26287
     components:
-    - pos: 52.5,-37.5
+    - pos: 52.5,-43.5
       parent: 13329
       type: Transform
 - proto: SuitStorageSec
@@ -200849,14 +200847,14 @@ entities:
       type: Transform
 - proto: TeslaGroundingRod
   entities:
-  - uid: 26285
+  - uid: 26273
     components:
-    - pos: 101.5,-13.5
+    - pos: 103.5,2.5
       parent: 13329
       type: Transform
-  - uid: 26287
+  - uid: 26274
     components:
-    - pos: 102.5,-13.5
+    - pos: 104.5,2.5
       parent: 13329
       type: Transform
   - uid: 26289
@@ -235246,27 +235244,6 @@ entities:
       type: WarpPoint
 - proto: WarpPointBombing
   entities:
-  - uid: 25021
-    components:
-    - pos: 89.5,48.5
-      parent: 13329
-      type: Transform
-    - location: Vault
-      type: WarpPoint
-  - uid: 26270
-    components:
-    - pos: 48.5,-6.5
-      parent: 13329
-      type: Transform
-    - location: Showroom
-      type: WarpPoint
-  - uid: 26271
-    components:
-    - pos: 69.5,53.5
-      parent: 13329
-      type: Transform
-    - location: Bridge Security Section
-      type: WarpPoint
   - uid: 26272
     components:
     - pos: 19.5,18.5
@@ -235274,27 +235251,6 @@ entities:
       type: Transform
     - location: Security Evidence Room
       type: WarpPoint
-  - uid: 26273
-    components:
-    - pos: -10.5,0.5
-      parent: 13329
-      type: Transform
-    - location: Arrivals Command Office
-      type: WarpPoint
-  - uid: 26274
-    components:
-    - pos: 10.5,-23.5
-      parent: 13329
-      type: Transform
-    - location: Cargo Bay
-      type: WarpPoint
-  - uid: 26313
-    components:
-    - pos: 95.5,32.5
-      parent: 13329
-      type: Transform
-    - location: Telecomms Server Room
-      type: WarpPoint
 - proto: WaterCooler
   entities:
   - uid: 4854
@@ -236199,6 +236155,11 @@ entities:
       type: Transform
 - proto: WindoorSecureChemistryLocked
   entities:
+  - uid: 11718
+    components:
+    - pos: 22.5,42.5
+      parent: 13329
+      type: Transform
   - uid: 13323
     components:
     - rot: -1.5707963267948966 rad
-- 
2.51.2