]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Gate map: Holopads added (#33918)
authorEd <96445749+TheShuEd@users.noreply.github.com>
Tue, 17 Dec 2024 21:37:19 +0000 (00:37 +0300)
committerGitHub <noreply@github.com>
Tue, 17 Dec 2024 21:37:19 +0000 (14:37 -0700)
Update gate.yml

Resources/Maps/gate.yml

index b4689490a76ef2d9085863a4f898974cdf5808bb..6b05d951ee7af19bd6904a30df80f05e3804bae9 100644 (file)
@@ -12751,8 +12751,8 @@ entities:
           localAnchorB: -3,-1.5
           localAnchorA: -8.5,8
           referenceAngle: 1.5707964
-          damping: 753.6405
-          stiffness: 6764.662
+          damping: 753.6482
+          stiffness: 6764.7305
         docking457716: !type:WeldJoint
           bodyB: 37842
           bodyA: 2
@@ -12760,16 +12760,16 @@ entities:
           localAnchorB: -3,0.5
           localAnchorA: -10.5,8
           referenceAngle: 1.5707964
-          damping: 753.6405
-          stiffness: 6764.662
+          damping: 753.6482
+          stiffness: 6764.7305
         docking168406: !type:WeldJoint
           bodyB: 21114
           bodyA: 2
           id: docking168406
           localAnchorB: 6,1.5
           localAnchorA: -50,100.5
-          damping: 433.78143
-          stiffness: 3893.6135
+          damping: 433.784
+          stiffness: 3893.6365
         docking51973: !type:WeldJoint
           bodyB: 30902
           bodyA: 2
@@ -12777,8 +12777,8 @@ entities:
           localAnchorB: 2.5,-4
           localAnchorA: -0.5,161
           referenceAngle: 3.1415927
-          damping: 621.39355
-          stiffness: 5577.616
+          damping: 621.39874
+          stiffness: 5577.6626
         docking51974: !type:WeldJoint
           bodyB: 30902
           bodyA: 2
@@ -12786,8 +12786,8 @@ entities:
           localAnchorB: 0.49999997,-4
           localAnchorA: 1.5,161
           referenceAngle: 3.1415927
-          damping: 621.39355
-          stiffness: 5577.616
+          damping: 621.39874
+          stiffness: 5577.6626
         docking15994: !type:WeldJoint
           bodyB: 13386
           bodyA: 2
@@ -12795,8 +12795,8 @@ entities:
           localAnchorB: 5,0.49999997
           localAnchorA: 42.5,68
           referenceAngle: 4.712389
-          damping: 922.5239
-          stiffness: 8280.555
+          damping: 922.5353
+          stiffness: 8280.658
     - type: BecomesStation
       id: Gate
     - type: FTLDestination
@@ -17113,7 +17113,7 @@ entities:
       pos: 1.5,161.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -11685.902
+      secondsUntilStateChange: -12568.539
       changeAirtight: False
       state: Opening
     - type: Docking
@@ -17129,7 +17129,7 @@ entities:
       pos: -0.5,161.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -11683.868
+      secondsUntilStateChange: -12566.505
       changeAirtight: False
       state: Opening
     - type: Docking
@@ -23633,11 +23633,6 @@ entities:
     - type: Transform
       pos: 0.5,86.5
       parent: 2
-  - uid: 10673
-    components:
-    - type: Transform
-      pos: -1.5,86.5
-      parent: 2
   - uid: 10676
     components:
     - type: Transform
@@ -81462,13 +81457,6 @@ entities:
           showEnts: False
           occludes: True
           ent: null
-- proto: CrateHydroponicsSeeds
-  entities:
-  - uid: 35699
-    components:
-    - type: Transform
-      pos: -4.5,59.5
-      parent: 2
 - proto: CrateMedicalSurgery
   entities:
   - uid: 22734
@@ -81531,10 +81519,10 @@ entities:
       parent: 2
 - proto: CrateServicePersonnel
   entities:
-  - uid: 10534
+  - uid: 9173
     components:
     - type: Transform
-      pos: -15.5,83.5
+      pos: -15.5,84.5
       parent: 2
 - proto: CrateStoneGrave
   entities:
@@ -93781,11 +93769,6 @@ entities:
       parent: 2
 - proto: filingCabinetDrawerRandom
   entities:
-  - uid: 10483
-    components:
-    - type: Transform
-      pos: -15.5,84.5
-      parent: 2
   - uid: 10697
     components:
     - type: Transform
@@ -98777,18 +98760,33 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -70.5,68.5
       parent: 2
-- proto: FloraRockSolid01
+- proto: FloraRockSolid
   entities:
+  - uid: 880
+    components:
+    - type: Transform
+      pos: 62.42534,20.753548
+      parent: 2
   - uid: 1881
     components:
     - type: Transform
       pos: 41.347694,18.443283
       parent: 2
+  - uid: 4710
+    components:
+    - type: Transform
+      pos: -3.8643913,219.4986
+      parent: 2
   - uid: 5882
     components:
     - type: Transform
       pos: 5.1426125,216.73248
       parent: 2
+  - uid: 6294
+    components:
+    - type: Transform
+      pos: 9.40974,213.58945
+      parent: 2
   - uid: 11267
     components:
     - type: Transform
@@ -98799,37 +98797,30 @@ entities:
     - type: Transform
       pos: -81.36003,29.945816
       parent: 2
-  - uid: 18272
-    components:
-    - type: Transform
-      pos: 29.159416,176.0938
-      parent: 2
-  - uid: 26191
+  - uid: 12006
     components:
     - type: Transform
-      pos: -59.108765,58.061966
+      pos: -132.0299,58.225758
       parent: 2
-  - uid: 43447
+  - uid: 12010
     components:
     - type: Transform
-      pos: -128.36145,12.053505
+      pos: -122.38654,15.097786
       parent: 2
-- proto: FloraRockSolid02
-  entities:
-  - uid: 4710
+  - uid: 14149
     components:
     - type: Transform
-      pos: -3.8643913,219.4986
+      pos: -96.5112,92.46866
       parent: 2
-  - uid: 12006
+  - uid: 14881
     components:
     - type: Transform
-      pos: -132.0299,58.225758
+      pos: -76.10167,114.738846
       parent: 2
-  - uid: 14881
+  - uid: 18272
     components:
     - type: Transform
-      pos: -76.10167,114.738846
+      pos: 29.159416,176.0938
       parent: 2
   - uid: 20931
     components:
@@ -98841,121 +98832,99 @@ entities:
     - type: Transform
       pos: 34.51841,7.917267
       parent: 2
-- proto: FloraRockSolid03
-  entities:
-  - uid: 880
-    components:
-    - type: Transform
-      pos: 62.42534,20.753548
-      parent: 2
-  - uid: 6294
-    components:
-    - type: Transform
-      pos: 9.40974,213.58945
-      parent: 2
-  - uid: 12010
+  - uid: 23806
     components:
     - type: Transform
-      pos: -122.38654,15.097786
+      pos: -90.20589,99.00934
       parent: 2
-  - uid: 14149
+  - uid: 26191
     components:
     - type: Transform
-      pos: -96.5112,92.46866
+      pos: -59.108765,58.061966
       parent: 2
-  - uid: 23806
+  - uid: 43447
     components:
     - type: Transform
-      pos: -90.20589,99.00934
+      pos: -128.36145,12.053505
       parent: 2
-- proto: FloraTree01
+- proto: FloraTree
   entities:
-  - uid: 11224
+  - uid: 4973
     components:
     - type: Transform
-      pos: -18.302986,76.423996
+      pos: -96.588066,149.62936
       parent: 2
-  - uid: 17289
+  - uid: 6853
     components:
     - type: Transform
-      pos: -70.78352,153.77
+      pos: -69.04449,67.460915
       parent: 2
-  - uid: 23684
+  - uid: 7860
     components:
     - type: Transform
-      pos: 16.92492,197.97273
+      rot: 3.141592653589793 rad
+      pos: -42.29085,75.604614
       parent: 2
-- proto: FloraTree02
-  entities:
-  - uid: 4973
+  - uid: 11224
     components:
     - type: Transform
-      pos: -96.588066,149.62936
+      pos: -18.302986,76.423996
       parent: 2
-  - uid: 23685
+  - uid: 13629
     components:
     - type: Transform
-      pos: 18.184696,197.4105
+      pos: -30.556133,102.17079
       parent: 2
-- proto: FloraTree03
-  entities:
-  - uid: 13629
+  - uid: 17289
     components:
     - type: Transform
-      pos: -30.556133,102.17079
+      pos: -70.78352,153.77
       parent: 2
-- proto: FloraTree04
-  entities:
-  - uid: 7860
+  - uid: 17401
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -42.29085,75.604614
+      pos: 10.165936,197.45468
       parent: 2
-  - uid: 23682
+  - uid: 19566
     components:
     - type: Transform
-      pos: 16.356737,187.62883
+      pos: -84.49581,150.5657
       parent: 2
-  - uid: 23686
+  - uid: 23680
     components:
     - type: Transform
-      pos: 13.748766,194.95978
+      pos: 17.391369,185.53941
       parent: 2
-- proto: FloraTree05
-  entities:
-  - uid: 19566
+  - uid: 23681
     components:
     - type: Transform
-      pos: -84.49581,150.5657
+      pos: 14.15213,187.9999
       parent: 2
-  - uid: 23921
+  - uid: 23682
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -39.30851,87.37485
+      pos: 16.356737,187.62883
       parent: 2
-- proto: FloraTree06
-  entities:
-  - uid: 6853
+  - uid: 23684
     components:
     - type: Transform
-      pos: -69.04449,67.460915
+      pos: 16.92492,197.97273
       parent: 2
-  - uid: 17401
+  - uid: 23685
     components:
     - type: Transform
-      pos: 10.165936,197.45468
+      pos: 18.184696,197.4105
       parent: 2
-  - uid: 23680
+  - uid: 23686
     components:
     - type: Transform
-      pos: 17.391369,185.53941
+      pos: 13.748766,194.95978
       parent: 2
-  - uid: 23681
+  - uid: 23921
     components:
     - type: Transform
-      pos: 14.15213,187.9999
+      rot: 3.141592653589793 rad
+      pos: -39.30851,87.37485
       parent: 2
 - proto: FloraTreeChristmas02
   entities:
@@ -98964,8 +98933,13 @@ entities:
     - type: Transform
       pos: -13.516092,179.39502
       parent: 2
-- proto: FloraTreeConifer01
+- proto: FloraTreeConifer
   entities:
+  - uid: 19210
+    components:
+    - type: Transform
+      pos: -14.629169,176.01395
+      parent: 2
   - uid: 22743
     components:
     - type: Transform
@@ -98981,27 +98955,13 @@ entities:
     - type: Transform
       pos: -9.46891,202.46387
       parent: 2
-- proto: FloraTreeConifer02
-  entities:
-  - uid: 19210
-    components:
-    - type: Transform
-      pos: -14.629169,176.01395
-      parent: 2
-- proto: FloraTreeLarge01
+- proto: FloraTreeLarge
   entities:
   - uid: 23678
     components:
     - type: Transform
       pos: 9.395896,194.12773
       parent: 2
-  - uid: 36476
-    components:
-    - type: Transform
-      pos: -70.99036,160.58142
-      parent: 2
-- proto: FloraTreeLarge06
-  entities:
   - uid: 23679
     components:
     - type: Transform
@@ -99012,80 +98972,77 @@ entities:
     - type: Transform
       pos: 14.394122,197.48923
       parent: 2
-- proto: FloraTreeSnow02
+  - uid: 36476
+    components:
+    - type: Transform
+      pos: -70.99036,160.58142
+      parent: 2
+- proto: FloraTreeSnow
   entities:
-  - uid: 22742
+  - uid: 14353
     components:
     - type: Transform
-      pos: -1.6083536,181.74948
+      pos: -85.37901,98.40219
       parent: 2
-  - uid: 32655
+  - uid: 18182
     components:
     - type: Transform
-      pos: -8.938912,185.38167
+      pos: -2.8286896,189.72049
       parent: 2
-- proto: FloraTreeSnow03
-  entities:
-  - uid: 19065
+  - uid: 18771
     components:
     - type: Transform
-      pos: -0.6724396,191.37674
+      pos: -17.746033,184.87071
       parent: 2
-  - uid: 23429
+  - uid: 18775
     components:
     - type: Transform
-      pos: -3.3635125,198.84409
+      pos: -14.700613,182.2656
       parent: 2
-  - uid: 23470
+  - uid: 18796
     components:
     - type: Transform
-      pos: -2.6548405,197.0312
+      pos: -2.898879,183.18465
       parent: 2
-- proto: FloraTreeSnow04
-  entities:
-  - uid: 14353
+  - uid: 19065
     components:
     - type: Transform
-      pos: -85.37901,98.40219
+      pos: -0.6724396,191.37674
       parent: 2
-  - uid: 18182
+  - uid: 22742
     components:
     - type: Transform
-      pos: -2.8286896,189.72049
+      pos: -1.6083536,181.74948
       parent: 2
   - uid: 23148
     components:
     - type: Transform
       pos: -3.506566,186.5033
       parent: 2
-- proto: FloraTreeSnow05
-  entities:
-  - uid: 18771
+  - uid: 23149
     components:
     - type: Transform
-      pos: -17.746033,184.87071
+      pos: -7.8782434,180.7243
       parent: 2
-  - uid: 18775
+  - uid: 23429
     components:
     - type: Transform
-      pos: -14.700613,182.2656
+      pos: -3.3635125,198.84409
       parent: 2
-  - uid: 18796
+  - uid: 23470
     components:
     - type: Transform
-      pos: -2.898879,183.18465
+      pos: -2.6548405,197.0312
       parent: 2
   - uid: 23520
     components:
     - type: Transform
       pos: -4.5919485,204.44345
       parent: 2
-- proto: FloraTreeSnow06
-  entities:
-  - uid: 23149
+  - uid: 32655
     components:
     - type: Transform
-      pos: -7.8782434,180.7243
+      pos: -8.938912,185.38167
       parent: 2
 - proto: FloraTreeStump
   entities:
@@ -103007,11 +102964,15 @@ entities:
     - type: Transform
       pos: -25.5,-5.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF0000FF'
   - uid: 8989
     components:
     - type: Transform
       pos: -15.5,-2.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF0000FF'
   - uid: 13313
     components:
     - type: Transform
@@ -105329,6 +105290,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -26.5,2.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF0000FF'
   - uid: 10078
     components:
     - type: Transform
@@ -122860,14 +122823,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
-  - uid: 35618
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -44.5,-12.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF0000FF'
   - uid: 35622
     components:
     - type: Transform
@@ -125153,6 +125108,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: -33.5,-1.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF0000FF'
   - uid: 8955
     components:
     - type: Transform
@@ -125182,6 +125139,8 @@ entities:
     - type: Transform
       pos: -29.5,-11.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF0000FF'
   - uid: 8961
     components:
     - type: Transform
@@ -125236,6 +125195,8 @@ entities:
     - type: Transform
       pos: -39.5,-1.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF0000FF'
   - uid: 8971
     components:
     - type: Transform
@@ -125321,11 +125282,15 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -25.5,-9.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF0000FF'
   - uid: 8985
     components:
     - type: Transform
       pos: -8.5,-2.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF0000FF'
   - uid: 9002
     components:
     - type: Transform
@@ -125343,6 +125308,14 @@ entities:
       rot: 3.141592653589793 rad
       pos: -27.5,3.5
       parent: 2
+  - uid: 9197
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -44.5,-12.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF0000FF'
   - uid: 10063
     components:
     - type: Transform
@@ -128911,6 +128884,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -30.5,-11.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF0000FF'
   - uid: 4034
     components:
     - type: Transform
@@ -128965,6 +128940,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -24.5,-9.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF0000FF'
   - uid: 6254
     components:
     - type: Transform
@@ -129306,18 +129283,24 @@ entities:
       rot: 3.141592653589793 rad
       pos: -39.5,-2.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF0000FF'
   - uid: 9006
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -8.5,-3.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF0000FF'
   - uid: 9013
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -32.5,-1.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF0000FF'
   - uid: 9016
     components:
     - type: Transform
@@ -129332,6 +129315,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: -15.5,-3.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF0000FF'
   - uid: 9020
     components:
     - type: Transform
@@ -129353,6 +129338,8 @@ entities:
     - type: Transform
       pos: -25.5,-4.5
       parent: 2
+    - type: AtmosPipeColor
+      color: '#FF0000FF'
   - uid: 9045
     components:
     - type: Transform
@@ -129376,6 +129363,13 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
+  - uid: 9175
+    components:
+    - type: Transform
+      pos: -44.5,-11.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#FF0000FF'
   - uid: 10107
     components:
     - type: Transform
@@ -130187,18 +130181,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF0000FF'
-  - uid: 35620
-    components:
-    - type: Transform
-      anchored: False
-      rot: -1.5707963267948966 rad
-      pos: -44.5,-12.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#FF0000FF'
-    - type: Physics
-      canCollide: True
-      bodyType: Dynamic
   - uid: 35645
     components:
     - type: Transform
@@ -138394,6 +138376,307 @@ entities:
     - type: Transform
       pos: -105.6635,34.750355
       parent: 2
+- proto: Holopad
+  entities:
+  - uid: 4399
+    components:
+    - type: MetaData
+      name: holopad (Reporter)
+    - type: Transform
+      pos: -1.5,86.5
+      parent: 2
+    - type: Label
+      currentLabel: Reporter
+    - type: NameModifier
+      baseName: holopad
+  - uid: 6468
+    components:
+    - type: MetaData
+      name: holopad (Hydpoponic)
+    - type: Transform
+      pos: -4.5,59.5
+      parent: 2
+    - type: Label
+      currentLabel: Hydpoponic
+    - type: NameModifier
+      baseName: holopad
+  - uid: 9172
+    components:
+    - type: MetaData
+      name: holopad (HoP)
+    - type: Transform
+      pos: -15.5,83.5
+      parent: 2
+    - type: Label
+      currentLabel: HoP
+    - type: NameModifier
+      baseName: holopad
+  - uid: 9174
+    components:
+    - type: MetaData
+      name: holopad (Salvage)
+    - type: Transform
+      pos: -44.5,-12.5
+      parent: 2
+    - type: Label
+      currentLabel: Salvage
+    - type: NameModifier
+      baseName: holopad
+  - uid: 9176
+    components:
+    - type: MetaData
+      name: holopad (Security)
+    - type: Transform
+      pos: 71.5,59.5
+      parent: 2
+    - type: Label
+      currentLabel: Security
+    - type: NameModifier
+      baseName: holopad
+  - uid: 9178
+    components:
+    - type: MetaData
+      name: holopad (Kitchen)
+    - type: Transform
+      pos: -14.5,62.5
+      parent: 2
+    - type: Label
+      currentLabel: Kitchen
+    - type: NameModifier
+      baseName: holopad
+  - uid: 9179
+    components:
+    - type: MetaData
+      name: holopad (Detective)
+    - type: Transform
+      pos: 0.5,77.5
+      parent: 2
+    - type: Label
+      currentLabel: Detective
+    - type: NameModifier
+      baseName: holopad
+  - uid: 9180
+    components:
+    - type: MetaData
+      name: holopad (Chapel)
+    - type: Transform
+      pos: -54.5,61.5
+      parent: 2
+    - type: Label
+      currentLabel: Chapel
+    - type: NameModifier
+      baseName: holopad
+  - uid: 9181
+    components:
+    - type: MetaData
+      name: holopad (Bartender)
+    - type: Transform
+      pos: -32.5,57.5
+      parent: 2
+    - type: Label
+      currentLabel: Bartender
+    - type: NameModifier
+      baseName: holopad
+  - uid: 9182
+    components:
+    - type: MetaData
+      name: holopad (Zookeeper)
+    - type: Transform
+      pos: -64.5,66.5
+      parent: 2
+    - type: Label
+      currentLabel: Zookeeper
+    - type: NameModifier
+      baseName: holopad
+  - uid: 9183
+    components:
+    - type: MetaData
+      name: holopad (Lawyer)
+    - type: Transform
+      pos: -77.5,74.5
+      parent: 2
+    - type: Label
+      currentLabel: Lawyer
+    - type: NameModifier
+      baseName: holopad
+  - uid: 9184
+    components:
+    - type: MetaData
+      name: holopad (Library)
+    - type: Transform
+      pos: -64.5,84.5
+      parent: 2
+    - type: Label
+      currentLabel: Library
+    - type: NameModifier
+      baseName: holopad
+  - uid: 9185
+    components:
+    - type: MetaData
+      name: holopad (CMO)
+    - type: Transform
+      pos: -15.5,205.5
+      parent: 2
+    - type: Label
+      currentLabel: CMO
+    - type: NameModifier
+      baseName: holopad
+  - uid: 9186
+    components:
+    - type: MetaData
+      name: holopad (Chemistry)
+    - type: Transform
+      pos: -23.5,192.5
+      parent: 2
+    - type: Label
+      currentLabel: Chemistry
+    - type: NameModifier
+      baseName: holopad
+  - uid: 9187
+    components:
+    - type: MetaData
+      name: holopad (Medical)
+    - type: Transform
+      pos: -7.5,188.5
+      parent: 2
+    - type: Label
+      currentLabel: Medical
+    - type: NameModifier
+      baseName: holopad
+  - uid: 9188
+    components:
+    - type: MetaData
+      name: holopad (Science 2)
+    - type: Transform
+      pos: -71.5,167.5
+      parent: 2
+    - type: Label
+      currentLabel: Science 2
+    - type: NameModifier
+      baseName: holopad
+  - uid: 9189
+    components:
+    - type: MetaData
+      name: holopad (Science 1)
+    - type: Transform
+      pos: -86.5,181.5
+      parent: 2
+    - type: Label
+      currentLabel: Science 1
+    - type: NameModifier
+      baseName: holopad
+  - uid: 9190
+    components:
+    - type: MetaData
+      name: holopad (RD)
+    - type: Transform
+      pos: -87.5,158.5
+      parent: 2
+    - type: Label
+      currentLabel: RD
+    - type: NameModifier
+      baseName: holopad
+  - uid: 9191
+    components:
+    - type: MetaData
+      name: holopad (Hangar)
+    - type: Transform
+      pos: -122.5,97.5
+      parent: 2
+    - type: Label
+      currentLabel: Hangar
+    - type: NameModifier
+      baseName: holopad
+  - uid: 9192
+    components:
+    - type: MetaData
+      name: holopad (CE)
+    - type: Transform
+      pos: -122.5,53.5
+      parent: 2
+    - type: Label
+      currentLabel: CE
+    - type: NameModifier
+      baseName: holopad
+  - uid: 9193
+    components:
+    - type: MetaData
+      name: holopad (Engineering)
+    - type: Transform
+      pos: -116.5,47.5
+      parent: 2
+    - type: Label
+      currentLabel: Engineering
+    - type: NameModifier
+      baseName: holopad
+  - uid: 9194
+    components:
+    - type: MetaData
+      name: holopad (Atmos)
+    - type: Transform
+      pos: -108.5,18.5
+      parent: 2
+    - type: Label
+      currentLabel: Atmos
+    - type: NameModifier
+      baseName: holopad
+  - uid: 9195
+    components:
+    - type: MetaData
+      name: holopad (Cargo)
+    - type: Transform
+      pos: -23.5,-1.5
+      parent: 2
+    - type: Label
+      currentLabel: Cargo
+    - type: NameModifier
+      baseName: holopad
+  - uid: 9196
+    components:
+    - type: MetaData
+      name: holopad (QM)
+    - type: Transform
+      pos: -25.5,-11.5
+      parent: 2
+    - type: Label
+      currentLabel: QM
+    - type: NameModifier
+      baseName: holopad
+  - uid: 9198
+    components:
+    - type: MetaData
+      name: holopad (Permabrig)
+    - type: Transform
+      pos: 54.5,24.5
+      parent: 2
+    - type: Label
+      currentLabel: Permabrig
+    - type: NameModifier
+      baseName: holopad
+  - uid: 9200
+    components:
+    - type: MetaData
+      name: holopad (HoS)
+    - type: Transform
+      pos: 85.5,63.5
+      parent: 2
+    - type: Label
+      currentLabel: HoS
+    - type: NameModifier
+      baseName: holopad
+- proto: HolopadLongRange
+  entities:
+  - uid: 9177
+    components:
+    - type: MetaData
+      name: long-range holopad (Bridge)
+    - type: Transform
+      pos: -36.5,106.5
+      parent: 2
+    - type: Label
+      currentLabel: Bridge
+    - type: NameModifier
+      baseName: long-range holopad
 - proto: Holoprojector
   entities:
   - uid: 18316
@@ -143685,10 +143968,10 @@ entities:
       parent: 2
 - proto: PortableFlasher
   entities:
-  - uid: 4399
+  - uid: 9199
     components:
     - type: Transform
-      pos: 71.5,59.5
+      pos: 71.5,61.5
       parent: 2
   - uid: 12549
     components:
@@ -144623,11 +144906,6 @@ entities:
     - type: Transform
       pos: -44.5,106.5
       parent: 2
-  - uid: 13643
-    components:
-    - type: Transform
-      pos: -36.5,106.5
-      parent: 2
   - uid: 14201
     components:
     - type: Transform
@@ -172345,11 +172623,6 @@ entities:
       parent: 2
 - proto: VendingMachineHappyHonk
   entities:
-  - uid: 13549
-    components:
-    - type: Transform
-      pos: -14.5,62.5
-      parent: 2
   - uid: 37748
     components:
     - type: Transform