[map] fland update (#16463)

diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml
index 2f99078866606ea4397780968425a09b0c9d1ca5..f3700be1aba966378c2045ebb8d617d792114b17 100644 (file)
--- a/Resources/Maps/fland.yml
+++ b/Resources/Maps/fland.yml
@@ -13433,7 +13433,8 @@ entities:
             0: 65535\r
           10,2:\r
             0: 24063\r
-            1: 41472\r
+            1: 8704\r
+            4: 32768\r
           10,3:\r
             0: 65535\r
           11,0:\r
@@ -15828,7 +15829,7 @@ entities:
       type: EmitSoundOnCollide\r
   - uid: 26234\r
     components:\r
-    - pos: 84.47075,-16.414703\r
+    - pos: 86.510315,-15.505127\r
       parent: 13329\r
       type: Transform\r
 - proto: AdvancedCapacitorStockPart\r
@@ -27622,18 +27623,6 @@ entities:
     - pos: -23.5,33.5\r
       parent: 13329\r
       type: Transform\r
-- proto: BigBox\r
-  entities:\r
-  - uid: 11622\r
-    components:\r
-    - pos: 1.5244677,-12.530432\r
-      parent: 13329\r
-      type: Transform\r
-  - uid: 31744\r
-    components:\r
-    - pos: 8.478264,30.481892\r
-      parent: 13329\r
-      type: Transform\r
 - proto: BaseComputer\r
   entities:\r
   - uid: 6358\r
@@ -27642,11 +27631,6 @@ entities:
       pos: -19.5,57.5\r
       parent: 13329\r
       type: Transform\r
-  - uid: 15468\r
-    components:\r
-    - pos: 52.5,-37.5\r
-      parent: 13329\r
-      type: Transform\r
   - uid: 15487\r
     components:\r
     - rot: 3.141592653589793 rad\r
@@ -28273,6 +28257,18 @@ entities:
     - pos: 99.5,21.5\r
       parent: 13329\r
       type: Transform\r
+- proto: BigBox\r
+  entities:\r
+  - uid: 11622\r
+    components:\r
+    - pos: 1.5244677,-12.530432\r
+      parent: 13329\r
+      type: Transform\r
+  - uid: 31744\r
+    components:\r
+    - pos: 8.478264,30.481892\r
+      parent: 13329\r
+      type: Transform\r
 - proto: BikeHorn\r
   entities:\r
   - uid: 1125\r
@@ -65338,12 +65334,12 @@ entities:
       type: Transform\r
   - uid: 26653\r
     components:\r
-    - pos: 71.36571,-6.368813\r
+    - pos: 70.38797,-5.207547\r
       parent: 13329\r
       type: Transform\r
   - uid: 26654\r
     components:\r
-    - pos: 71.36571,-6.368813\r
+    - pos: 70.38797,-5.207547\r
       parent: 13329\r
       type: Transform\r
   - uid: 31794\r
@@ -86964,12 +86960,12 @@ entities:
   entities:\r
   - uid: 26657\r
     components:\r
-    - pos: 71.61571,-6.665688\r
+    - pos: 70.41922,-5.770047\r
       parent: 13329\r
       type: Transform\r
   - uid: 26658\r
     components:\r
-    - pos: 71.61571,-6.665688\r
+    - pos: 70.41922,-5.770047\r
       parent: 13329\r
       type: Transform\r
 - proto: CableMV\r
@@ -102994,12 +102990,12 @@ entities:
   entities:\r
   - uid: 26655\r
     components:\r
-    - pos: 71.47508,-6.540688\r
+    - pos: 70.434845,-5.441922\r
       parent: 13329\r
       type: Transform\r
   - uid: 26656\r
     components:\r
-    - pos: 71.47508,-6.540688\r
+    - pos: 70.434845,-5.441922\r
       parent: 13329\r
       type: Transform\r
   - uid: 33810\r
@@ -115271,6 +115267,10 @@ entities:
           occludes: True\r
           ents:\r
           - 31689\r
+        paper_label: !type:ContainerSlot\r
+          showEnts: False\r
+          occludes: True\r
+          ent: null\r
       type: ContainerContainer\r
   - uid: 33952\r
     components:\r
@@ -115343,29 +115343,6 @@ entities:
         - 0\r
         - 0\r
       type: EntityStorage\r
-  - uid: 10602\r
-    components:\r
-    - pos: 17.5,9.5\r
-      parent: 13329\r
-      type: Transform\r
-    - air:\r
-        volume: 200\r
-        immutable: False\r
-        temperature: 293.1495\r
-        moles:\r
-        - 1.8541656\r
-        - 6.9751945\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-      type: EntityStorage\r
   - uid: 15366\r
     components:\r
     - pos: 51.5,-32.5\r
@@ -117542,29 +117519,11 @@ entities:
         - 0\r
         - 0\r
       type: EntityStorage\r
-  - uid: 10606\r
+  - uid: 13391\r
     components:\r
-    - pos: 16.5,9.5\r
+    - pos: 16.5,15.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
   - uid: 18692\r
     components:\r
     - pos: 23.5,55.5\r
@@ -119632,36 +119591,6 @@ entities:
     - pos: 53.29546,-42.48607\r
       parent: 13329\r
       type: Transform\r
-  - uid: 16655\r
-    components:\r
-    - pos: 47.5,44.5\r
-      parent: 13329\r
-      type: Transform\r
-  - uid: 16656\r
-    components:\r
-    - pos: 48.5,44.5\r
-      parent: 13329\r
-      type: Transform\r
-  - uid: 16657\r
-    components:\r
-    - pos: 49.5,44.5\r
-      parent: 13329\r
-      type: Transform\r
-  - uid: 16658\r
-    components:\r
-    - pos: 49.5,42.5\r
-      parent: 13329\r
-      type: Transform\r
-  - uid: 16659\r
-    components:\r
-    - pos: 48.5,42.5\r
-      parent: 13329\r
-      type: Transform\r
-  - uid: 16660\r
-    components:\r
-    - pos: 47.5,42.5\r
-      parent: 13329\r
-      type: Transform\r
   - uid: 34626\r
     components:\r
     - pos: 36.680786,68.70615\r
@@ -120147,36 +120076,6 @@ entities:
     - pos: 53.592335,-42.45482\r
       parent: 13329\r
       type: Transform\r
-  - uid: 16649\r
-    components:\r
-    - pos: 47.5,42.5\r
-      parent: 13329\r
-      type: Transform\r
-  - uid: 16650\r
-    components:\r
-    - pos: 48.5,42.5\r
-      parent: 13329\r
-      type: Transform\r
-  - uid: 16651\r
-    components:\r
-    - pos: 49.5,42.5\r
-      parent: 13329\r
-      type: Transform\r
-  - uid: 16652\r
-    components:\r
-    - pos: 49.5,44.5\r
-      parent: 13329\r
-      type: Transform\r
-  - uid: 16653\r
-    components:\r
-    - pos: 48.5,44.5\r
-      parent: 13329\r
-      type: Transform\r
-  - uid: 16654\r
-    components:\r
-    - pos: 47.5,44.5\r
-      parent: 13329\r
-      type: Transform\r
   - uid: 34205\r
     components:\r
     - pos: 36.407623,68.61223\r
@@ -120204,24 +120103,6 @@ entities:
     - pos: 38.607784,12.508771\r
       parent: 13329\r
       type: Transform\r
-  - uid: 10604\r
-    components:\r
-    - flags: InContainer\r
-      type: MetaData\r
-    - parent: 10603\r
-      type: Transform\r
-    - canCollide: False\r
-      type: Physics\r
-    - type: InsideEntityStorage\r
-  - uid: 10605\r
-    components:\r
-    - flags: InContainer\r
-      type: MetaData\r
-    - parent: 10603\r
-      type: Transform\r
-    - canCollide: False\r
-      type: Physics\r
-    - type: InsideEntityStorage\r
 - proto: ClothingOuterPonchoClassic\r
   entities:\r
   - uid: 32178\r
@@ -189540,17 +189421,6 @@ entities:
     - pos: 52.65521,42.350925\r
       parent: 13329\r
       type: Transform\r
-- proto: JetpackSecurityFilled\r
-  entities:\r
-  - uid: 10690\r
-    components:\r
-    - flags: InContainer\r
-      type: MetaData\r
-    - parent: 10603\r
-      type: Transform\r
-    - canCollide: False\r
-      type: Physics\r
-    - type: InsideEntityStorage\r
 - proto: KitchenKnife\r
   entities:\r
   - uid: 4792\r
@@ -190717,29 +190587,6 @@ entities:
         - 0\r
         - 0\r
       type: EntityStorage\r
-  - uid: 27103\r
-    components:\r
-    - pos: 74.5,-5.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
   - uid: 27104\r
     components:\r
     - pos: 85.5,3.5\r
@@ -191279,6 +191126,10 @@ entities:
           occludes: True\r
           ents:\r
           - 4791\r
+        paper_label: !type:ContainerSlot\r
+          showEnts: False\r
+          occludes: True\r
+          ent: null\r
       type: ContainerContainer\r
   - uid: 30732\r
     components:\r
@@ -191311,6 +191162,10 @@ entities:
           - 30733\r
           - 30734\r
           - 30735\r
+        paper_label: !type:ContainerSlot\r
+          showEnts: False\r
+          occludes: True\r
+          ent: null\r
       type: ContainerContainer\r
   - uid: 34116\r
     components:\r
@@ -192060,29 +191915,6 @@ entities:
         - 0\r
         - 0\r
       type: EntityStorage\r
-  - uid: 10689\r
-    components:\r
-    - pos: 16.5,15.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
   - uid: 11813\r
     components:\r
     - pos: 13.5,-10.5\r
@@ -192152,40 +191984,6 @@ entities:
         - 0\r
         - 0\r
       type: EntityStorage\r
-- proto: LockerSyndicatePersonal\r
-  entities:\r
-  - uid: 10603\r
-    components:\r
-    - pos: 18.5,9.5\r
-      parent: 13329\r
-      type: Transform\r
-    - air:\r
-        volume: 200\r
-        immutable: False\r
-        temperature: 293.1495\r
-        moles:\r
-        - 1.8541656\r
-        - 6.9751945\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-        - 0\r
-      type: EntityStorage\r
-    - containers:\r
-        entity_storage: !type:Container\r
-          showEnts: False\r
-          occludes: True\r
-          ents:\r
-          - 10690\r
-          - 10605\r
-          - 10604\r
-      type: ContainerContainer\r
 - proto: LockerWallMedicalFilled\r
   entities:\r
   - uid: 18856\r
@@ -196786,11 +196584,6 @@ entities:
     - pos: 5.527132,-18.789473\r
       parent: 13329\r
       type: Transform\r
-  - uid: 18465\r
-    components:\r
-    - pos: 25.5,38.5\r
-      parent: 13329\r
-      type: Transform\r
   - uid: 18769\r
     components:\r
     - pos: 0.5,64.5\r
@@ -203086,36 +202879,6 @@ entities:
     - pos: 53.5,-42.5\r
       parent: 13329\r
       type: Transform\r
-  - uid: 16625\r
-    components:\r
-    - pos: 49.5,44.5\r
-      parent: 13329\r
-      type: Transform\r
-  - uid: 16626\r
-    components:\r
-    - pos: 48.5,44.5\r
-      parent: 13329\r
-      type: Transform\r
-  - uid: 16627\r
-    components:\r
-    - pos: 47.5,44.5\r
-      parent: 13329\r
-      type: Transform\r
-  - uid: 16628\r
-    components:\r
-    - pos: 47.5,42.5\r
-      parent: 13329\r
-      type: Transform\r
-  - uid: 16629\r
-    components:\r
-    - pos: 48.5,42.5\r
-      parent: 13329\r
-      type: Transform\r
-  - uid: 16630\r
-    components:\r
-    - pos: 49.5,42.5\r
-      parent: 13329\r
-      type: Transform\r
   - uid: 16631\r
     components:\r
     - pos: 51.5,42.5\r
@@ -203274,21 +203037,6 @@ entities:
     - pos: 61.5,2.5\r
       parent: 13329\r
       type: Transform\r
-  - uid: 26647\r
-    components:\r
-    - pos: 71.5,-6.5\r
-      parent: 13329\r
-      type: Transform\r
-  - uid: 26648\r
-    components:\r
-    - pos: 72.5,-6.5\r
-      parent: 13329\r
-      type: Transform\r
-  - uid: 26649\r
-    components:\r
-    - pos: 73.5,-6.5\r
-      parent: 13329\r
-      type: Transform\r
   - uid: 26910\r
     components:\r
     - pos: 78.5,3.5\r
@@ -203340,12 +203088,6 @@ entities:
     - pos: 68.5,29.5\r
       parent: 13329\r
       type: Transform\r
-  - uid: 30704\r
-    components:\r
-    - rot: -1.5707963267948966 rad\r
-      pos: 81.5,51.5\r
-      parent: 13329\r
-      type: Transform\r
   - uid: 31478\r
     components:\r
     - pos: 74.5,50.5\r
@@ -210693,13 +210435,6 @@ entities:
     - pos: -19.486994,10.281514\r
       parent: 13329\r
       type: Transform\r
-- proto: RollerBedSpawnFolded\r
-  entities:\r
-  - uid: 18924\r
-    components:\r
-    - pos: 26.510408,60.60737\r
-      parent: 13329\r
-      type: Transform\r
 - proto: RPED\r
   entities:\r
   - uid: 22919\r
@@ -210926,12 +210661,12 @@ entities:
   entities:\r
   - uid: 26661\r
     components:\r
-    - pos: 73.53758,-6.446938\r
+    - pos: 70.528496,-6.5157475\r
       parent: 13329\r
       type: Transform\r
   - uid: 26662\r
     components:\r
-    - pos: 73.53758,-6.446938\r
+    - pos: 70.528496,-6.5157475\r
       parent: 13329\r
       type: Transform\r
 - proto: SheetSteel\r
@@ -211003,12 +210738,12 @@ entities:
       type: Transform\r
   - uid: 26659\r
     components:\r
-    - pos: 72.55321,-6.478188\r
+    - pos: 70.466095,-5.957547\r
       parent: 13329\r
       type: Transform\r
   - uid: 26660\r
     components:\r
-    - pos: 72.55321,-6.478188\r
+    - pos: 70.466095,-5.957547\r
       parent: 13329\r
       type: Transform\r
   - uid: 26685\r
@@ -218986,6 +218721,150 @@ entities:
     - pos: 58.550472,-1.506892\r
       parent: 13329\r
       type: Transform\r
+- proto: SuitStorageAtmos\r
+  entities:\r
+  - uid: 13439\r
+    components:\r
+    - pos: 77.5,-24.5\r
+      parent: 13329\r
+      type: Transform\r
+  - uid: 13440\r
+    components:\r
+    - pos: 77.5,-23.5\r
+      parent: 13329\r
+      type: Transform\r
+- proto: SuitStorageCaptain\r
+  entities:\r
+  - uid: 13402\r
+    components:\r
+    - pos: 81.5,51.5\r
+      parent: 13329\r
+      type: Transform\r
+- proto: SuitStorageCE\r
+  entities:\r
+  - uid: 13405\r
+    components:\r
+    - pos: 84.5,-16.5\r
+      parent: 13329\r
+      type: Transform\r
+- proto: SuitStorageCMO\r
+  entities:\r
+  - uid: 13403\r
+    components:\r
+    - pos: 26.5,60.5\r
+      parent: 13329\r
+      type: Transform\r
+- proto: SuitStorageEngi\r
+  entities:\r
+  - uid: 10690\r
+    components:\r
+    - pos: 74.5,-5.5\r
+      parent: 13329\r
+      type: Transform\r
+  - uid: 13396\r
+    components:\r
+    - pos: 73.5,-6.5\r
+      parent: 13329\r
+      type: Transform\r
+  - uid: 13397\r
+    components:\r
+    - pos: 72.5,-6.5\r
+      parent: 13329\r
+      type: Transform\r
+  - uid: 13398\r
+    components:\r
+    - pos: 71.5,-6.5\r
+      parent: 13329\r
+      type: Transform\r
+- proto: SuitStorageEVA\r
+  entities:\r
+  - uid: 10603\r
+    components:\r
+    - pos: 49.5,42.5\r
+      parent: 13329\r
+      type: Transform\r
+  - uid: 10604\r
+    components:\r
+    - pos: 47.5,44.5\r
+      parent: 13329\r
+      type: Transform\r
+  - uid: 10605\r
+    components:\r
+    - pos: 47.5,42.5\r
+      parent: 13329\r
+      type: Transform\r
+  - uid: 10606\r
+    components:\r
+    - pos: 49.5,44.5\r
+      parent: 13329\r
+      type: Transform\r
+  - uid: 13393\r
+    components:\r
+    - pos: 48.5,42.5\r
+      parent: 13329\r
+      type: Transform\r
+  - uid: 13394\r
+    components:\r
+    - pos: 48.5,44.5\r
+      parent: 13329\r
+      type: Transform\r
+- proto: SuitStorageEVAPrisoner\r
+  entities:\r
+  - uid: 13404\r
+    components:\r
+    - pos: 46.5,11.5\r
+      parent: 13329\r
+      type: Transform\r
+- proto: SuitStorageHOS\r
+  entities:\r
+  - uid: 13438\r
+    components:\r
+    - pos: 35.5,16.5\r
+      parent: 13329\r
+      type: Transform\r
+- proto: SuitStorageRD\r
+  entities:\r
+  - uid: 10438\r
+    components:\r
+    - pos: 52.5,-37.5\r
+      parent: 13329\r
+      type: Transform\r
+- proto: SuitStorageSalv\r
+  entities:\r
+  - uid: 13459\r
+    components:\r
+    - pos: 14.5,-29.5\r
+      parent: 13329\r
+      type: Transform\r
+  - uid: 13460\r
+    components:\r
+    - pos: 15.5,-29.5\r
+      parent: 13329\r
+      type: Transform\r
+  - uid: 13461\r
+    components:\r
+    - pos: 16.5,-29.5\r
+      parent: 13329\r
+      type: Transform\r
+- proto: SuitStorageSec\r
+  entities:\r
+  - uid: 10602\r
+    components:\r
+    - pos: 16.5,9.5\r
+      parent: 13329\r
+      type: Transform\r
+  - uid: 10689\r
+    components:\r
+    - pos: 17.5,9.5\r
+      parent: 13329\r
+      type: Transform\r
+- proto: SuitStorageWarden\r
+  entities:\r
+  - uid: 10525\r
+    components:\r
+    - pos: 18.5,9.5\r
+      parent: 13329\r
+      type: Transform\r
 - proto: SurveillanceCameraCommand\r
   entities:\r
   - uid: 10985\r
@@ -221058,11 +220937,6 @@ entities:
     - pos: 41.5,9.5\r
       parent: 13329\r
       type: Transform\r
-  - uid: 10438\r
-    components:\r
-    - pos: 46.5,11.5\r
-      parent: 13329\r
-      type: Transform\r
   - uid: 10439\r
     components:\r
     - pos: 51.5,9.5\r
@@ -224525,11 +224399,6 @@ entities:
       pos: 86.5,-15.5\r
       parent: 13329\r
       type: Transform\r
-  - uid: 26233\r
-    components:\r
-    - pos: 84.5,-16.5\r
-      parent: 13329\r
-      type: Transform\r
   - uid: 26510\r
     components:\r
     - pos: 76.5,-10.5\r
@@ -226530,6 +226399,17 @@ entities:
     - pos: 25.5,41.5\r
       parent: 13329\r
       type: Transform\r
+- proto: VendingMachineChemicals\r
+  entities:\r
+  - uid: 13392\r
+    components:\r
+    - flags: SessionSpecific\r
+      type: MetaData\r
+    - pos: 25.5,38.5\r
+      parent: 13329\r
+      type: Transform\r
+    - nextEmpEject: 378.0880196\r
+      type: VendingMachine\r
 - proto: VendingMachineCigs\r
   entities:\r
   - uid: 1145\r
@@ -226581,13 +226461,6 @@ entities:
     - pos: 47.5,25.5\r
       parent: 13329\r
       type: Transform\r
-  - uid: 10525\r
-    components:\r
-    - flags: SessionSpecific\r
-      type: MetaData\r
-    - pos: 35.5,16.5\r
-      parent: 13329\r
-      type: Transform\r
   - uid: 13153\r
     components:\r
     - flags: SessionSpecific\r
@@ -227016,6 +226889,17 @@ entities:
     - pos: 27.5,-27.5\r
       parent: 13329\r
       type: Transform\r
+- proto: VendingMachineRobotics\r
+  entities:\r
+  - uid: 13395\r
+    components:\r
+    - flags: SessionSpecific\r
+      type: MetaData\r
+    - pos: 33.5,-19.5\r
+      parent: 13329\r
+      type: Transform\r
+    - nextEmpEject: 350.5145517\r
+      type: VendingMachine\r
 - proto: VendingMachineSalvage\r
   entities:\r
   - uid: 11650\r
@@ -249986,31 +249870,6 @@ entities:
     - pos: 37.5,8.5\r
       parent: 13329\r
       type: Transform\r
-- proto: WardrobeAtmospherics\r
-  entities:\r
-  - uid: 32205\r
-    components:\r
-    - pos: 77.5,-24.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: WardrobeBlackFilled\r
   entities:\r
   - uid: 29207\r
@@ -250524,8 +250383,8 @@ entities:
         immutable: False\r
         temperature: 293.1495\r
         moles:\r
-        - 3.0981817\r
-        - 11.655066\r
+        - 1.8541656\r
+        - 6.9751945\r
         - 0\r
         - 0\r
         - 0\r