fland update (#23360)

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