From 2031d57ce0d2469055b655b715c20e54a9aa03ec Mon Sep 17 00:00:00 2001
From: Emisse <99158783+Emisse@users.noreply.github.com>
Date: Tue, 3 Sep 2024 14:05:52 -0600
Subject: [PATCH] fland update (#31803)

* fland update

* ore boxes cuz tstalker wantrs them
---
 Resources/Maps/fland.yml            | 365 +++++++++++++++++++---------
 Resources/Prototypes/Maps/fland.yml |   4 +-
 2 files changed, 257 insertions(+), 112 deletions(-)

diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml
index dcff4b5713..89f42a6349 100644
--- a/Resources/Maps/fland.yml
+++ b/Resources/Maps/fland.yml
@@ -1092,6 +1092,8 @@ entities:
             8115: 76,-4
             8656: 87,-20
             8727: -13,35
+            8730: 17,-31
+            8731: 16,-31
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -4498,6 +4500,8 @@ entities:
             7933: 22,-23
             8144: 22,7
             8611: -11,8
+            8728: 19,-31
+            8729: 18,-31
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -21329,6 +21333,13 @@ entities:
     - type: Transform
       pos: 41.59153,-33.7406
       parent: 13329
+- proto: AntimovCircuitBoard
+  entities:
+  - uid: 35743
+    components:
+    - type: Transform
+      pos: 107.49631,52.741814
+      parent: 13329
 - proto: AntiPoisonMedipen
   entities:
   - uid: 35283
@@ -22262,6 +22273,13 @@ entities:
     - type: Transform
       pos: -14.5,27.5
       parent: 13329
+- proto: ArtistCircuitBoard
+  entities:
+  - uid: 35744
+    components:
+    - type: Transform
+      pos: 107.54318,52.53869
+      parent: 13329
 - proto: Ash
   entities:
   - uid: 12138
@@ -22282,6 +22300,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: -14.295727,0.49568367
       parent: 13329
+- proto: AsimovCircuitBoard
+  entities:
+  - uid: 35742
+    components:
+    - type: Transform
+      pos: 108.57443,52.554314
+      parent: 13329
 - proto: AsteroidRock
   entities:
   - uid: 1212
@@ -96560,6 +96585,20 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 58.5,36.5
       parent: 13329
+- proto: CommandmentCircuitBoard
+  entities:
+  - uid: 35773
+    components:
+    - type: Transform
+      pos: 108.71506,46.35119
+      parent: 13329
+- proto: CommsComputerCircuitboard
+  entities:
+  - uid: 30659
+    components:
+    - type: Transform
+      pos: 61.5,2.5
+      parent: 13329
 - proto: ComputerAlert
   entities:
   - uid: 13059
@@ -96977,17 +97016,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 45.5,40.5
       parent: 13329
-  - uid: 35746
-    components:
-    - type: Transform
-      pos: 108.5,50.5
-      parent: 13329
-  - uid: 35747
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 108.5,48.5
-      parent: 13329
 - proto: ComputerId
   entities:
   - uid: 30663
@@ -97698,6 +97726,13 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 131.5,-3.5
       parent: 13329
+- proto: CorporateCircuitBoard
+  entities:
+  - uid: 35745
+    components:
+    - type: Transform
+      pos: 108.44943,52.710564
+      parent: 13329
 - proto: CrateAirlockKit
   entities:
   - uid: 13122
@@ -100858,6 +100893,18 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 25.5,-2.5
       parent: 13329
+  - uid: 35777
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 82.5,53.5
+      parent: 13329
+  - uid: 35778
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 82.5,50.5
+      parent: 13329
 - proto: DisposalJunction
   entities:
   - uid: 965
@@ -101133,6 +101180,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 24.5,-2.5
       parent: 13329
+  - uid: 11680
+    components:
+    - type: Transform
+      pos: 79.5,50.5
+      parent: 13329
   - uid: 14826
     components:
     - type: Transform
@@ -107089,11 +107141,6 @@ entities:
     - type: Transform
       pos: 79.5,51.5
       parent: 13329
-  - uid: 30659
-    components:
-    - type: Transform
-      pos: 79.5,50.5
-      parent: 13329
   - uid: 31215
     components:
     - type: Transform
@@ -108708,6 +108755,30 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 23.5,7.5
       parent: 13329
+  - uid: 35779
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 80.5,50.5
+      parent: 13329
+  - uid: 35780
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 81.5,50.5
+      parent: 13329
+  - uid: 35781
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 82.5,51.5
+      parent: 13329
+  - uid: 35782
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 82.5,52.5
+      parent: 13329
 - proto: DisposalRouter
   entities:
   - uid: 11006
@@ -109267,6 +109338,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 22.5,7.5
       parent: 13329
+  - uid: 35776
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 83.5,53.5
+      parent: 13329
 - proto: DisposalUnit
   entities:
   - uid: 941
@@ -110358,6 +110435,13 @@ entities:
     - type: Transform
       pos: 21.596437,36.347313
       parent: 13329
+- proto: DungeonMasterCircuitBoard
+  entities:
+  - uid: 35741
+    components:
+    - type: Transform
+      pos: 109.38693,52.710564
+      parent: 13329
 - proto: EmergencyLight
   entities:
   - uid: 11013
@@ -112686,20 +112770,10 @@ entities:
       locked: False
 - proto: FireExtinguisher
   entities:
-  - uid: 11680
-    components:
-    - type: Transform
-      pos: 18.309164,-24.290554
-      parent: 13329
-  - uid: 11681
-    components:
-    - type: Transform
-      pos: 18.51229,-24.30618
-      parent: 13329
-  - uid: 11682
+  - uid: 26361
     components:
     - type: Transform
-      pos: 18.652914,-24.321804
+      pos: 19.307037,-32.340736
       parent: 13329
   - uid: 33568
     components:
@@ -112716,6 +112790,16 @@ entities:
     - type: Transform
       pos: 47.63708,38.801556
       parent: 13329
+  - uid: 35783
+    components:
+    - type: Transform
+      pos: 19.478912,-32.403236
+      parent: 13329
+  - uid: 35784
+    components:
+    - type: Transform
+      pos: 19.650787,-32.48136
+      parent: 13329
 - proto: FirelockEdge
   entities:
   - uid: 31573
@@ -154613,6 +154697,13 @@ entities:
     - type: Transform
       pos: 60.5,-22.5
       parent: 13329
+- proto: GlassBoxLaserFilled
+  entities:
+  - uid: 35746
+    components:
+    - type: Transform
+      pos: 83.5,47.5
+      parent: 13329
 - proto: GlowstickBase
   entities:
   - uid: 32201
@@ -161940,6 +162031,13 @@ entities:
     - type: Transform
       pos: 49.5,20.5
       parent: 13329
+- proto: IDComputerCircuitboard
+  entities:
+  - uid: 30700
+    components:
+    - type: Transform
+      pos: 59.5,2.5
+      parent: 13329
 - proto: IngotGold
   entities:
   - uid: 30759
@@ -161998,6 +162096,18 @@ entities:
     - type: Transform
       pos: 10.353264,25.591267
       parent: 13329
+- proto: Intellicard
+  entities:
+  - uid: 35774
+    components:
+    - type: Transform
+      pos: 105.41663,54.620724
+      parent: 13329
+  - uid: 35775
+    components:
+    - type: Transform
+      pos: 105.57288,54.4801
+      parent: 13329
 - proto: IntercomAll
   entities:
   - uid: 35380
@@ -162717,6 +162827,13 @@ entities:
     - type: Transform
       pos: 81.46681,-24.3054
       parent: 13329
+- proto: LiveLetLiveCircuitBoard
+  entities:
+  - uid: 35740
+    components:
+    - type: Transform
+      pos: 109.51193,52.554314
+      parent: 13329
 - proto: LockerAtmosphericsFilledHardsuit
   entities:
   - uid: 23864
@@ -162876,31 +162993,13 @@ entities:
         - 0
         - 0
         - 0
-- proto: LockerCaptainFilled
+- proto: LockerCaptainFilledNoLaser
   entities:
-  - uid: 30691
+  - uid: 26362
     components:
     - type: Transform
       pos: 80.5,51.5
       parent: 13329
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1495
-        moles:
-        - 3.0981817
-        - 11.655066
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
 - proto: LockerChemistryFilled
   entities:
   - uid: 18361
@@ -166275,6 +166374,13 @@ entities:
     - type: Transform
       pos: -40.35339,61.37836
       parent: 13329
+- proto: NTDefaultCircuitBoard
+  entities:
+  - uid: 35767
+    components:
+    - type: Transform
+      pos: 107.49631,46.60119
+      parent: 13329
 - proto: NuclearBomb
   entities:
   - uid: 30730
@@ -166294,6 +166400,13 @@ entities:
     - type: Transform
       pos: 46.5,-7.5
       parent: 13329
+- proto: NutimovCircuitBoard
+  entities:
+  - uid: 35768
+    components:
+    - type: Transform
+      pos: 107.57443,46.491814
+      parent: 13329
 - proto: OnionSeeds
   entities:
   - uid: 1789
@@ -166333,6 +166446,18 @@ entities:
     - type: Transform
       pos: 63.5,-52.5
       parent: 13329
+- proto: OreBox
+  entities:
+  - uid: 30691
+    components:
+    - type: Transform
+      pos: 18.5,-30.5
+      parent: 13329
+  - uid: 35785
+    components:
+    - type: Transform
+      pos: 19.5,-30.5
+      parent: 13329
 - proto: OreProcessor
   entities:
   - uid: 11509
@@ -166340,6 +166465,13 @@ entities:
     - type: Transform
       pos: 13.5,-28.5
       parent: 13329
+- proto: OverlordCircuitBoard
+  entities:
+  - uid: 35769
+    components:
+    - type: Transform
+      pos: 108.49631,46.60119
+      parent: 13329
 - proto: OxygenCanister
   entities:
   - uid: 6546
@@ -166595,6 +166727,13 @@ entities:
     - type: Transform
       pos: -11.5,52.5
       parent: 13329
+- proto: PaladinCircuitBoard
+  entities:
+  - uid: 35770
+    components:
+    - type: Transform
+      pos: 108.62131,46.47619
+      parent: 13329
 - proto: Paper
   entities:
   - uid: 10318
@@ -167379,6 +167518,13 @@ entities:
     - type: Transform
       pos: 96.5,1.5
       parent: 13329
+- proto: PlayerStationAi
+  entities:
+  - uid: 35747
+    components:
+    - type: Transform
+      pos: 124.5,49.5
+      parent: 13329
 - proto: Plunger
   entities:
   - uid: 18924
@@ -171854,6 +172000,12 @@ entities:
       parent: 13329
     - type: ApcPowerReceiver
       powerLoad: 0
+  - uid: 35766
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 123.5,49.5
+      parent: 13329
 - proto: PoweredlightExterior
   entities:
   - uid: 34307
@@ -174208,6 +174360,13 @@ entities:
     - type: Transform
       pos: 54.5,-16.5
       parent: 13329
+- proto: ProtolatheMachineCircuitboard
+  entities:
+  - uid: 26590
+    components:
+    - type: Transform
+      pos: 60.5,2.5
+      parent: 13329
 - proto: PuddleSmear
   entities:
   - uid: 31661
@@ -174395,10 +174554,10 @@ entities:
     - type: Transform
       pos: 21.5,-27.5
       parent: 13329
-  - uid: 11679
+  - uid: 11682
     components:
     - type: Transform
-      pos: 18.5,-24.5
+      pos: 19.5,-32.5
       parent: 13329
   - uid: 11789
     components:
@@ -174612,11 +174771,6 @@ entities:
     - type: Transform
       pos: 60.5,-1.5
       parent: 13329
-  - uid: 26590
-    components:
-    - type: Transform
-      pos: 59.5,1.5
-      parent: 13329
   - uid: 26591
     components:
     - type: Transform
@@ -174625,7 +174779,7 @@ entities:
   - uid: 26592
     components:
     - type: Transform
-      pos: 61.5,1.5
+      pos: 60.5,2.5
       parent: 13329
   - uid: 26593
     components:
@@ -176570,11 +176724,6 @@ entities:
       parent: 13329
 - proto: RandomBoard
   entities:
-  - uid: 4973
-    components:
-    - type: Transform
-      pos: 59.5,2.5
-      parent: 13329
   - uid: 16650
     components:
     - type: Transform
@@ -176590,21 +176739,6 @@ entities:
     - type: Transform
       pos: 58.5,-4.5
       parent: 13329
-  - uid: 26361
-    components:
-    - type: Transform
-      pos: 61.5,1.5
-      parent: 13329
-  - uid: 26362
-    components:
-    - type: Transform
-      pos: 59.5,1.5
-      parent: 13329
-  - uid: 26363
-    components:
-    - type: Transform
-      pos: 61.5,2.5
-      parent: 13329
   - uid: 26364
     components:
     - type: Transform
@@ -176615,36 +176749,6 @@ entities:
     - type: Transform
       pos: 58.5,-3.5
       parent: 13329
-  - uid: 35740
-    components:
-    - type: Transform
-      pos: 107.5,46.5
-      parent: 13329
-  - uid: 35741
-    components:
-    - type: Transform
-      pos: 108.5,46.5
-      parent: 13329
-  - uid: 35742
-    components:
-    - type: Transform
-      pos: 109.5,46.5
-      parent: 13329
-  - uid: 35743
-    components:
-    - type: Transform
-      pos: 109.5,52.5
-      parent: 13329
-  - uid: 35744
-    components:
-    - type: Transform
-      pos: 108.5,52.5
-      parent: 13329
-  - uid: 35745
-    components:
-    - type: Transform
-      pos: 107.5,52.5
-      parent: 13329
 - proto: RandomDrinkBottle
   entities:
   - uid: 34065
@@ -177686,6 +177790,12 @@ entities:
       parent: 13329
 - proto: Recycler
   entities:
+  - uid: 26363
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 18.5,-24.5
+      parent: 13329
   - uid: 27052
     components:
     - type: Transform
@@ -182098,6 +182208,13 @@ entities:
     - type: Transform
       pos: 19.173515,13.383953
       parent: 13329
+- proto: RobocopCircuitBoard
+  entities:
+  - uid: 35771
+    components:
+    - type: Transform
+      pos: 109.40256,46.60119
+      parent: 13329
 - proto: RockGuitarInstrument
   entities:
   - uid: 1374
@@ -182662,11 +182779,6 @@ entities:
     - type: Transform
       pos: 52.5,-4.5
       parent: 13329
-  - uid: 30700
-    components:
-    - type: Transform
-      pos: 83.5,47.5
-      parent: 13329
 - proto: ShowcaseRobotAntique
   entities:
   - uid: 26065
@@ -189363,6 +189475,19 @@ entities:
     - type: Transform
       pos: 21.5,49.5
       parent: 13329
+- proto: StationAiUploadComputer
+  entities:
+  - uid: 4973
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 108.5,48.5
+      parent: 13329
+  - uid: 11679
+    components:
+    - type: Transform
+      pos: 108.5,50.5
+      parent: 13329
 - proto: StationAnchor
   entities:
   - uid: 15776
@@ -189370,6 +189495,13 @@ entities:
     - type: Transform
       pos: 100.5,-22.5
       parent: 13329
+- proto: StationEfficiencyCircuitBoard
+  entities:
+  - uid: 35772
+    components:
+    - type: Transform
+      pos: 109.46506,46.460564
+      parent: 13329
 - proto: StationMap
   entities:
   - uid: 27930
@@ -199050,6 +199182,17 @@ entities:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
+  - uid: 11681
+    components:
+    - type: Transform
+      pos: 18.5,-25.5
+      parent: 13329
+    - type: DeviceLinkSource
+      linkedPorts:
+        26363:
+        - Left: Forward
+        - Right: Reverse
+        - Middle: Off
   - uid: 11835
     components:
     - type: Transform
diff --git a/Resources/Prototypes/Maps/fland.yml b/Resources/Prototypes/Maps/fland.yml
index 30e142e8c0..b5c6fe9007 100644
--- a/Resources/Prototypes/Maps/fland.yml
+++ b/Resources/Prototypes/Maps/fland.yml
@@ -43,7 +43,6 @@
             ResearchDirector: [ 1, 1 ]
             Scientist: [ 5, 5 ]
             ResearchAssistant: [ 6, 6 ]
-            Borg: [ 2, 2 ]
             #security
             HeadOfSecurity: [ 1, 1 ]
             Warden: [ 1, 1 ]
@@ -60,3 +59,6 @@
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
+            #silicon
+            StationAi: [ 1, 1 ]
+            Borg: [ 2, 2 ]
-- 
2.51.2