Merge branch 'master' into 2024-09-07-Caveman

new-frontiers-14 · Oct 12, 2024 · 2a86750 · 2a86750
2 parents fceab24 + 0ad7d37
commit 2a86750
Show file tree

Hide file tree

Showing 21 changed files with 725 additions and 1,115 deletions.
diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
@@ -4339,3 +4339,75 @@ Entries:
         world with it!
   id: 5370
   time: '2024-10-09T21:54:59.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Tweak
+      message: updated barge with directional fans
+  id: 5371
+  time: '2024-10-11T19:54:36.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Tweak
+      message: Updated Barnacle with directional fans.
+  id: 5372
+  time: '2024-10-11T20:05:14.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Tweak
+      message: Update Empress tiny fans with directional fans.
+  id: 5373
+  time: '2024-10-12T00:34:19.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Tweak
+      message: Replace tiny fans with directional fans.
+  id: 5374
+  time: '2024-10-12T02:04:30.0000000+00:00'
+- author: chrome-cirrus
+  changes:
+    - type: Tweak
+      message: Updated Anomalous Geode docks to use directional fans
+  id: 5375
+  time: '2024-10-12T12:53:16.0000000+00:00'
+- author: chrome-cirrus
+  changes:
+    - type: Tweak
+      message: 'Replace tiny fans in the The Pit/Arena with directional fans. '
+  id: 5376
+  time: '2024-10-12T13:15:10.0000000+00:00'
+- author: chrome-cirrus
+  changes:
+    - type: Tweak
+      message: Replace cargo depot POI tiny fans with directional fans
+  id: 5377
+  time: '2024-10-12T13:16:26.0000000+00:00'
+- author: chrome-cirrus
+  changes:
+    - type: Tweak
+      message: Replaced Anomalous Lab tiny fans with directional fans
+  id: 5378
+  time: '2024-10-12T14:11:34.0000000+00:00'
+- author: chrome-cirrus
+  changes:
+    - type: Tweak
+      message: Replaced Omnichurch Beacon tiny fans with directional fans
+  id: 5379
+  time: '2024-10-12T14:14:51.0000000+00:00'
+- author: chrome-cirrus
+  changes:
+    - type: Tweak
+      message: Replaced tiny fans with directional fans on Tinnia's Rest POI
+  id: 5380
+  time: '2024-10-12T14:22:21.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Tweak
+      message: Butter reagent can now be extracted from butter.
+  id: 5381
+  time: '2024-10-12T14:47:24.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Add
+      message: Added filled medicine and chemistry Frontier wall lockers.
+  id: 5382
+  time: '2024-10-12T16:29:52.0000000+00:00'
diff --git a/Resources/Maps/_NF/POI/anomalousgeode.yml b/Resources/Maps/_NF/POI/anomalousgeode.yml
@@ -20,7 +20,7 @@ entities:
   - uid: 1
     components:
     - type: MetaData
-      name: grid
+      name: Anomalous Geode
     - type: Transform
       pos: 0.14351851,0.09722221
       parent: invalid
@@ -1124,43 +1124,43 @@ entities:
     - type: Transform
       pos: 7.5,2.5
       parent: 1
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
   - uid: 647
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,4.5
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-3.5
       parent: 1
   - uid: 648
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,3.5
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-2.5
       parent: 1
   - uid: 649
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -10.5,2.5
+      rot: 1.5707963267948966 rad
+      pos: 15.5,-1.5
       parent: 1
   - uid: 650
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 15.5,-1.5
+      pos: -10.5,2.5
       parent: 1
   - uid: 651
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 15.5,-2.5
+      pos: -10.5,3.5
       parent: 1
   - uid: 652
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 15.5,-3.5
+      pos: -10.5,4.5
       parent: 1
 - proto: BannerScience
   entities:
@@ -3202,7 +3202,6 @@ entities:
     - type: GasMixer
       inletTwoConcentration: 0.78
       inletOneConcentration: 0.22
-      enabled: True
 - proto: GasPassiveVent
   entities:
   - uid: 730
@@ -3627,6 +3626,18 @@ entities:
     - type: Transform
       pos: -7.717414,-11.295385
       parent: 1
+- proto: NFSignDock
+  entities:
+  - uid: 771
+    components:
+    - type: Transform
+      pos: 15.5,-4.5
+      parent: 1
+  - uid: 772
+    components:
+    - type: Transform
+      pos: -10.5,5.5
+      parent: 1
 - proto: NitrogenCanister
   entities:
   - uid: 765
@@ -4107,9 +4118,6 @@ entities:
     - type: Transform
       pos: 3.5,-11.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 763
 - proto: SignalButton
   entities:
   - uid: 763
@@ -4163,18 +4171,6 @@ entities:
     - type: Transform
       pos: -2.5,-7.5
       parent: 1
-- proto: NFSignDock
-  entities:
-  - uid: 771
-    components:
-    - type: Transform
-      pos: 15.5,-4.5
-      parent: 1
-  - uid: 772
-    components:
-    - type: Transform
-      pos: -10.5,5.5
-      parent: 1
 - proto: SMESBasic
   entities:
   - uid: 537