Merge pull request #1098 from EpicToastTM/map-updates-12182024

Holopads, Pipe Sensors, Etc. (Core/Packed/Meta/Barratry/Reach/Union)
impstation · Dec 22, 2024 · 224158d · 224158d
2 parents f9a1a80 + 5db19c2
commit 224158d
Show file tree

Hide file tree

Showing 6 changed files with 5,680 additions and 3,060 deletions.
diff --git a/Resources/Maps/_Harmony/barratry.yml b/Resources/Maps/_Harmony/barratry.yml
diff --git a/Resources/Maps/_Impstation/core.yml b/Resources/Maps/_Impstation/core.yml
diff --git a/Resources/Maps/_Impstation/meta.yml b/Resources/Maps/_Impstation/meta.yml
diff --git a/Resources/Maps/_Impstation/packed.yml b/Resources/Maps/_Impstation/packed.yml
diff --git a/Resources/Maps/_Impstation/reach.yml b/Resources/Maps/_Impstation/reach.yml
@@ -61,7 +61,7 @@ entities:
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAHAAAAAAAAQAAAAAAKQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAKgAAAAAAKgAAAAAAAQAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAKQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAAQAAAAAAKAAAAAAAKAAAAAAAKQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAKgAAAAAAKgAAAAAAAQAAAAAAAQAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAHQAAAAABKAAAAAAAKAAAAAAAKQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAGwAAAAADAQAAAAAAKAAAAAAAAQAAAAAAKQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAGwAAAAABAQAAAAAAAQAAAAAAAQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAGwAAAAACAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAGwAAAAABAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAAQAAAAAAAQAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAGwAAAAADAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAGwAAAAACAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAGwAAAAACAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAGwAAAAACAQAAAAAAHgAAAAAAHgAAAAABHgAAAAACHgAAAAADHgAAAAAAHgAAAAAAHgAAAAABHgAAAAADHgAAAAACHgAAAAADHgAAAAACAQAAAAAAGwAAAAADAgAAAAADGwAAAAACAQAAAAAAHgAAAAABHgAAAAADHgAAAAAAHgAAAAACHgAAAAADHgAAAAACHgAAAAADHgAAAAAAHgAAAAACHgAAAAACHgAAAAAAAQAAAAAAGwAAAAADAgAAAAABGwAAAAABAQAAAAAAHgAAAAAAHgAAAAADHgAAAAABHgAAAAAAHgAAAAACHgAAAAABHgAAAAACHgAAAAACHgAAAAAAHgAAAAACHgAAAAABAQAAAAAAGwAAAAAAAgAAAAADGwAAAAACAQAAAAAAAQAAAAAAHgAAAAADHgAAAAADAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAHgAAAAADHgAAAAADHgAAAAADAQAAAAAAAQAAAAAAAQAAAAAAGwAAAAAAAQAAAAAAHgAAAAABHgAAAAACHgAAAAACAQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAAQAAAAAAHgAAAAABHgAAAAABHgAAAAADAQAAAAAAGwAAAAABGwAAAAAC
+          tiles: AAAAAAAAAAAAAAAAHAAAAAAAAQAAAAAAKQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAKgAAAAAAKgAAAAAAAQAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAKQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAAQAAAAAAKAAAAAAAKAAAAAAAKQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAKgAAAAAAKgAAAAAAAQAAAAAAAQAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAHQAAAAABKAAAAAAAKAAAAAAAKQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAGwAAAAADAQAAAAAAKAAAAAAAKAAAAAAAKQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAGwAAAAABAQAAAAAAAQAAAAAAAQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAGwAAAAACAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAGwAAAAABAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAAQAAAAAAAQAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAGwAAAAADAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAGwAAAAACAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAHAAAAAAAAAAAAAAAAAAAAAAAGwAAAAACAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAGwAAAAACAQAAAAAAHgAAAAAAHgAAAAABHgAAAAACHgAAAAADHgAAAAAAHgAAAAAAHgAAAAABHgAAAAADHgAAAAACHgAAAAADHgAAAAACAQAAAAAAGwAAAAADAgAAAAADGwAAAAACAQAAAAAAHgAAAAABHgAAAAADHgAAAAAAHgAAAAACHgAAAAADHgAAAAACHgAAAAADHgAAAAAAHgAAAAACHgAAAAACHgAAAAAAAQAAAAAAGwAAAAADAgAAAAABGwAAAAABAQAAAAAAHgAAAAAAHgAAAAADHgAAAAABHgAAAAAAHgAAAAACHgAAAAABHgAAAAACHgAAAAACHgAAAAAAHgAAAAACHgAAAAABAQAAAAAAGwAAAAAAAgAAAAADGwAAAAACAQAAAAAAAQAAAAAAHgAAAAADHgAAAAADAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAHgAAAAADHgAAAAADHgAAAAADAQAAAAAAAQAAAAAAAQAAAAAAGwAAAAAAAQAAAAAAHgAAAAABHgAAAAACHgAAAAACAQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAAQAAAAAAHgAAAAABHgAAAAABHgAAAAADAQAAAAAAGwAAAAABGwAAAAAC
           version: 6
         -2,0:
           ind: -2,0
@@ -139,6 +139,8 @@ entities:
             399: -23,-1
             400: -23,1
             413: -24,0
+            417: 1,9
+            418: 22,0
         - node:
             color: '#FFFFFFFF'
             id: BotLeft
@@ -547,13 +549,20 @@ entities:
           decals:
             221: -18,-4
             272: 1,13
+            432: 2,-13
+            434: 3,-12
+            435: 2,-14
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: DirtHeavyMonotile
+          decals:
+            431: 3,-14
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtLight
           decals:
-            7: 2,-13
-            11: 3,-13
             216: -18,-2
             217: -18,-3
             218: -18,-3
@@ -585,18 +594,21 @@ entities:
             279: 1,8
             280: 0,8
             281: 1,7
-            416: 3,-14
+            436: 3,-12
+            438: 3,-14
+            439: 2,-13
+            449: 3,-13
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtMedium
           decals:
-            8: 2,-12
-            9: 2,-13
-            10: 2,-14
             222: -19,-3
             270: 0,7
             271: 1,10
+            440: 2,-14
+            447: 3,-13
+            448: 2,-12
         - node:
             color: '#52B4E996'
             id: FullTileOverlayGreyscale
@@ -607,11 +619,12 @@ entities:
             color: '#EFB34196'
             id: FullTileOverlayGreyscale
           decals:
-            0: 2,-14
-            1: 2,-13
-            2: 2,-12
-            3: 3,-13
-            415: 3,-14
+            424: 3,-12
+            426: 2,-13
+            427: 2,-14
+            428: 3,-14
+            445: 2,-12
+            446: 3,-13
         - node:
             color: '#FFFFFFFF'
             id: Grasse2
@@ -1031,7 +1044,7 @@ entities:
           -4,-2:
             0: 57344
           -5,-2:
-            0: 57344
+            0: 58368
           -4,-1:
             0: 61166
           -5,-1:
@@ -1064,10 +1077,10 @@ entities:
           -1,-4:
             0: 32768
           0,-4:
-            0: 62720
+            0: 64768
             1: 4
           0,-3:
-            0: 21781
+            0: 21791
           0,-2:
             0: 55805
           0,-1:
@@ -1127,8 +1140,7 @@ entities:
           4,0:
             0: 54783
           4,1:
-            0: 157
-            2: 64
+            0: 221
           -5,0:
             0: 61183
           -4,1:
@@ -1164,8 +1176,8 @@ entities:
           2,-2:
             0: 61687
           2,-4:
-            3: 6
-            4: 1536
+            2: 6
+            3: 1536
           3,-4:
             1: 8737
             0: 256
@@ -1254,21 +1266,6 @@ entities:
           - 0
           - 0
           - 0
-        - volume: 2500
-          temperature: 293.14975
-          moles:
-          - 20.078888
-          - 75.53487
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -1457,15 +1454,13 @@ entities:
   - uid: 14
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,-11.5
+      pos: 2.5,-10.5
       parent: 2
     - type: DeviceList
       devices:
-      - 1486
-      - 1454
       - 1453
       - 1514
+      - 2171
 - proto: AirCanister
   entities:
   - uid: 15
@@ -6284,7 +6279,7 @@ entities:
   - uid: 915
     components:
     - type: Transform
-      pos: 4.5333743,-11.7164135
+      pos: 4.8091187,-11.914802
       parent: 2
 - proto: ClothingUniformJumpsuitERTJanitor
   entities:
@@ -6409,6 +6404,14 @@ entities:
       rot: 3.141592653589793 rad
       pos: 16.5,3.5
       parent: 2
+- proto: ComputerAlert
+  entities:
+  - uid: 1956
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-13.5
+      parent: 2
 - proto: ComputerAnalysisConsole
   entities:
   - uid: 1801
@@ -6421,6 +6424,14 @@ entities:
       linkedPorts:
         1070:
         - ArtifactAnalyzerSender: ArtifactAnalyzerReceiver
+- proto: ComputerAtmosMonitoring
+  entities:
+  - uid: 2128
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-13.5
+      parent: 2
 - proto: ComputerCargoBounty
   entities:
   - uid: 936
@@ -7329,6 +7340,15 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 12
+  - uid: 2171
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-12.5
+      parent: 2
+    - type: DeviceNetwork
+      deviceLists:
+      - 14
 - proto: FirelockGlass
   entities:
   - uid: 1071
@@ -8066,6 +8086,25 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
+- proto: GasPipeSensorDistribution
+  entities:
+  - uid: 1186
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-12.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasPipeSensorWaste
+  entities:
+  - uid: 1287
+    components:
+    - type: Transform
+      pos: 6.5,-12.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GasPipeStraight
   entities:
   - uid: 1177
@@ -8133,14 +8172,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 1186
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-12.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 1187
     components:
     - type: Transform
@@ -8918,14 +8949,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1287
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 6.5,-12.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 1288
     components:
     - type: Transform
@@ -8934,12 +8957,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1289
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-11.5
-      parent: 2
   - uid: 1290
     components:
     - type: Transform
@@ -10230,9 +10247,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 10.5,-11.5
       parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 14
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 1455
@@ -10560,9 +10574,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 7.5,-7.5
       parent: 2
-    - type: DeviceNetwork
-      deviceLists:
-      - 14
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1487
@@ -11446,6 +11457,20 @@ entities:
     - type: Transform
       pos: 4.6859074,-10.602916
       parent: 2
+- proto: HolopadCargoBayLongRange
+  entities:
+  - uid: 2499
+    components:
+    - type: Transform
+      pos: 1.5,9.5
+      parent: 2
+- proto: HolopadCommandBridgeLongRange
+  entities:
+  - uid: 2081
+    components:
+    - type: Transform
+      pos: 22.5,0.5
+      parent: 2
 - proto: HoPIDCard
   entities:
   - uid: 1623
@@ -11583,10 +11608,10 @@ entities:
       parent: 2
 - proto: LockerAtmosphericsFilledHardsuit
   entities:
-  - uid: 1956
+  - uid: 2500
     components:
     - type: Transform
-      pos: 3.5,-13.5
+      pos: 4.5,-11.5
       parent: 2
 - proto: LockerBoozeFilled
   entities:
@@ -13626,7 +13651,7 @@ entities:
     - type: Transform
       pos: 8.5,-1.5
       parent: 2
-- proto: SMESBasic
+- proto: SMESAdvanced
   entities:
   - uid: 1972
     components:
@@ -14711,11 +14736,6 @@ entities:
       parent: 2
 - proto: VendingMachineTankDispenserEVA
   entities:
-  - uid: 2128
-    components:
-    - type: Transform
-      pos: 2.5,-13.5
-      parent: 2
   - uid: 2129
     components:
     - type: Transform
@@ -14954,11 +14974,6 @@ entities:
     - type: Transform
       pos: 3.5,-10.5
       parent: 2
-  - uid: 2171
-    components:
-    - type: Transform
-      pos: 3.5,-11.5
-      parent: 2
   - uid: 2173
     components:
     - type: Transform
@@ -16454,6 +16469,12 @@ entities:
       parent: 2
 - proto: WindowReinforcedDirectional
   entities:
+  - uid: 1289
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-11.5
+      parent: 2
   - uid: 1592
     components:
     - type: Transform