From 05ccb1ef754e4570a3d42951663d3099f5e39b26 Mon Sep 17 00:00:00 2001
From: Emisse <99158783+Emisse@users.noreply.github.com>
Date: Mon, 15 May 2023 11:27:00 -0600
Subject: [PATCH] [map] fland update (#16463)

---
 Resources/Maps/fland.yml | 555 +++++++++++++++------------------------
 1 file changed, 207 insertions(+), 348 deletions(-)

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