Merge pull request #140 from new-frontiers-14/station_update

Station Update
new-frontiers-14 · Aug 3, 2023 · 90492d2 · 90492d2
2 parents 56c3e9f + 63d0fed
commit 90492d2
Showing 1 changed file with 76 additions and 61 deletions.
diff --git a/Resources/Maps/frontier.yml b/Resources/Maps/frontier.yml
@@ -102,7 +102,7 @@ entities:
           tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXwAAAF8AAABfAAAAXwAAAF8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF8AAABOAAADTgAAAk4AAABfAAAAAAAAAAAAAAAAAAAAAAAAAA==
         0,1:
           ind: 0,1
-          tiles: RQAAAU8AAAAXAAADFwAAAhcAAABPAAAAFwAAAhcAAAEXAAABTwAAABcAAAIXAAABFwAAARcAAAIXAAAAFwAAA0UAAAFPAAAAFwAAACcAAAAXAAABXwAAAF8AAABPAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAE8AAABFAAADTwAAABcAAAEXAAACFwAAAF8AAAAXAAADFwAAAhcAAAJfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAATwAAAF8AAABfAAAAXwAAAF8AAABfAAAAFwAAARcAAAIXAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAEUAAANFAAADXwAAADIAAAAyAAAAMgAAADIAAAAyAAAAMgAAADIAAAAyAAAAMgAAAF8AAABFAAABRQAAAksAAAJFAAACRQAAAV8AAAAyAAAAMgAAADIAAAAyAAAAMgAAADIAAAAyAAAAMgAAADIAAABfAAAARQAAAEUAAAJLAAAARQAAAkUAAABfAAAAMgAAADIAAAAyAAAAMgAAADIAAAAyAAAAXwAAAF8AAABfAAAAXwAAAEUAAAFFAAACRQAAAkUAAAJFAAABXwAAADIAAAAyAAAAMgAAADIAAAAyAAAAMgAAAF8AAABFAAABRQAAA08AAABFAAADRQAAA0UAAAFFAAACRQAAAV8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAARQAAA0UAAABPAAAARQAAAUUAAAFFAAABRQAAAUUAAANfAAAARQAAAksAAAJLAAABSwAAAEsAAANLAAACRQAAA0UAAANFAAADTwAAAEUAAANFAAAARQAAA0UAAANFAAADTwAAAEUAAANFAAABRQAAAUUAAABFAAACRQAAA0UAAAFFAAABRQAAAk8AAABFAAACRQAAAEUAAANFAAADRQAAAUUAAAFFAAABRQAAAEUAAAJFAAACRQAAA0UAAAJFAAABRQAAA0UAAAJfAAAAXwAAAF8AAABfAAAARQAAA0UAAAFFAAACRQAAAEUAAAFFAAAARQAAAkUAAAFFAAAARQAAAUUAAABFAAABXwAAAAAAAAAAAAAAAAAAAEUAAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAAAAAAAAAAAAAAAAAABPAAAAXwAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAAAAAAAAAAAAAAAAARQAAAV8AAABeAAAAAAAAAAAAAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABeAAAAAAAAAAAAAAAAAAAAAAAAAA==
+          tiles: RQAAAU8AAAAXAAADFwAAAhcAAABPAAAAFwAAAhcAAAEXAAABTwAAABcAAAIXAAABFwAAARcAAAIXAAAAFwAAA0UAAAFPAAAAFwAAACcAAAAXAAABXwAAAF8AAABPAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAE8AAABFAAADTwAAABcAAAEXAAACFwAAAF8AAAAXAAADFwAAAhcAAAJfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAATwAAAF8AAABfAAAAXwAAAF8AAABfAAAAFwAAARcAAAIXAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAEUAAANFAAADXwAAADIAAAAyAAAAMgAAADIAAAAyAAAAMgAAADIAAAAyAAAAMgAAAF8AAABFAAABRQAAAksAAAJFAAACRQAAAV8AAAAyAAAAMgAAADIAAAAyAAAAMgAAADIAAAAyAAAAMgAAADIAAABfAAAARQAAAEUAAAJLAAAARQAAAkUAAABfAAAAMgAAADIAAAAyAAAAMgAAADIAAAAyAAAAXwAAAF8AAABfAAAAXwAAAEUAAAFFAAACRQAAAkUAAAJFAAABXwAAADIAAAAyAAAAMgAAADIAAAAyAAAAMgAAAF8AAABFAAABRQAAA08AAABFAAADRQAAA0UAAAFFAAACRQAAAV8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAARQAAA0UAAABPAAAARQAAAUUAAAFFAAABRQAAAUUAAANfAAAARQAAAksAAAJLAAABSwAAAEsAAANLAAACRQAAA0UAAANFAAADTwAAAEUAAANFAAAARQAAA0UAAANFAAADTwAAAEUAAANFAAABRQAAAUUAAABFAAACRQAAA0UAAAFFAAABRQAAAk8AAABFAAACRQAAAEUAAANFAAADRQAAAU8AAABFAAABRQAAAEUAAAJFAAACRQAAA0UAAAJFAAABRQAAA0UAAAJfAAAAXwAAAF8AAABfAAAARQAAA0UAAAFPAAAARQAAAEUAAAFFAAAARQAAAkUAAAFFAAAARQAAAUUAAABFAAABXwAAAAAAAAAAAAAAAAAAAEUAAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAAAAAAAAAAAAAAAAAABPAAAAXwAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAAAAAAAAAAAAAAAAARQAAAV8AAABeAAAAAAAAAAAAAABeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABeAAAAAAAAAAAAAAAAAAAAAAAAAA==
         -1,1:
           ind: -1,1
           tiles: FwAAARcAAAIXAAAAFwAAARcAAAAXAAABFwAAAxcAAAAXAAABTwAAABcAAAMXAAACFwAAAU8AAABFAAADRQAAAhcAAAAXAAADFwAAAxcAAAEXAAAAFwAAAxcAAAAXAAABFwAAAV8AAAAXAAAAJwAAABcAAAJPAAAARQAAAUUAAAIXAAAAFwAAARcAAAEXAAABFwAAAhcAAAAXAAAAFwAAABcAAANfAAAAFwAAAhcAAAEXAAADTwAAAEUAAAJFAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABfAAAAXwAAAF8AAABPAAAAXwAAAF8AAABPAAAATwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF8AAAAXAAABFwAAAxcAAANfAAAARQAAA0UAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABfAAAAFwAAAxcAAAIXAAAAXwAAAEUAAAJFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXwAAABcAAAIXAAAAFwAAAF8AAABFAAADRQAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF8AAAAXAAABFwAAARcAAAFfAAAARQAAAEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABfAAAAFwAAARcAAAMXAAACXwAAAEUAAABFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXwAAAE8AAABfAAAAXwAAAF8AAABFAAABRQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF8AAAAyAAAAMgAAADIAAABPAAAARQAAAEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABfAAAAMgAAADIAAAAyAAAAXwAAAEUAAABFAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXwAAADIAAAAyAAAAMgAAAF8AAABFAAACRQAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF8AAABfAAAAXwAAAF8AAABfAAAARQAAAEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABeAAAAXgAAAF4AAABeAAAAXwAAAE8AAABPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXgAAAAAAAAAAAAAAXgAAAF8AAABFAAAARQAAAQ==
@@ -162,18 +162,6 @@ entities:
     - chunkCollection:
         version: 2
         nodes:
-        - node:
-            angle: -1.5707963267948966 rad
-            color: '#9FED5896'
-            id: Arrows
-          decals:
-            279: 1,21
-        - node:
-            angle: 1.5707963267948966 rad
-            color: '#9FED5896'
-            id: Arrows
-          decals:
-            280: 1,25
         - node:
             color: '#FFFFFFFF'
             id: Arrows
@@ -1334,6 +1322,17 @@ entities:
             620: -4,24
             621: -5,24
             622: -6,24
+        - node:
+            color: '#FFA5007F'
+            id: CheckerNESW
+          decals:
+            1303: 58,24
+        - node:
+            color: '#FFA5007F'
+            id: CheckerNWSE
+          decals:
+            1302: 58,25
+            1304: 56,24
         - node:
             color: '#FFFFFFFF'
             id: Delivery
@@ -1376,6 +1375,14 @@ entities:
           decals:
             862: 57,1
             863: 56,1
+        - node:
+            color: '#FFA5007F'
+            id: HalfTileOverlayGreyscale
+          decals:
+            1297: 58,26
+            1298: 57,26
+            1300: 56,25
+            1301: 57,25
         - node:
             color: '#9FED5896'
             id: HalfTileOverlayGreyscale180
@@ -1394,6 +1401,11 @@ entities:
             id: HalfTileOverlayGreyscale180
           decals:
             401: -18,15
+        - node:
+            color: '#FFA5007F'
+            id: HalfTileOverlayGreyscale180
+          decals:
+            1305: 57,24
         - node:
             color: '#D4D4D40C'
             id: HalfTileOverlayGreyscale270
@@ -1757,6 +1769,11 @@ entities:
             id: ThreeQuarterTileOverlayGreyscale
           decals:
             861: 58,1
+        - node:
+            color: '#FFA5007F'
+            id: ThreeQuarterTileOverlayGreyscale
+          decals:
+            1299: 56,26
         - node:
             color: '#52B4E996'
             id: ThreeQuarterTileOverlayGreyscale180
@@ -2829,43 +2846,42 @@ entities:
   entities:
   - uid: 4119
     components:
-    - pos: 43.5,7.5
+    - pos: 37.5,23.5
       parent: 2173
       type: Transform
   - uid: 4120
     components:
-    - pos: 42.5,7.5
+    - pos: 36.5,23.5
       parent: 2173
       type: Transform
   - uid: 4121
     components:
-    - pos: 42.5,10.5
+    - pos: 37.5,20.5
       parent: 2173
       type: Transform
   - uid: 4122
     components:
-    - rot: 3.141592653589793 rad
-      pos: 43.5,10.5
+    - pos: 36.5,20.5
       parent: 2173
       type: Transform
-  - uid: 5812
+  - uid: 5743
     components:
-    - pos: 37.5,23.5
+    - pos: 43.5,10.5
       parent: 2173
       type: Transform
-  - uid: 5819
+  - uid: 5812
     components:
-    - pos: 36.5,23.5
+    - pos: 42.5,10.5
       parent: 2173
       type: Transform
-  - uid: 5854
+  - uid: 5819
     components:
-    - pos: 37.5,20.5
+    - pos: 43.5,7.5
       parent: 2173
       type: Transform
-  - uid: 5855
+  - uid: 5847
     components:
-    - pos: 36.5,20.5
+    - pos: 42.5,7.5
       parent: 2173
       type: Transform
 - proto: AirlockCaptainGlassLocked
@@ -3373,36 +3389,6 @@ entities:
     - pos: 12.5,26.5
       parent: 2173
       type: Transform
-  - uid: 5847
-    components:
-    - pos: 35.5,24.5
-      parent: 2173
-      type: Transform
-  - uid: 5848
-    components:
-    - pos: 35.5,25.5
-      parent: 2173
-      type: Transform
-  - uid: 5849
-    components:
-    - pos: 35.5,26.5
-      parent: 2173
-      type: Transform
-  - uid: 5850
-    components:
-    - pos: 38.5,26.5
-      parent: 2173
-      type: Transform
-  - uid: 5851
-    components:
-    - pos: 38.5,25.5
-      parent: 2173
-      type: Transform
-  - uid: 5852
-    components:
-    - pos: 38.5,24.5
-      parent: 2173
-      type: Transform
   - uid: 5856
     components:
     - pos: 55.5,26.5
@@ -11638,6 +11624,31 @@ entities:
     - pos: 60.5,26.5
       parent: 2173
       type: Transform
+  - uid: 5849
+    components:
+    - pos: 48.5,19.5
+      parent: 2173
+      type: Transform
+  - uid: 5850
+    components:
+    - pos: 48.5,20.5
+      parent: 2173
+      type: Transform
+  - uid: 5851
+    components:
+    - pos: 48.5,23.5
+      parent: 2173
+      type: Transform
+  - uid: 5852
+    components:
+    - pos: 42.5,23.5
+      parent: 2173
+      type: Transform
+  - uid: 5854
+    components:
+    - pos: 42.5,25.5
+      parent: 2173
+      type: Transform
   - uid: 5859
     components:
     - pos: 29.5,15.5
@@ -30083,11 +30094,6 @@ entities:
     - pos: 29.5,5.5
       parent: 2173
       type: Transform
-  - uid: 5743
-    components:
-    - pos: 42.5,13.5
-      parent: 2173
-      type: Transform
   - uid: 5785
     components:
     - pos: 29.5,-15.5
@@ -35119,6 +35125,15 @@ entities:
     - pos: -12.5,18.5
       parent: 2173
       type: Transform
+- proto: VendingMachineBountyVend
+  entities:
+  - uid: 5848
+    components:
+    - flags: SessionSpecific
+      type: MetaData
+    - pos: 42.5,13.5
+      parent: 2173
+      type: Transform
 - proto: VendingMachineBoxingDrobe
   entities:
   - uid: 4249