Localized holopads for Bagel (#33934)

* Stuff

* Requested changes

diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml
index f7d4c9ba2688823fe8a4efebc175356aea802505..cced413d661e6aba39f0dc1d0723e1cb4e8e448f 100644 (file)
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
@@ -313,7 +313,7 @@ entities:
           version: 6
         -1,2:
           ind: -1,2
-          tiles: TwAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAXQAAAAACbAAAAAAATwAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAXQAAAAADbAAAAAAATwAAAAAAXQAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACbAAAAAAAXQAAAAAAXQAAAAADfgAAAAAAXQAAAAADXQAAAAACXQAAAAABfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAXQAAAAACXQAAAAACbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
+          tiles: TwAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAXQAAAAACbAAAAAAATwAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAXQAAAAADbAAAAAAATwAAAAAAXQAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACbAAAAAAAXQAAAAAAXQAAAAADfgAAAAAAXQAAAAADXQAAAAACXQAAAAABfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAXQAAAAAAXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAXQAAAAAAXQAAAAACXQAAAAACbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA
           version: 6
         -3,2:
           ind: -3,2
@@ -5760,10 +5760,10 @@ entities:
             id: WarnCornerSmallSE
           decals:
             1050: -2,-78
-            1361: -2,36
             3340: -19,42
             3762: -29,-1
             3894: -15,4
+            4923: -2,36
         - node:
             zIndex: 5
             color: '#FFFFFFFF'
@@ -6199,6 +6199,8 @@ entities:
             4098: 15,-22
             4212: -18,33
             4887: 2,23
+            4921: -3,35
+            4922: -3,36
         - node:
             color: '#DE3A3A96'
             id: WarnLineW
@@ -8105,7 +8107,7 @@ entities:
           -2,8:
             0: 46079
           -1,5:
-            0: 62463
+            0: 64511
           -1,6:
             0: 64511
           -1,7:
@@ -8115,7 +8117,7 @@ entities:
           0,4:
             0: 65520
           0,5:
-            0: 28927
+            0: 29695
           0,6:
             0: 29567
           0,7:
@@ -8383,7 +8385,7 @@ entities:
             1: 39312
           -12,8:
             4: 12
-            5: 3072
+            6: 3072
           -11,5:
             0: 63351
           -11,6:
@@ -8392,7 +8394,7 @@ entities:
           -11,8:
             4: 1
             1: 17476
-            5: 256
+            6: 256
           -11,7:
             1: 17484
           -10,5:
@@ -8490,10 +8492,10 @@ entities:
             0: 255
             1: 57344
           -8,11:
-            6: 816
+            5: 816
             1: 34952
           -9,11:
-            6: 2176
+            5: 2176
             1: 8738
           -8,12:
             1: 34959
@@ -8513,7 +8515,7 @@ entities:
           -6,11:
             0: 4095
           -6,12:
-            6: 61166
+            5: 61166
           -5,9:
             0: 65528
           -5,10:
@@ -8521,7 +8523,7 @@ entities:
           -5,11:
             0: 36863
           -5,12:
-            6: 30515
+            5: 30515
             0: 12
           -4,9:
             0: 65528
@@ -8531,7 +8533,7 @@ entities:
             0: 4095
           -4,12:
             0: 1
-            6: 65518
+            5: 65518
           -4,13:
             1: 61680
           -5,13:
@@ -8545,7 +8547,7 @@ entities:
           -5,15:
             1: 17487
           -3,12:
-            6: 13107
+            5: 13107
             1: 34944
           -3,13:
             1: 47792
@@ -8611,7 +8613,7 @@ entities:
             1: 61713
           -12,9:
             0: 16
-            6: 3084
+            5: 3084
           -13,9:
             1: 39305
           -13,10:
@@ -8621,18 +8623,18 @@ entities:
             0: 12544
           -12,10:
             3: 12
-            6: 3072
+            5: 3072
           -12,11:
-            6: 12
+            5: 12
           -11,9:
-            6: 257
+            5: 257
             1: 17476
           -11,10:
             3: 1
-            6: 256
+            5: 256
             1: 17476
           -11,11:
-            6: 1
+            5: 1
             1: 17476
           -11,12:
             1: 17487
@@ -8686,7 +8688,7 @@ entities:
             1: 15
           -13,12:
             1: 34952
-            5: 48
+            6: 48
             4: 12288
           -12,13:
             1: 61455
@@ -8720,11 +8722,11 @@ entities:
             1: 62671
           -7,14:
             1: 244
-            6: 57344
+            5: 57344
             0: 1024
           -7,15:
             1: 61440
-            6: 238
+            5: 238
             0: 1024
           -7,16:
             1: 65524
@@ -8783,7 +8785,7 @@ entities:
           -14,12:
             0: 1
             1: 8738
-            5: 128
+            6: 128
             4: 32768
           -17,12:
             0: 52232
@@ -9392,7 +9394,7 @@ entities:
         - volume: 2500
           temperature: 293.15
           moles:
-          - 6666.982
+          - 0
           - 0
           - 0
           - 0
@@ -9407,7 +9409,7 @@ entities:
         - volume: 2500
           temperature: 293.15
           moles:
-          - 0
+          - 6666.982
           - 0
           - 0
           - 0
@@ -16332,11 +16334,21 @@ entities:
     - type: Transform
       pos: -23.5,35.5
       parent: 60
+  - uid: 2408
+    components:
+    - type: Transform
+      pos: 29.5,-38.5
+      parent: 60
   - uid: 2506
     components:
     - type: Transform
       pos: -23.5,36.5
       parent: 60
+  - uid: 2608
+    components:
+    - type: Transform
+      pos: 30.5,-38.5
+      parent: 60
   - uid: 7728
     components:
     - type: Transform
@@ -63929,6 +63941,11 @@ entities:
     - type: Physics
       canCollide: False
       bodyType: Static
+  - uid: 24779
+    components:
+    - type: Transform
+      pos: -19.317991,-17.371677
+      parent: 60
 - proto: DiceBag
   entities:
   - uid: 14192
@@ -109654,604 +109671,419 @@ entities:
     - type: Transform
       pos: -6.3791656,-37.542637
       parent: 60
-- proto: Holopad
+- proto: HolopadAiChute
+  entities:
+  - uid: 24777
+    components:
+    - type: Transform
+      pos: -71.5,17.5
+      parent: 60
+- proto: HolopadAiCore
   entities:
   - uid: 14728
     components:
-    - type: MetaData
-      name: holopad (AI Core)
     - type: Transform
       pos: -111.5,23.5
       parent: 60
-    - type: Label
-      currentLabel: AI Core
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24030
+- proto: HolopadAiEntrance
+  entities:
+  - uid: 24776
     components:
-    - type: MetaData
-      name: holopad (Robotics)
     - type: Transform
-      pos: -32.5,13.5
+      pos: -99.5,17.5
       parent: 60
-    - type: Label
-      currentLabel: Robotics
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24031
+- proto: HolopadAiMain
+  entities:
+  - uid: 24043
     components:
-    - type: MetaData
-      name: holopad (Artifact)
     - type: Transform
-      pos: -50.5,12.5
+      pos: -111.5,17.5
       parent: 60
-    - type: Label
-      currentLabel: Artifact
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24032
+- proto: HolopadAiUpload
+  entities:
+  - uid: 24044
     components:
-    - type: MetaData
-      name: holopad (RD)
     - type: Transform
-      pos: -43.5,8.5
+      pos: -111.5,11.5
       parent: 60
-    - type: Label
-      currentLabel: RD
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24033
+- proto: HolopadCargoBayLongRange
+  entities:
+  - uid: 24183
     components:
-    - type: MetaData
-      name: holopad (Science Front)
     - type: Transform
-      pos: -43.5,-6.5
+      pos: 55.5,13.5
       parent: 60
-    - type: Label
-      currentLabel: Science Front
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24034
+- proto: HolopadCargoFront
+  entities:
+  - uid: 24064
     components:
-    - type: MetaData
-      name: holopad (Anomaly)
     - type: Transform
-      pos: -53.5,-2.5
+      pos: 44.5,7.5
       parent: 60
-    - type: Label
-      currentLabel: Anomaly
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24035
+- proto: HolopadCommandBridge
+  entities:
+  - uid: 24059
     components:
-    - type: MetaData
-      name: holopad (HOS)
     - type: Transform
-      pos: -20.5,1.5
+      pos: -0.5,1.5
       parent: 60
-    - type: Label
-      currentLabel: HOS
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24036
+- proto: HolopadCommandBridgeHallway
+  entities:
+  - uid: 24055
     components:
-    - type: MetaData
-      name: holopad (Warden)
     - type: Transform
-      pos: -26.5,-9.5
+      pos: 0.5,-5.5
       parent: 60
-    - type: Label
-      currentLabel: Warden
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24037
+- proto: HolopadCommandBridgeLongRange
+  entities:
+  - uid: 24056
     components:
-    - type: MetaData
-      name: holopad (Perma)
     - type: Transform
-      pos: -10.5,-14.5
+      pos: 1.5,1.5
       parent: 60
-    - type: Label
-      currentLabel: Perma
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24038
+- proto: HolopadCommandCaptain
+  entities:
+  - uid: 24166
     components:
-    - type: MetaData
-      name: holopad (Security Front)
     - type: Transform
-      pos: -19.5,-15.5
+      pos: -3.5,-4.5
       parent: 60
-    - type: Label
-      currentLabel: Security Front
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24039
+- proto: HolopadCommandCe
+  entities:
+  - uid: 24053
     components:
-    - type: MetaData
-      name: holopad (Brig)
     - type: Transform
-      pos: -26.5,-14.5
+      pos: 12.5,19.5
       parent: 60
-    - type: Label
-      currentLabel: Brig
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24040
+- proto: HolopadCommandCmo
+  entities:
+  - uid: 24067
     components:
-    - type: MetaData
-      name: holopad (Interrogation)
     - type: Transform
-      pos: -32.5,-3.5
+      pos: 30.5,-13.5
       parent: 60
-    - type: Label
-      currentLabel: Interrogation
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24043
+- proto: HolopadCommandHop
+  entities:
+  - uid: 24076
     components:
-    - type: MetaData
-      name: holopad (Detective)
     - type: Transform
-      pos: -26.5,-28.5
+      pos: 5.5,-29.5
       parent: 60
-    - type: Label
-      currentLabel: Detective
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24044
+- proto: HolopadCommandHos
+  entities:
+  - uid: 24033
     components:
-    - type: MetaData
-      name: holopad (Courtroom)
     - type: Transform
-      pos: -43.5,-17.5
+      pos: -20.5,1.5
       parent: 60
-    - type: Label
-      currentLabel: Courtroom
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24045
+- proto: HolopadCommandQm
+  entities:
+  - uid: 24063
     components:
-    - type: MetaData
-      name: holopad (AI Sat)
     - type: Transform
-      pos: -111.5,17.5
+      pos: 44.5,15.5
       parent: 60
-    - type: Label
-      currentLabel: AI Sat
-    - type: NameModifier
-      baseName: holopad
+- proto: HolopadCommandRd
+  entities:
+  - uid: 24686
+    components:
+    - type: Transform
+      pos: -43.5,8.5
+      parent: 60
+- proto: HolopadEngineeringAtmosFront
+  entities:
   - uid: 24046
     components:
-    - type: MetaData
-      name: holopad (AI Law Upload)
     - type: Transform
-      pos: -111.5,11.5
+      pos: -16.5,28.5
       parent: 60
-    - type: Label
-      currentLabel: AI Law Upload
-    - type: NameModifier
-      baseName: holopad
+- proto: HolopadEngineeringAtmosMain
+  entities:
   - uid: 24047
     components:
-    - type: MetaData
-      name: holopad (Chapel)
     - type: Transform
-      pos: -25.5,16.5
+      pos: -36.5,36.5
       parent: 60
-    - type: Label
-      currentLabel: Chapel
-    - type: NameModifier
-      baseName: holopad
+- proto: HolopadEngineeringAtmosTeg
+  entities:
   - uid: 24048
     components:
-    - type: MetaData
-      name: holopad (Atmos Front)
     - type: Transform
-      pos: -16.5,28.5
+      pos: -16.5,43.5
       parent: 60
-    - type: Label
-      currentLabel: Atmos Front
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24049
+- proto: HolopadEngineeringBreakroom
+  entities:
+  - uid: 24050
     components:
-    - type: MetaData
-      name: holopad (Atmos)
     - type: Transform
-      pos: -36.5,36.5
+      pos: 0.5,18.5
       parent: 60
-    - type: Label
-      currentLabel: Atmos
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24050
+- proto: HolopadEngineeringFront
+  entities:
+  - uid: 24051
     components:
-    - type: MetaData
-      name: holopad (TEG)
     - type: Transform
-      pos: -16.5,43.5
+      pos: 6.5,14.5
       parent: 60
-    - type: Label
-      currentLabel: TEG
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24051
+- proto: HolopadEngineeringStorage
+  entities:
+  - uid: 24054
     components:
-    - type: MetaData
-      name: holopad (Library)
     - type: Transform
-      pos: -8.5,18.5
+      pos: -5.5,28.5
       parent: 60
-    - type: Label
-      currentLabel: Library
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24052
+- proto: HolopadEngineeringTechVault
+  entities:
+  - uid: 24298
     components:
-    - type: MetaData
-      name: holopad (Engineering Breakroom)
     - type: Transform
-      pos: 0.5,18.5
+      pos: 23.5,20.5
       parent: 60
-    - type: Label
-      currentLabel: Engineering Breakroom
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24053
+- proto: HolopadEngineeringTelecoms
+  entities:
+  - uid: 24061
     components:
-    - type: MetaData
-      name: holopad (Engineering Front)
     - type: Transform
-      pos: 6.5,14.5
+      pos: 23.5,1.5
       parent: 60
-    - type: Label
-      currentLabel: Engineering Front
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24054
+- proto: HolopadGeneralCryosleep
+  entities:
+  - uid: 24060
     components:
-    - type: MetaData
-      name: holopad (Tools)
     - type: Transform
-      pos: 11.5,13.5
+      pos: 12.5,-12.5
       parent: 60
-    - type: Label
-      currentLabel: Tools
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24055
+- proto: HolopadGeneralDisposals
+  entities:
+  - uid: 24095
     components:
-    - type: MetaData
-      name: holopad (CE)
     - type: Transform
-      pos: 12.5,19.5
+      pos: -11.5,-41.5
       parent: 60
-    - type: Label
-      currentLabel: CE
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24056
+- proto: HolopadGeneralEVAStorage
+  entities:
+  - uid: 24077
     components:
-    - type: MetaData
-      name: holopad (Engineering Storage)
     - type: Transform
-      pos: -5.5,28.5
+      pos: 5.5,-37.5
       parent: 60
-    - type: Label
-      currentLabel: Engineering Storage
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24059
+- proto: HolopadGeneralLounge
+  entities:
+  - uid: 24778
     components:
-    - type: MetaData
-      name: holopad (Bridge)
     - type: Transform
-      pos: 1.5,1.5
+      pos: -6.5,-45.5
       parent: 60
-    - type: Label
-      currentLabel: Bridge
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24061
+- proto: HolopadGeneralTheater
+  entities:
+  - uid: 24099
     components:
-    - type: MetaData
-      name: holopad (Captain)
     - type: Transform
-      pos: -3.5,-4.5
+      pos: 22.5,-18.5
       parent: 60
-    - type: Label
-      currentLabel: Captain
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24062
+- proto: HolopadGeneralTools
+  entities:
+  - uid: 24052
     components:
-    - type: MetaData
-      name: holopad (Bridge Hallway)
     - type: Transform
-      pos: 0.5,-5.5
+      pos: 11.5,13.5
       parent: 60
-    - type: Label
-      currentLabel: Bridge Hallway
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24063
+- proto: HolopadMedicalChemistry
+  entities:
+  - uid: 24071
     components:
-    - type: MetaData
-      name: holopad (Cryosleep)
     - type: Transform
-      pos: 12.5,-12.5
+      pos: 39.5,-29.5
       parent: 60
-    - type: Label
-      currentLabel: Cryosleep
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24064
+- proto: HolopadMedicalCryopods
+  entities:
+  - uid: 24068
     components:
-    - type: MetaData
-      name: holopad (Telecoms)
     - type: Transform
-      pos: 23.5,1.5
+      pos: 49.5,-21.5
       parent: 60
-    - type: Label
-      currentLabel: Telecoms
-    - type: NameModifier
-      baseName: holopad
+- proto: HolopadMedicalFront
+  entities:
+  - uid: 24070
+    components:
+    - type: Transform
+      pos: 38.5,-23.5
+      parent: 60
+- proto: HolopadMedicalMedbay
+  entities:
+  - uid: 24069
+    components:
+    - type: Transform
+      pos: 34.5,-18.5
+      parent: 60
+- proto: HolopadMedicalMorgue
+  entities:
   - uid: 24065
     components:
-    - type: MetaData
-      name: holopad (News)
     - type: Transform
-      pos: 34.5,17.5
+      pos: 38.5,-9.5
       parent: 60
-    - type: Label
-      currentLabel: News
-    - type: NameModifier
-      baseName: holopad
+- proto: HolopadMedicalParamed
+  entities:
   - uid: 24066
     components:
-    - type: MetaData
-      name: holopad (QM)
     - type: Transform
-      pos: 44.5,15.5
+      pos: 48.5,-17.5
       parent: 60
-    - type: Label
-      currentLabel: QM
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24067
+- proto: HolopadMedicalSurgery
+  entities:
+  - uid: 24147
     components:
-    - type: MetaData
-      name: holopad (Cargo Front)
     - type: Transform
-      pos: 44.5,7.5
+      pos: 39.5,-13.5
       parent: 60
-    - type: Label
-      currentLabel: Cargo Front
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24069
+- proto: HolopadMedicalVirology
+  entities:
+  - uid: 24073
     components:
-    - type: MetaData
-      name: holopad (Morgue)
     - type: Transform
-      pos: 38.5,-9.5
+      pos: 51.5,-27.5
       parent: 60
-    - type: Label
-      currentLabel: Morgue
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24070
+- proto: HolopadScienceAnomaly
+  entities:
+  - uid: 24032
     components:
-    - type: MetaData
-      name: holopad (Paramedic)
     - type: Transform
-      pos: 48.5,-17.5
+      pos: -53.5,-2.5
       parent: 60
-    - type: Label
-      currentLabel: Paramedic
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24071
+- proto: HolopadScienceArtifact
+  entities:
+  - uid: 24031
     components:
-    - type: MetaData
-      name: holopad (CMO)
     - type: Transform
-      pos: 30.5,-13.5
+      pos: -50.5,12.5
       parent: 60
-    - type: Label
-      currentLabel: CMO
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24072
+- proto: HolopadScienceFront
+  entities:
+  - uid: 23160
     components:
-    - type: MetaData
-      name: holopad (Cryopods)
     - type: Transform
-      pos: 49.5,-21.5
+      pos: -43.5,-7.5
       parent: 60
-    - type: Label
-      currentLabel: Cryopods
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24073
+- proto: HolopadScienceRobotics
+  entities:
+  - uid: 24030
     components:
-    - type: MetaData
-      name: holopad (Medbay)
     - type: Transform
-      pos: 34.5,-18.5
+      pos: -32.5,13.5
       parent: 60
-    - type: Label
-      currentLabel: Medbay
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24074
+- proto: HolopadSecurityBrig
+  entities:
+  - uid: 24037
     components:
-    - type: MetaData
-      name: holopad (Medbay Hallway)
     - type: Transform
-      pos: 38.5,-23.5
+      pos: -26.5,-14.5
       parent: 60
-    - type: Label
-      currentLabel: Medbay Hallway
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24075
+- proto: HolopadSecurityCourtroom
+  entities:
+  - uid: 24040
     components:
-    - type: MetaData
-      name: holopad (Chemistry)
     - type: Transform
-      pos: 39.5,-29.5
+      pos: -43.5,-17.5
       parent: 60
-    - type: Label
-      currentLabel: Chemistry
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24076
+- proto: HolopadSecurityDetective
+  entities:
+  - uid: 24039
     components:
-    - type: MetaData
-      name: holopad (Botany)
     - type: Transform
-      pos: 31.5,-28.5
+      pos: -26.5,-28.5
       parent: 60
-    - type: Label
-      currentLabel: Botany
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24077
+- proto: HolopadSecurityFront
+  entities:
+  - uid: 24036
     components:
-    - type: MetaData
-      name: holopad (Virology)
     - type: Transform
-      pos: 51.5,-27.5
+      pos: -19.5,-15.5
       parent: 60
-    - type: Label
-      currentLabel: Virology
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24095
+- proto: HolopadSecurityInterrogation
+  entities:
+  - uid: 24038
     components:
-    - type: MetaData
-      name: holopad (Kitchen)
     - type: Transform
-      pos: 25.5,-37.5
+      pos: -32.5,-3.5
       parent: 60
-    - type: Label
-      currentLabel: Kitchen
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24096
+- proto: HolopadSecurityLawyer
+  entities:
+  - uid: 24291
     components:
-    - type: MetaData
-      name: holopad (Bar)
     - type: Transform
-      pos: 10.5,-35.5
+      pos: -50.5,-18.5
       parent: 60
-    - type: Label
-      currentLabel: Bar
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24099
+- proto: HolopadSecurityPerma
+  entities:
+  - uid: 24035
     components:
-    - type: MetaData
-      name: holopad (HOP)
     - type: Transform
-      pos: 5.5,-29.5
+      pos: -10.5,-14.5
       parent: 60
-    - type: Label
-      currentLabel: HOP
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24100
+- proto: HolopadSecurityWarden
+  entities:
+  - uid: 24034
     components:
-    - type: MetaData
-      name: holopad (EVA Storage)
     - type: Transform
-      pos: 5.5,-37.5
+      pos: -26.5,-9.5
       parent: 60
-    - type: Label
-      currentLabel: EVA Storage
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24147
+- proto: HolopadServiceBar
+  entities:
+  - uid: 24075
     components:
-    - type: MetaData
-      name: holopad (Disposals)
     - type: Transform
-      pos: -11.5,-41.5
+      pos: 10.5,-35.5
       parent: 60
-    - type: Label
-      currentLabel: Disposals
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24166
+- proto: HolopadServiceBotany
+  entities:
+  - uid: 24072
     components:
-    - type: MetaData
-      name: holopad (Janitor)
     - type: Transform
-      pos: -5.5,-27.5
+      pos: 31.5,-28.5
       parent: 60
-    - type: Label
-      currentLabel: Janitor
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24183
+- proto: HolopadServiceChapel
+  entities:
+  - uid: 24045
     components:
-    - type: MetaData
-      name: holopad (Theater)
     - type: Transform
-      pos: 22.5,-18.5
+      pos: -25.5,16.5
       parent: 60
-    - type: Label
-      currentLabel: Theater
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24291
+- proto: HolopadServiceClownMime
+  entities:
+  - uid: 24100
     components:
-    - type: MetaData
-      name: holopad (Clown/Mime)
     - type: Transform
       pos: 23.5,-12.5
       parent: 60
-    - type: Label
-      currentLabel: Clown/Mime
-    - type: NameModifier
-      baseName: holopad
-  - uid: 24298
+- proto: HolopadServiceJanitor
+  entities:
+  - uid: 24096
     components:
-    - type: MetaData
-      name: holopad (Surgery)
     - type: Transform
-      pos: 39.5,-13.5
+      pos: -5.5,-27.5
       parent: 60
-    - type: Label
-      currentLabel: Surgery
-    - type: NameModifier
-      baseName: holopad
-- proto: HolopadLongRange
+- proto: HolopadServiceKitchen
   entities:
-  - uid: 24060
+  - uid: 24074
     components:
-    - type: MetaData
-      name: long-range holopad (Bagel Station Bridge)
     - type: Transform
-      pos: -0.5,1.5
+      pos: 25.5,-37.5
       parent: 60
-    - type: Label
-      currentLabel: Bagel Station Bridge
-    - type: NameModifier
-      baseName: long-range holopad
-  - uid: 24068
+- proto: HolopadServiceLibrary
+  entities:
+  - uid: 24049
     components:
-    - type: MetaData
-      name: long-range holopad (Bagel Station Cargo Bay)
     - type: Transform
-      pos: 55.5,13.5
+      pos: -8.5,18.5
+      parent: 60
+- proto: HolopadServiceNewsroom
+  entities:
+  - uid: 24062
+    components:
+    - type: Transform
+      pos: 34.5,17.5
       parent: 60
-    - type: Label
-      currentLabel: Bagel Station Cargo Bay
-    - type: NameModifier
-      baseName: long-range holopad
 - proto: HospitalCurtainsOpen
   entities:
   - uid: 4144
@@ -110508,18 +110340,6 @@ entities:
     - type: Transform
       pos: 6.57388,-7.3136106
       parent: 60
-- proto: Intellicard
-  entities:
-  - uid: 23160
-    components:
-    - type: Transform
-      pos: -106.55485,22.804966
-      parent: 60
-  - uid: 25392
-    components:
-    - type: Transform
-      pos: -106.41422,22.633091
-      parent: 60
 - proto: IntercomAll
   entities:
   - uid: 2387
@@ -126446,16 +126266,6 @@ entities:
     - type: Transform
       pos: -2.5,-25.5
       parent: 60
-  - uid: 2408
-    components:
-    - type: Transform
-      pos: 30.5,-38.5
-      parent: 60
-  - uid: 2608
-    components:
-    - type: Transform
-      pos: 29.5,-38.5
-      parent: 60
   - uid: 5626
     components:
     - type: Transform
@@ -127135,10 +126945,10 @@ entities:
       parent: 60
     - type: DeviceLinkSource
       linkedPorts:
-        2408:
-        - Pressed: Toggle
         2608:
         - Pressed: Toggle
+        2408:
+        - Pressed: Toggle
   - uid: 3803
     components:
     - type: MetaData