From ee72cdacdc55243e9df2d7dbc48f76afbcffaf68 Mon Sep 17 00:00:00 2001
From: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Date: Thu, 19 Dec 2024 11:55:41 -0800
Subject: [PATCH] Update Fland for holopads (#33962)

* update fland for holopads

* fix duplicate holopad name
---
 Resources/Maps/fland.yml | 767 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 765 insertions(+), 2 deletions(-)

diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml
index b5fc20c1ff07dd..2ea0ca65027f64 100644
--- a/Resources/Maps/fland.yml
+++ b/Resources/Maps/fland.yml
@@ -1088,6 +1088,11 @@ entities:
             8727: -13,35
             8730: 17,-31
             8731: 16,-31
+            8770: 101,49
+            8771: 107,49
+            8772: 120,49
+            8773: 96,49
+            8774: 89,47
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -94976,7 +94981,7 @@ entities:
   - uid: 4881
     components:
     - type: Transform
-      pos: -18.468145,41.512997
+      pos: -18.56717,41.531788
       parent: 13329
 - proto: ClothingHandsGlovesColorOrange
   entities:
@@ -153177,12 +153182,15 @@ entities:
       color: '#990000FF'
   - uid: 388
     components:
+    - type: MetaData
+      name: air scrubber
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -12.5,13.5
       parent: 13329
     - type: AtmosPipeColor
       color: '#990000FF'
+    - type: Label
   - uid: 389
     components:
     - type: Transform
@@ -154498,7 +154506,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 89.5,-11.5
       parent: 13329
-    - type: DeviceNetwork
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 25505
@@ -162154,6 +162161,762 @@ entities:
     - type: Transform
       pos: 89.5,45.5
       parent: 13329
+- proto: Holopad
+  entities:
+  - uid: 35873
+    components:
+    - type: MetaData
+      name: holopad (Security - Evidence Room)
+    - type: Transform
+      pos: 19.5,18.5
+      parent: 13329
+    - type: Label
+      currentLabel: Security - Evidence Room
+    - type: NameModifier
+      baseName: holopad
+  - uid: 35887
+    components:
+    - type: MetaData
+      name: holopad (Service - Chaplain)
+    - type: Transform
+      pos: -16.5,72.5
+      parent: 13329
+    - type: Label
+      currentLabel: Service - Chaplain
+    - type: NameModifier
+      baseName: holopad
+  - uid: 35888
+    components:
+    - type: MetaData
+      name: holopad (Service - Chaplain Meeting)
+    - type: Transform
+      pos: -9.5,71.5
+      parent: 13329
+    - type: Label
+      currentLabel: Service - Chaplain Meeting
+    - type: NameModifier
+      baseName: holopad
+  - uid: 35931
+    components:
+    - type: MetaData
+      name: holopad (General - Central Lounge)
+    - type: Transform
+      pos: -0.5,-2.5
+      parent: 13329
+    - type: Label
+      currentLabel: General - Central Lounge
+    - type: NameModifier
+      baseName: holopad
+- proto: HolopadAiBackupPower
+  entities:
+  - uid: 35840
+    components:
+    - type: Transform
+      pos: 104.5,43.5
+      parent: 13329
+  - uid: 35845
+    components:
+    - type: MetaData
+      name: holopad (AI - Storage)
+    - type: Transform
+      pos: 104.5,55.5
+      parent: 13329
+    - type: Label
+      currentLabel: AI - Storage
+    - type: NameModifier
+      baseName: holopad
+- proto: HolopadAiChute
+  entities:
+  - uid: 35841
+    components:
+    - type: Transform
+      pos: 96.5,49.5
+      parent: 13329
+- proto: HolopadAiCore
+  entities:
+  - uid: 35844
+    components:
+    - type: Transform
+      pos: 120.5,49.5
+      parent: 13329
+- proto: HolopadAiEntrance
+  entities:
+  - uid: 35842
+    components:
+    - type: Transform
+      pos: 101.5,49.5
+      parent: 13329
+- proto: HolopadAiUpload
+  entities:
+  - uid: 35843
+    components:
+    - type: Transform
+      pos: 107.5,49.5
+      parent: 13329
+- proto: HolopadCargoBay
+  entities:
+  - uid: 35866
+    components:
+    - type: Transform
+      pos: 10.5,-22.5
+      parent: 13329
+  - uid: 35870
+    components:
+    - type: MetaData
+      name: holopad (Cargo - Cargo Bay Secondary)
+    - type: Transform
+      pos: -1.5,-13.5
+      parent: 13329
+    - type: Label
+      currentLabel: Cargo - Cargo Bay Secondary
+    - type: NameModifier
+      baseName: holopad
+  - uid: 35926
+    components:
+    - type: MetaData
+      name: holopad (Cargo - Mailroom)
+    - type: Transform
+      pos: 18.5,-12.5
+      parent: 13329
+    - type: Label
+      currentLabel: Cargo - Mailroom
+    - type: NameModifier
+      baseName: holopad
+- proto: HolopadCargoBayLongRange
+  entities:
+  - uid: 35865
+    components:
+    - type: Transform
+      pos: 10.5,-24.5
+      parent: 13329
+- proto: HolopadCargoBreakroom
+  entities:
+  - uid: 35867
+    components:
+    - type: Transform
+      pos: -0.5,-20.5
+      parent: 13329
+- proto: HolopadCargoFront
+  entities:
+  - uid: 35863
+    components:
+    - type: Transform
+      pos: 6.5,-17.5
+      parent: 13329
+- proto: HolopadCargoSalvageBay
+  entities:
+  - uid: 35868
+    components:
+    - type: Transform
+      pos: 16.5,-31.5
+      parent: 13329
+- proto: HolopadCommandBridge
+  entities:
+  - uid: 35849
+    components:
+    - type: Transform
+      pos: 71.5,58.5
+      parent: 13329
+  - uid: 35871
+    components:
+    - type: MetaData
+      name: holopad (Command - Post)
+    - type: Transform
+      pos: -10.5,0.5
+      parent: 13329
+    - type: Label
+      currentLabel: Command - Post
+    - type: NameModifier
+      baseName: holopad
+- proto: HolopadCommandBridgeHallway
+  entities:
+  - uid: 35850
+    components:
+    - type: Transform
+      pos: 72.5,50.5
+      parent: 13329
+- proto: HolopadCommandBridgeLongRange
+  entities:
+  - uid: 35848
+    components:
+    - type: Transform
+      pos: 69.5,58.5
+      parent: 13329
+- proto: HolopadCommandCaptain
+  entities:
+  - uid: 35846
+    components:
+    - type: Transform
+      pos: 89.5,47.5
+      parent: 13329
+  - uid: 35847
+    components:
+    - type: Transform
+      pos: 80.5,45.5
+      parent: 13329
+- proto: HolopadCommandCe
+  entities:
+  - uid: 35910
+    components:
+    - type: Transform
+      pos: 83.5,-12.5
+      parent: 13329
+- proto: HolopadCommandCmo
+  entities:
+  - uid: 35895
+    components:
+    - type: Transform
+      pos: 26.5,63.5
+      parent: 13329
+  - uid: 35932
+    components:
+    - type: MetaData
+      name: holopad (Command - CMO's Office)
+    - type: Transform
+      pos: 24.5,59.5
+      parent: 13329
+    - type: Label
+      currentLabel: Command - CMO's Office
+    - type: NameModifier
+      baseName: holopad
+- proto: HolopadCommandHop
+  entities:
+  - uid: 35852
+    components:
+    - type: Transform
+      pos: 59.5,46.5
+      parent: 13329
+- proto: HolopadCommandHos
+  entities:
+  - uid: 35855
+    components:
+    - type: Transform
+      pos: 37.5,19.5
+      parent: 13329
+- proto: HolopadCommandMeetingRoom
+  entities:
+  - uid: 35851
+    components:
+    - type: Transform
+      pos: 62.5,57.5
+      parent: 13329
+- proto: HolopadCommandQm
+  entities:
+  - uid: 35869
+    components:
+    - type: Transform
+      pos: 2.5,-25.5
+      parent: 13329
+- proto: HolopadCommandRd
+  entities:
+  - uid: 35925
+    components:
+    - type: Transform
+      pos: 50.5,-41.5
+      parent: 13329
+- proto: HolopadEngineeringAME
+  entities:
+  - uid: 35899
+    components:
+    - type: Transform
+      pos: 90.5,6.5
+      parent: 13329
+  - uid: 35912
+    components:
+    - type: MetaData
+      name: holopad (Engineering - Gravity)
+    - type: Transform
+      pos: 114.5,-24.5
+      parent: 13329
+    - type: Label
+      currentLabel: Engineering - Gravity
+    - type: NameModifier
+      baseName: holopad
+- proto: HolopadEngineeringAtmosFront
+  entities:
+  - uid: 35907
+    components:
+    - type: Transform
+      pos: 64.5,-15.5
+      parent: 13329
+  - uid: 35917
+    components:
+    - type: MetaData
+      name: holopad (Atmos - Gearroom)
+    - type: Transform
+      pos: 75.5,-24.5
+      parent: 13329
+    - type: Label
+      currentLabel: Atmos - Gearroom
+    - type: NameModifier
+      baseName: holopad
+- proto: HolopadEngineeringAtmosMain
+  entities:
+  - uid: 35908
+    components:
+    - type: MetaData
+      name: holopad (Atmos - Main West)
+    - type: Transform
+      pos: 70.5,-33.5
+      parent: 13329
+    - type: Label
+      currentLabel: Atmos - Main West
+    - type: NameModifier
+      baseName: holopad
+  - uid: 35916
+    components:
+    - type: MetaData
+      name: holopad (Atmos - Main East)
+    - type: Transform
+      pos: 84.5,-32.5
+      parent: 13329
+    - type: Label
+      currentLabel: Atmos - Main East
+    - type: NameModifier
+      baseName: holopad
+- proto: HolopadEngineeringAtmosTeg
+  entities:
+  - uid: 35909
+    components:
+    - type: Transform
+      pos: 99.5,-35.5
+      parent: 13329
+- proto: HolopadEngineeringBreakroom
+  entities:
+  - uid: 35900
+    components:
+    - type: Transform
+      pos: 75.5,-13.5
+      parent: 13329
+  - uid: 35915
+    components:
+    - type: MetaData
+      name: holopad (Engineering - Breakroom Upper)
+    - type: Transform
+      pos: 80.5,-4.5
+      parent: 13329
+    - type: Label
+      currentLabel: Engineering - Breakroom Upper
+    - type: NameModifier
+      baseName: holopad
+- proto: HolopadEngineeringFront
+  entities:
+  - uid: 35906
+    components:
+    - type: Transform
+      pos: 68.5,-15.5
+      parent: 13329
+- proto: HolopadEngineeringPower
+  entities:
+  - uid: 35905
+    components:
+    - type: Transform
+      pos: 90.5,-1.5
+      parent: 13329
+  - uid: 35914
+    components:
+    - type: MetaData
+      name: holopad (Engineering - Engine Storage)
+    - type: Transform
+      pos: 107.5,-16.5
+      parent: 13329
+    - type: Label
+      currentLabel: Engineering - Engine Storage
+    - type: NameModifier
+      baseName: holopad
+- proto: HolopadEngineeringStorage
+  entities:
+  - uid: 35904
+    components:
+    - type: Transform
+      pos: 72.5,-1.5
+      parent: 13329
+  - uid: 35911
+    components:
+    - type: Transform
+      pos: 92.5,-11.5
+      parent: 13329
+- proto: HolopadEngineeringTechVault
+  entities:
+  - uid: 35901
+    components:
+    - type: Transform
+      pos: 60.5,-5.5
+      parent: 13329
+- proto: HolopadEngineeringTelecoms
+  entities:
+  - uid: 35902
+    components:
+    - type: Transform
+      pos: 92.5,30.5
+      parent: 13329
+  - uid: 35903
+    components:
+    - type: MetaData
+      name: holopad (Engineering - Telecoms Entry)
+    - type: Transform
+      pos: 87.5,33.5
+      parent: 13329
+    - type: Label
+      currentLabel: Engineering - Telecoms Entry
+    - type: NameModifier
+      baseName: holopad
+- proto: HolopadGeneralArrivals
+  entities:
+  - uid: 35930
+    components:
+    - type: Transform
+      pos: -22.5,-5.5
+      parent: 13329
+- proto: HolopadGeneralCryosleep
+  entities:
+  - uid: 35898
+    components:
+    - type: Transform
+      pos: 98.5,19.5
+      parent: 13329
+- proto: HolopadGeneralDisposals
+  entities:
+  - uid: 35913
+    components:
+    - type: Transform
+      pos: 124.5,-4.5
+      parent: 13329
+- proto: HolopadGeneralEvac
+  entities:
+  - uid: 35894
+    components:
+    - type: Transform
+      pos: -32.5,35.5
+      parent: 13329
+- proto: HolopadGeneralEVAStorage
+  entities:
+  - uid: 35896
+    components:
+    - type: Transform
+      pos: 50.5,39.5
+      parent: 13329
+- proto: HolopadGeneralLounge
+  entities:
+  - uid: 35897
+    components:
+    - type: Transform
+      pos: 79.5,14.5
+      parent: 13329
+- proto: HolopadGeneralTheater
+  entities:
+  - uid: 35893
+    components:
+    - type: Transform
+      pos: -12.5,9.5
+      parent: 13329
+- proto: HolopadGeneralTools
+  entities:
+  - uid: 35929
+    components:
+    - type: Transform
+      pos: 4.5,26.5
+      parent: 13329
+- proto: HolopadMedicalBreakroom
+  entities:
+  - uid: 35882
+    components:
+    - type: Transform
+      pos: 14.5,66.5
+      parent: 13329
+  - uid: 35883
+    components:
+    - type: MetaData
+      name: holopad (Medical - Locker Room)
+    - type: Transform
+      pos: 6.5,67.5
+      parent: 13329
+    - type: Label
+      currentLabel: Medical - Locker Room
+    - type: NameModifier
+      baseName: holopad
+- proto: HolopadMedicalChemistry
+  entities:
+  - uid: 35875
+    components:
+    - type: Transform
+      pos: 22.5,37.5
+      parent: 13329
+- proto: HolopadMedicalCryopods
+  entities:
+  - uid: 35874
+    components:
+    - type: Transform
+      pos: 28.5,50.5
+      parent: 13329
+- proto: HolopadMedicalFront
+  entities:
+  - uid: 35876
+    components:
+    - type: Transform
+      pos: 15.5,40.5
+      parent: 13329
+- proto: HolopadMedicalMedbay
+  entities:
+  - uid: 35877
+    components:
+    - type: Transform
+      pos: 12.5,48.5
+      parent: 13329
+- proto: HolopadMedicalMorgue
+  entities:
+  - uid: 35881
+    components:
+    - type: Transform
+      pos: 5.5,39.5
+      parent: 13329
+- proto: HolopadMedicalParamed
+  entities:
+  - uid: 35878
+    components:
+    - type: Transform
+      pos: 6.5,48.5
+      parent: 13329
+- proto: HolopadMedicalSurgery
+  entities:
+  - uid: 35879
+    components:
+    - type: Transform
+      pos: 9.5,54.5
+      parent: 13329
+- proto: HolopadMedicalVirology
+  entities:
+  - uid: 35880
+    components:
+    - type: Transform
+      pos: 34.5,45.5
+      parent: 13329
+- proto: HolopadScienceAnomaly
+  entities:
+  - uid: 35923
+    components:
+    - type: Transform
+      pos: 43.5,-33.5
+      parent: 13329
+  - uid: 35924
+    components:
+    - type: MetaData
+      name: holopad (Science - Anomaly Hallway)
+    - type: Transform
+      pos: 38.5,-34.5
+      parent: 13329
+    - type: Label
+      currentLabel: Science - Anomaly Hallway
+    - type: NameModifier
+      baseName: holopad
+- proto: HolopadScienceArtifact
+  entities:
+  - uid: 35922
+    components:
+    - type: Transform
+      pos: 55.5,-30.5
+      parent: 13329
+- proto: HolopadScienceBreakroom
+  entities:
+  - uid: 35921
+    components:
+    - type: Transform
+      pos: 33.5,-38.5
+      parent: 13329
+- proto: HolopadScienceFront
+  entities:
+  - uid: 35918
+    components:
+    - type: Transform
+      pos: 53.5,-16.5
+      parent: 13329
+- proto: HolopadScienceRobotics
+  entities:
+  - uid: 35919
+    components:
+    - type: Transform
+      pos: 35.5,-21.5
+      parent: 13329
+  - uid: 35920
+    components:
+    - type: MetaData
+      name: holopad (Science - Robotics Storage)
+    - type: Transform
+      pos: 28.5,-22.5
+      parent: 13329
+    - type: Label
+      currentLabel: Science - Robotics Storage
+    - type: NameModifier
+      baseName: holopad
+- proto: HolopadSecurityArmory
+  entities:
+  - uid: 35857
+    components:
+    - type: Transform
+      pos: 20.5,12.5
+      parent: 13329
+- proto: HolopadSecurityBreakroom
+  entities:
+  - uid: 35861
+    components:
+    - type: Transform
+      pos: 30.5,20.5
+      parent: 13329
+- proto: HolopadSecurityBrig
+  entities:
+  - uid: 35858
+    components:
+    - type: Transform
+      pos: 29.5,6.5
+      parent: 13329
+  - uid: 35872
+    components:
+    - type: MetaData
+      name: holopad (Security - Locker Room South)
+    - type: Transform
+      pos: 35.5,11.5
+      parent: 13329
+    - type: Label
+      currentLabel: Security - Locker Room South
+    - type: NameModifier
+      baseName: holopad
+- proto: HolopadSecurityBrigMed
+  entities:
+  - uid: 35856
+    components:
+    - type: Transform
+      pos: 44.5,2.5
+      parent: 13329
+- proto: HolopadSecurityCourtroom
+  entities:
+  - uid: 35853
+    components:
+    - type: Transform
+      pos: 63.5,30.5
+      parent: 13329
+- proto: HolopadSecurityDetective
+  entities:
+  - uid: 35889
+    components:
+    - type: Transform
+      pos: -24.5,40.5
+      parent: 13329
+- proto: HolopadSecurityFront
+  entities:
+  - uid: 35862
+    components:
+    - type: MetaData
+      name: holopad (Security - Front North)
+    - type: Transform
+      pos: 24.5,26.5
+      parent: 13329
+    - type: Label
+      currentLabel: Security - Front North
+    - type: NameModifier
+      baseName: holopad
+  - uid: 35864
+    components:
+    - type: MetaData
+      name: holopad (Security - Front South)
+    - type: Transform
+      pos: 20.5,2.5
+      parent: 13329
+    - type: Label
+      currentLabel: Security - Front South
+    - type: NameModifier
+      baseName: holopad
+- proto: HolopadSecurityInterrogation
+  entities:
+  - uid: 35860
+    components:
+    - type: Transform
+      pos: 16.5,23.5
+      parent: 13329
+- proto: HolopadSecurityLawyer
+  entities:
+  - uid: 35928
+    components:
+    - type: Transform
+      pos: 71.5,34.5
+      parent: 13329
+- proto: HolopadSecurityPerma
+  entities:
+  - uid: 35854
+    components:
+    - type: Transform
+      pos: 46.5,21.5
+      parent: 13329
+- proto: HolopadSecurityWarden
+  entities:
+  - uid: 35859
+    components:
+    - type: Transform
+      pos: 29.5,12.5
+      parent: 13329
+- proto: HolopadServiceBar
+  entities:
+  - uid: 35891
+    components:
+    - type: Transform
+      pos: -16.5,24.5
+      parent: 13329
+  - uid: 35933
+    components:
+    - type: MetaData
+      name: holopad (Service - Bar Center)
+    - type: Transform
+      pos: -15.5,18.5
+      parent: 13329
+    - type: Label
+      currentLabel: Service - Bar Center
+    - type: NameModifier
+      baseName: holopad
+- proto: HolopadServiceBotany
+  entities:
+  - uid: 35890
+    components:
+    - type: Transform
+      pos: -5.5,37.5
+      parent: 13329
+- proto: HolopadServiceChapel
+  entities:
+  - uid: 35884
+    components:
+    - type: Transform
+      pos: -12.5,61.5
+      parent: 13329
+- proto: HolopadServiceJanitor
+  entities:
+  - uid: 35927
+    components:
+    - type: Transform
+      pos: 4.5,10.5
+      parent: 13329
+- proto: HolopadServiceKitchen
+  entities:
+  - uid: 35892
+    components:
+    - type: Transform
+      pos: -6.5,20.5
+      parent: 13329
+- proto: HolopadServiceLibrary
+  entities:
+  - uid: 35885
+    components:
+    - type: Transform
+      pos: -19.5,54.5
+      parent: 13329
+  - uid: 35886
+    components:
+    - type: MetaData
+      name: holopad (Service - Library Meeting)
+    - type: Transform
+      pos: -26.5,57.5
+      parent: 13329
+    - type: Label
+      currentLabel: Service - Library Meeting
+    - type: NameModifier
+      baseName: holopad
 - proto: HospitalCurtainsOpen
   entities:
   - uid: 1440