Merge branch 'master' into Explosive-Bolt-crafting-Hotfix

new-frontiers-14 · Feb 25, 2025 · c8228cf · c8228cf
2 parents 389f39e + f72aab0
commit c8228cf
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
@@ -7370,3 +7370,9 @@ Entries:
         to 70%.
   id: 5794
   time: '2025-02-24T13:38:26.0000000+00:00'
+- author: nathan736
+  changes:
+    - type: Fix
+      message: Fixed disposals system on the Bazaar.
+  id: 5795
+  time: '2025-02-25T14:46:06.0000000+00:00'
diff --git a/Resources/Maps/_NF/Shuttles/bazaar.yml b/Resources/Maps/_NF/Shuttles/bazaar.yml
@@ -3051,6 +3051,12 @@ entities:
       parent: 1
 - proto: DisposalJunctionFlipped
   entities:
+  - uid: 963
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,3.5
+      parent: 1
   - uid: 1015
     components:
     - type: Transform
@@ -3059,6 +3065,12 @@ entities:
       parent: 1
 - proto: DisposalPipe
   entities:
+  - uid: 967
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,2.5
+      parent: 1
   - uid: 970
     components:
     - type: Transform
@@ -3155,12 +3167,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 2.5,3.5
       parent: 1
-  - uid: 992
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,3.5
-      parent: 1
   - uid: 993
     components:
     - type: Transform
@@ -3273,6 +3279,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 5.5,6.5
       parent: 1
+  - uid: 992
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,1.5
+      parent: 1
   - uid: 998
     components:
     - type: Transform