]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
tweak(saltern): Place a red phone in bridge meeting room, add another artifact spawn...
authorBrandon Hu <103440971+Brandon-Huu@users.noreply.github.com>
Sun, 23 Jun 2024 07:59:07 +0000 (07:59 +0000)
committerGitHub <noreply@github.com>
Sun, 23 Jun 2024 07:59:07 +0000 (01:59 -0600)
* tweak(saltern): Place a red phone in bridge meeting room

* add artifact spawn

Resources/Maps/saltern.yml

index 048b0a2e5ce4b8803eada8f68c10693571fef29c..e232aa32721dbc0317cd3793dae09c70664ef738 100644 (file)
@@ -4111,17 +4111,11 @@ entities:
     - type: Transform
       pos: 9.5,6.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 276
   - uid: 116
     components:
     - type: Transform
       pos: 7.5,6.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 276
 - proto: AirlockDetectiveLocked
   entities:
   - uid: 1889
@@ -4320,9 +4314,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 32.5,19.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 11307
     - type: DeviceLinkSource
       linkedPorts:
         11306:
@@ -4332,9 +4323,6 @@ entities:
     - type: Transform
       pos: 31.5,18.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 11306
     - type: DeviceLinkSource
       linkedPorts:
         11307:
@@ -4346,9 +4334,6 @@ entities:
     - type: Transform
       pos: 29.5,20.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 11306
     - type: DeviceLinkSource
       linkedPorts:
         11307:
@@ -4358,9 +4343,6 @@ entities:
     - type: Transform
       pos: 31.5,23.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 11307
     - type: DeviceLinkSource
       linkedPorts:
         11306:
@@ -4379,9 +4361,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 58.5,7.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 175
     - type: DeviceLinkSource
       linkedPorts:
         175:
@@ -4392,9 +4371,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -24.5,24.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 151
     - type: DeviceLinkSource
       linkedPorts:
         151:
@@ -4405,9 +4381,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -26.5,24.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 145
     - type: DeviceLinkSource
       linkedPorts:
         145:
@@ -4418,9 +4391,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 17.5,-31.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 173
     - type: DeviceLinkSource
       linkedPorts:
         173:
@@ -4431,9 +4401,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 15.5,-30.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 172
     - type: DeviceLinkSource
       linkedPorts:
         172:
@@ -4444,9 +4411,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 53.5,8.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 9974
     - type: DeviceLinkSource
       linkedPorts:
         9974:
@@ -4457,9 +4421,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 61.5,7.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 72
     - type: DeviceLinkSource
       linkedPorts:
         72:
@@ -4469,9 +4430,6 @@ entities:
     - type: Transform
       pos: 53.5,4.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 174
     - type: DeviceLinkSource
       linkedPorts:
         174:
@@ -4484,9 +4442,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -24.5,-32.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 183
     - type: DeviceLinkSource
       linkedPorts:
         183:
@@ -4497,9 +4452,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -21.5,-32.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 182
     - type: DeviceLinkSource
       linkedPorts:
         182:
@@ -4509,9 +4461,6 @@ entities:
     - type: Transform
       pos: 16.5,19.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 2465
     - type: DeviceLinkSource
       linkedPorts:
         2465:
@@ -4521,9 +4470,6 @@ entities:
     - type: Transform
       pos: 16.5,22.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 1594
     - type: DeviceLinkSource
       linkedPorts:
         1594:
@@ -5120,17 +5066,11 @@ entities:
     - type: Transform
       pos: 9.5,-6.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 11380
   - uid: 124
     components:
     - type: Transform
       pos: 10.5,-6.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 11380
   - uid: 632
     components:
     - type: MetaData
@@ -5237,9 +5177,6 @@ entities:
     - type: Transform
       pos: -12.5,9.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 9952
   - uid: 1411
     components:
     - type: Transform
@@ -5260,9 +5197,6 @@ entities:
     - type: Transform
       pos: -8.5,9.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 9951
   - uid: 7786
     components:
     - type: MetaData
@@ -6474,105 +6408,66 @@ entities:
     - type: Transform
       pos: 23.5,28.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 7945
   - uid: 1561
     components:
     - type: Transform
       pos: -33.5,-16.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 10218
   - uid: 1756
     components:
     - type: Transform
       pos: 17.5,12.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 2515
   - uid: 3905
     components:
     - type: Transform
       pos: 19.5,28.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 1084
   - uid: 6345
     components:
     - type: Transform
       pos: 51.5,12.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 11053
   - uid: 6348
     components:
     - type: Transform
       pos: 51.5,11.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 11053
   - uid: 6635
     components:
     - type: Transform
       pos: 51.5,13.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 11053
   - uid: 7588
     components:
     - type: Transform
       pos: -15.5,-31.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 10325
   - uid: 10095
     components:
     - type: Transform
       pos: 20.5,25.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 1084
   - uid: 10096
     components:
     - type: Transform
       pos: 22.5,25.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 7945
   - uid: 10201
     components:
     - type: Transform
       pos: -35.5,-16.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 10218
   - uid: 11369
     components:
     - type: Transform
       pos: 58.5,10.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 11372
   - uid: 11370
     components:
     - type: Transform
       pos: 56.5,9.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 11371
 - proto: BlockGameArcade
   entities:
   - uid: 9569
@@ -27306,7 +27201,7 @@ entities:
     - type: Transform
       pos: -11.209741,19.672714
       parent: 31
-- proto: ClothingOuterCoatInspector
+- proto: ClothingOuterCoatDetectiveLoadout
   entities:
   - uid: 7480
     components:
@@ -28091,279 +27986,182 @@ entities:
     - type: Transform
       pos: 20.5,20.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 1084
   - uid: 3387
     components:
     - type: Transform
       pos: 20.5,21.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 1084
   - uid: 3548
     components:
     - type: Transform
       pos: 20.5,23.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 1084
   - uid: 3549
     components:
     - type: Transform
       pos: 20.5,24.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 1084
   - uid: 3550
     components:
     - type: Transform
       pos: 20.5,22.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 1084
   - uid: 7550
     components:
     - type: Transform
       pos: 20.5,19.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 1084
   - uid: 8899
     components:
     - type: Transform
       pos: 20.5,18.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 1084
   - uid: 9138
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 23.5,27.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 7945
   - uid: 9139
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 23.5,26.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 7945
   - uid: 9265
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -35.5,-16.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 10218
   - uid: 9886
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -34.5,-16.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 10218
   - uid: 10033
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -31.5,-18.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 10218
   - uid: 10040
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -31.5,-17.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 10218
   - uid: 10043
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -31.5,-16.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 10218
   - uid: 10045
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 22.5,25.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 7945
   - uid: 10046
     components:
     - type: Transform
       pos: 19.5,28.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 1084
   - uid: 10047
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 22.5,18.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 7945
   - uid: 10048
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 22.5,19.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 7945
   - uid: 10049
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 22.5,20.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 7945
   - uid: 10050
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 22.5,21.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 7945
   - uid: 10051
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 22.5,22.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 7945
   - uid: 10052
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 22.5,23.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 7945
   - uid: 10053
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 22.5,24.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 1084
-      - 7945
   - uid: 10054
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 23.5,28.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 7945
   - uid: 10089
     components:
     - type: Transform
       pos: 20.5,25.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 1084
   - uid: 10090
     components:
     - type: Transform
       pos: 20.5,26.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 1084
   - uid: 10091
     components:
     - type: Transform
       pos: 19.5,27.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 1084
   - uid: 10092
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 19.5,26.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 1084
   - uid: 10093
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 22.5,26.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 7945
   - uid: 10109
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -32.5,-16.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 10218
   - uid: 10110
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -33.5,-16.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 10218
   - uid: 10215
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -36.5,-16.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 10218
 - proto: CrateArtifactContainer
   entities:
   - uid: 99
@@ -48403,9 +48201,6 @@ entities:
     - type: Transform
       pos: 48.339073,12.198484
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 11052
 - proto: InflatableDoorStack
   entities:
   - uid: 3907
@@ -49215,10 +49010,6 @@ entities:
       anchored: True
       pos: 31.5,20.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 9067
-      - 3052
     - type: DeviceLinkSource
       linkedPorts:
         6522:
@@ -49234,10 +49025,6 @@ entities:
       anchored: True
       pos: 31.5,21.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 6522
-      - 9068
     - type: DeviceLinkSource
       linkedPorts:
         3052:
@@ -49282,9 +49069,6 @@ entities:
     - type: Transform
       pos: -15.5,-30.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 9292
 - proto: MachineCentrifuge
   entities:
   - uid: 580
@@ -50297,11 +50081,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -16.707977,-25.58053
       parent: 31
-  - uid: 967
-    components:
-    - type: Transform
-      pos: -1.563138,24.568495
-      parent: 31
   - uid: 2031
     components:
     - type: Transform
@@ -50359,6 +50138,13 @@ entities:
     - type: Transform
       pos: 7.5388803,-23.388987
       parent: 31
+- proto: PhoneInstrument
+  entities:
+  - uid: 967
+    components:
+    - type: Transform
+      pos: -1.5092547,24.523743
+      parent: 31
 - proto: PianoInstrument
   entities:
   - uid: 8425
@@ -53399,7 +53185,12 @@ entities:
   - uid: 3735
     components:
     - type: Transform
-      pos: -15.5,-30.5
+      pos: -16.5,-30.5
+      parent: 31
+  - uid: 7544
+    components:
+    - type: Transform
+      pos: -14.5,-30.5
       parent: 31
 - proto: RandomBoard
   entities:
@@ -53904,9 +53695,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -34.5,-16.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 10218
 - proto: ReinforcedPlasmaWindow
   entities:
   - uid: 439
@@ -56043,24 +55831,16 @@ entities:
       parent: 31
     - type: DeviceLinkSink
       invokeCounter: 2
-      links:
-      - 5132
   - uid: 11118
     components:
     - type: Transform
       pos: -7.5,26.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 11284
   - uid: 11119
     components:
     - type: Transform
       pos: -6.5,26.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 11284
 - proto: ShuttersNormalOpen
   entities:
   - uid: 1475
@@ -56069,112 +55849,73 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 5.5,-10.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 10997
   - uid: 2137
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 5.5,-11.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 10997
   - uid: 2138
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 5.5,-8.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 10996
   - uid: 4693
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -10.5,1.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 4526
   - uid: 4694
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -10.5,0.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 4526
   - uid: 4695
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -10.5,-0.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 4526
   - uid: 8767
     components:
     - type: Transform
       pos: -16.5,7.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 8766
   - uid: 8768
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -16.5,6.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 8766
   - uid: 8770
     components:
     - type: Transform
       pos: -13.5,6.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 8774
   - uid: 8771
     components:
     - type: Transform
       pos: -12.5,6.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 8774
   - uid: 8772
     components:
     - type: Transform
       pos: -7.5,6.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 8774
   - uid: 8773
     components:
     - type: Transform
       pos: -8.5,6.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 8774
   - uid: 9122
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 5.5,-7.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 10996
 - proto: ShuttersRadiationOpen
   entities:
   - uid: 9551
@@ -56182,41 +55923,26 @@ entities:
     - type: Transform
       pos: 61.5,4.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 9557
   - uid: 9552
     components:
     - type: Transform
       pos: 61.5,3.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 9557
   - uid: 9553
     components:
     - type: Transform
       pos: 61.5,2.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 9557
   - uid: 9554
     components:
     - type: Transform
       pos: 61.5,1.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 9557
   - uid: 9555
     components:
     - type: Transform
       pos: 61.5,0.5
       parent: 31
-    - type: DeviceLinkSink
-      links:
-      - 9557
 - proto: SignalButton
   entities:
   - uid: 2515