From: Emisse <99158783+Emisse@users.noreply.github.com>
Date: Tue, 2 Jan 2024 23:58:41 +0000 (-0700)
Subject: fland update (#23400)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=10ccdf91d0513fd92ecb131f2af782da5fa1054d;p=space-station-14.git

fland update (#23400)
---

diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml
index 07f22d2544..fbd2ed4af6 100644
--- a/Resources/Maps/fland.yml
+++ b/Resources/Maps/fland.yml
@@ -17041,7 +17041,6 @@ entities:
       - 25004
       - 25944
       - 23661
-      - 23792
       type: DeviceList
     - joinedGrid: 13329
       type: AtmosDevice
@@ -100266,29 +100265,6 @@ entities:
       type: Transform
 - proto: CrateEngineeringAMEJar
   entities:
-  - uid: 23453
-    components:
-    - pos: 83.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: 26563
     components:
     - pos: 74.5,-1.5
@@ -111720,13 +111696,6 @@ entities:
     - 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
@@ -111748,6 +111717,13 @@ entities:
     - pos: -5.5,-23.5
       parent: 13329
       type: Transform
+- proto: DresserResearchDirectorFilled
+  entities:
+  - uid: 23453
+    components:
+    - pos: 52.5,-37.5
+      parent: 13329
+      type: Transform
 - proto: DrinkAbsintheBottleFull
   entities:
   - uid: 1176
@@ -118268,21 +118244,6 @@ entities:
       type: Transform
     - joinedGrid: 13329
       type: AtmosDevice
-  - uid: 23670
-    components:
-    - name: Air Mixer
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 76.5,-35.5
-      parent: 13329
-      type: Transform
-    - inletTwoConcentration: 0.22000003
-      inletOneConcentration: 0.78
-      type: GasMixer
-    - joinedGrid: 13329
-      type: AtmosDevice
-    - color: '#03FCD3FF'
-      type: AtmosPipeColor
 - proto: GasOutletInjector
   entities:
   - uid: 5631
@@ -120052,25 +120013,14 @@ entities:
       type: Transform
     - color: '#FF1212FF'
       type: AtmosPipeColor
-  - uid: 23667
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 72.5,-35.5
-      parent: 13329
-      type: Transform
-  - uid: 23678
-    components:
-    - pos: 78.5,-35.5
-      parent: 13329
-      type: Transform
-    - color: '#03FCD3FF'
-      type: AtmosPipeColor
-  - uid: 23680
+  - uid: 23665
     components:
     - rot: -1.5707963267948966 rad
-      pos: 77.5,-38.5
+      pos: 80.5,-32.5
       parent: 13329
       type: Transform
+    - color: '#0335FCFF'
+      type: AtmosPipeColor
   - uid: 23696
     components:
     - rot: -1.5707963267948966 rad
@@ -120095,30 +120045,6 @@ entities:
       type: Transform
     - color: '#FF1212FF'
       type: AtmosPipeColor
-  - uid: 23719
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 81.5,-38.5
-      parent: 13329
-      type: Transform
-    - color: '#03FCD3FF'
-      type: AtmosPipeColor
-  - uid: 23736
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 83.5,-35.5
-      parent: 13329
-      type: Transform
-    - color: '#0335FCFF'
-      type: AtmosPipeColor
-  - uid: 23737
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 81.5,-35.5
-      parent: 13329
-      type: Transform
-    - color: '#03FCD3FF'
-      type: AtmosPipeColor
   - uid: 23738
     components:
     - rot: 1.5707963267948966 rad
@@ -120164,6 +120090,8 @@ entities:
       pos: 79.5,-29.5
       parent: 13329
       type: Transform
+    - color: '#FF1212FF'
+      type: AtmosPipeColor
   - uid: 23833
     components:
     - pos: 101.5,-35.5
@@ -141926,12 +141854,6 @@ entities:
       type: Transform
     - color: '#FF1212FF'
       type: AtmosPipeColor
-  - uid: 23662
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 72.5,-38.5
-      parent: 13329
-      type: Transform
   - uid: 23663
     components:
     - rot: 3.141592653589793 rad
@@ -141940,50 +141862,26 @@ entities:
       type: Transform
     - color: '#FF1212FF'
       type: AtmosPipeColor
-  - uid: 23671
+  - uid: 23667
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 74.5,-35.5
+    - pos: 80.5,-29.5
       parent: 13329
       type: Transform
-    - color: '#03FCD3FF'
+    - color: '#0335FCFF'
       type: AtmosPipeColor
-  - uid: 23672
+  - uid: 23668
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 75.5,-35.5
+    - pos: 80.5,-30.5
       parent: 13329
       type: Transform
-    - color: '#03FCD3FF'
+    - color: '#0335FCFF'
       type: AtmosPipeColor
   - uid: 23673
     components:
-    - pos: 76.5,-36.5
-      parent: 13329
-      type: Transform
-  - uid: 23674
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 77.5,-35.5
-      parent: 13329
-      type: Transform
-    - color: '#03FCD3FF'
-      type: AtmosPipeColor
-  - uid: 23675
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 78.5,-36.5
-      parent: 13329
-      type: Transform
-    - color: '#03FCD3FF'
-      type: AtmosPipeColor
-  - uid: 23676
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 78.5,-37.5
+    - pos: 80.5,-31.5
       parent: 13329
       type: Transform
-    - color: '#03FCD3FF'
+    - color: '#0335FCFF'
       type: AtmosPipeColor
   - uid: 23682
     components:
@@ -142015,22 +141913,6 @@ entities:
       pos: 90.5,-41.5
       parent: 13329
       type: Transform
-  - uid: 23720
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 81.5,-37.5
-      parent: 13329
-      type: Transform
-    - color: '#03FCD3FF'
-      type: AtmosPipeColor
-  - uid: 23721
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 81.5,-36.5
-      parent: 13329
-      type: Transform
-    - color: '#03FCD3FF'
-      type: AtmosPipeColor
   - uid: 23722
     components:
     - rot: 1.5707963267948966 rad
@@ -142075,49 +141957,6 @@ entities:
       type: Transform
     - color: '#0335FCFF'
       type: AtmosPipeColor
-  - uid: 23729
-    components:
-    - pos: 83.5,-29.5
-      parent: 13329
-      type: Transform
-    - color: '#0335FCFF'
-      type: AtmosPipeColor
-  - uid: 23730
-    components:
-    - pos: 83.5,-30.5
-      parent: 13329
-      type: Transform
-    - color: '#0335FCFF'
-      type: AtmosPipeColor
-  - uid: 23731
-    components:
-    - pos: 83.5,-31.5
-      parent: 13329
-      type: Transform
-    - color: '#0335FCFF'
-      type: AtmosPipeColor
-  - uid: 23733
-    components:
-    - pos: 83.5,-33.5
-      parent: 13329
-      type: Transform
-    - color: '#0335FCFF'
-      type: AtmosPipeColor
-  - uid: 23734
-    components:
-    - pos: 83.5,-34.5
-      parent: 13329
-      type: Transform
-    - color: '#0335FCFF'
-      type: AtmosPipeColor
-  - uid: 23743
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 80.5,-28.5
-      parent: 13329
-      type: Transform
-    - color: '#0335FCFF'
-      type: AtmosPipeColor
   - uid: 23744
     components:
     - rot: -1.5707963267948966 rad
@@ -142392,30 +142231,6 @@ entities:
       type: Transform
     - color: '#FF1212FF'
       type: AtmosPipeColor
-  - uid: 23789
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 82.5,-32.5
-      parent: 13329
-      type: Transform
-    - color: '#0335FCFF'
-      type: AtmosPipeColor
-  - uid: 23790
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 81.5,-32.5
-      parent: 13329
-      type: Transform
-    - color: '#0335FCFF'
-      type: AtmosPipeColor
-  - uid: 23791
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 80.5,-32.5
-      parent: 13329
-      type: Transform
-    - color: '#0335FCFF'
-      type: AtmosPipeColor
   - uid: 23821
     components:
     - rot: 1.5707963267948966 rad
@@ -151621,18 +151436,13 @@ entities:
       type: Transform
     - color: '#FF1212FF'
       type: AtmosPipeColor
-  - uid: 23666
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 72.5,-36.5
-      parent: 13329
-      type: Transform
-  - uid: 23679
+  - uid: 23670
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 76.5,-38.5
+    - pos: 80.5,-28.5
       parent: 13329
       type: Transform
+    - color: '#0335FCFF'
+      type: AtmosPipeColor
   - uid: 23681
     components:
     - rot: 1.5707963267948966 rad
@@ -151641,14 +151451,6 @@ entities:
       type: Transform
     - color: '#FF1212FF'
       type: AtmosPipeColor
-  - uid: 23685
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 80.5,-38.5
-      parent: 13329
-      type: Transform
-    - color: '#03FCD3FF'
-      type: AtmosPipeColor
   - uid: 23701
     components:
     - rot: 3.141592653589793 rad
@@ -151665,14 +151467,6 @@ entities:
       type: Transform
     - color: '#0335FCFF'
       type: AtmosPipeColor
-  - uid: 23732
-    components:
-    - rot: -1.5707963267948966 rad
-      pos: 83.5,-32.5
-      parent: 13329
-      type: Transform
-    - color: '#0335FCFF'
-      type: AtmosPipeColor
   - uid: 23741
     components:
     - rot: 3.141592653589793 rad
@@ -152869,72 +152663,54 @@ entities:
       type: AtmosDevice
     - color: '#FF1212FF'
       type: AtmosPipeColor
-  - uid: 23664
+  - uid: 23662
     components:
-    - name: Nitro Pump
-      type: MetaData
     - rot: 3.141592653589793 rad
-      pos: 72.5,-37.5
+      pos: 72.5,-38.5
       parent: 13329
       type: Transform
     - joinedGrid: 13329
       type: AtmosDevice
-  - uid: 23665
+  - uid: 23664
     components:
-    - name: Oxygen to Air Mixer
-      type: MetaData
-    - rot: 3.141592653589793 rad
-      pos: 76.5,-37.5
+    - pos: 70.5,-38.5
       parent: 13329
       type: Transform
     - joinedGrid: 13329
       type: AtmosDevice
-  - uid: 23668
+  - uid: 23666
     components:
-    - name: Nitro to Mix
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 73.5,-36.5
+    - rot: 3.141592653589793 rad
+      pos: 83.5,-29.5
       parent: 13329
       type: Transform
     - joinedGrid: 13329
       type: AtmosDevice
-    - color: '#947507FF'
+    - color: '#0335FCFF'
       type: AtmosPipeColor
   - uid: 23669
     components:
-    - name: Nitro to Air Mixer
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 73.5,-35.5
+    - pos: 74.5,-38.5
       parent: 13329
       type: Transform
     - joinedGrid: 13329
       type: AtmosDevice
-    - color: '#03FCD3FF'
-      type: AtmosPipeColor
-  - uid: 23684
+  - uid: 23672
     components:
-    - name: Oxygen to Mix
-      type: MetaData
     - rot: 3.141592653589793 rad
-      pos: 77.5,-37.5
+      pos: 76.5,-38.5
       parent: 13329
       type: Transform
     - joinedGrid: 13329
       type: AtmosDevice
-  - uid: 23686
+  - uid: 23674
     components:
-    - name: Air to Mix
-      type: MetaData
     - rot: 3.141592653589793 rad
-      pos: 80.5,-37.5
+      pos: 80.5,-38.5
       parent: 13329
       type: Transform
     - joinedGrid: 13329
       type: AtmosDevice
-    - color: '#03FCD3FF'
-      type: AtmosPipeColor
   - uid: 23700
     components:
     - name: CO2 Pump
@@ -152961,6 +152737,8 @@ entities:
       type: Transform
     - joinedGrid: 13329
       type: AtmosDevice
+    - color: '#FF1212FF'
+      type: AtmosPipeColor
   - uid: 23709
     components:
     - name: H2O Pump
@@ -153007,18 +152785,6 @@ entities:
       type: AtmosDevice
     - color: '#03FCD3FF'
       type: AtmosPipeColor
-  - uid: 23735
-    components:
-    - name: Distro Pump
-      type: MetaData
-    - rot: 1.5707963267948966 rad
-      pos: 82.5,-35.5
-      parent: 13329
-      type: Transform
-    - joinedGrid: 13329
-      type: AtmosDevice
-    - color: '#0335FCFF'
-      type: AtmosPipeColor
   - uid: 23817
     components:
     - rot: -1.5707963267948966 rad
@@ -153027,6 +152793,8 @@ entities:
       type: Transform
     - joinedGrid: 13329
       type: AtmosDevice
+    - color: '#FF1212FF'
+      type: AtmosPipeColor
   - uid: 23838
     components:
     - rot: -1.5707963267948966 rad
@@ -153035,6 +152803,8 @@ entities:
       type: Transform
     - joinedGrid: 13329
       type: AtmosDevice
+    - color: '#FF1212FF'
+      type: AtmosPipeColor
   - uid: 23861
     components:
     - name: Mixer Out Pump
@@ -154911,7 +154681,7 @@ entities:
       type: AtmosDevice
     - color: '#0335FCFF'
       type: AtmosPipeColor
-  - uid: 23792
+  - uid: 23671
     components:
     - rot: 1.5707963267948966 rad
       pos: 79.5,-32.5
@@ -170172,32 +169942,36 @@ entities:
     - pos: 29.527367,-48.423893
       parent: 13329
       type: Transform
-- proto: ParticleAcceleratorControlBoxUnfinished
+- proto: ParticleAcceleratorControlBox
   entities:
-  - uid: 23875
+  - uid: 23675
     components:
-    - pos: 98.5,-8.5
+    - rot: 1.5707963267948966 rad
+      pos: 95.5,-6.5
       parent: 13329
       type: Transform
 - proto: ParticleAcceleratorEmitterForeUnfinished
   entities:
-  - uid: 23881
+  - uid: 23680
     components:
-    - pos: 96.5,-8.5
+    - rot: 1.5707963267948966 rad
+      pos: 97.5,-5.5
       parent: 13329
       type: Transform
 - proto: ParticleAcceleratorEmitterPortUnfinished
   entities:
-  - uid: 23882
+  - uid: 23679
     components:
-    - pos: 97.5,-8.5
+    - rot: 1.5707963267948966 rad
+      pos: 97.5,-4.5
       parent: 13329
       type: Transform
 - proto: ParticleAcceleratorEmitterStarboardUnfinished
   entities:
-  - uid: 23884
+  - uid: 23676
     components:
-    - pos: 95.5,-8.5
+    - rot: 1.5707963267948966 rad
+      pos: 97.5,-6.5
       parent: 13329
       type: Transform
 - proto: ParticleAcceleratorEndCapUnfinished
@@ -170218,9 +169992,10 @@ entities:
       type: Transform
 - proto: ParticleAcceleratorPowerBoxUnfinished
   entities:
-  - uid: 23874
+  - uid: 23678
     components:
-    - pos: 97.5,-2.5
+    - rot: 1.5707963267948966 rad
+      pos: 96.5,-5.5
       parent: 13329
       type: Transform
 - proto: PartRodMetal