Merge branch 'new-frontiers-14:master' into master

new-frontiers-14 · Jan 23, 2024 · 5ef1537 · 5ef1537
2 parents a429fbf + a0c89c8
commit 5ef1537
Show file tree

Hide file tree

Showing 2 changed files with 71 additions and 9 deletions.
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -2894,3 +2894,9 @@ Entries:
       message: Upstream Lobby Arts
   id: 4756
   time: '2024-01-22T21:13:12.0000000+00:00'
+- author: TsjipTsjip
+  changes:
+    - type: Fix
+      message: The SLI Bazaar no longer spaces itself after purchase.
+  id: 4757
+  time: '2024-01-22T21:32:58.0000000+00:00'
diff --git a/Resources/Maps/_NF/Shuttles/bazaar.yml b/Resources/Maps/_NF/Shuttles/bazaar.yml
@@ -662,7 +662,7 @@ entities:
       pos: 5.5,-3.5
       parent: 1
       type: Transform
-    - secondsUntilStateChange: -516.57
+    - secondsUntilStateChange: -621.60913
       state: Opening
       type: Door
     - links:
@@ -3257,14 +3257,6 @@ entities:
       type: Transform
 - proto: GasPassiveVent
   entities:
-  - uid: 378
-    components:
-    - rot: 3.141592653589793 rad
-      pos: 5.5,-4.5
-      parent: 1
-      type: Transform
-    - color: '#990000FF'
-      type: AtmosPipeColor
   - uid: 379
     components:
     - rot: 3.141592653589793 rad
@@ -3469,6 +3461,14 @@ entities:
       type: Transform
     - color: '#98FF98FF'
       type: AtmosPipeColor
+  - uid: 910
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: 5.5,-6.5
+      parent: 1
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
 - proto: GasPipeFourway
   entities:
   - uid: 405
@@ -3915,6 +3915,54 @@ entities:
       type: Transform
     - color: '#98FF98FF'
       type: AtmosPipeColor
+  - uid: 911
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 5.5,-4.5
+      parent: 1
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
+  - uid: 912
+    components:
+    - rot: 3.141592653589793 rad
+      pos: 5.5,-5.5
+      parent: 1
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
+  - uid: 913
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 4.5,-6.5
+      parent: 1
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
+  - uid: 914
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 3.5,-6.5
+      parent: 1
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
+  - uid: 915
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 2.5,-6.5
+      parent: 1
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
+  - uid: 916
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 1.5,-6.5
+      parent: 1
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
 - proto: GasPipeTJunction
   entities:
   - uid: 462
@@ -4016,6 +4064,14 @@ entities:
       type: AtmosPipeColor
 - proto: GasVentScrubber
   entities:
+  - uid: 378
+    components:
+    - rot: 1.5707963267948966 rad
+      pos: 0.5,-6.5
+      parent: 1
+      type: Transform
+    - color: '#990000FF'
+      type: AtmosPipeColor
   - uid: 474
     components:
     - rot: -1.5707963267948966 rad