Merge branch 'new-frontiers-14:master' into NT-Rigger-Update

Resources/Changelog/Changelog.yml

@@ -2884,3 +2884,19 @@ Entries:
       message: Added plasteel arming sword!
   id: 4755
   time: '2024-01-22T12:14:42.0000000+00:00'
+- author: FoxxoTrystan
+  changes:
+    - type: Add
+      message: 'Xeeenoooossss Lobby Art by: gentlebutter'
+    - type: Add
+      message: 'Secrun Lobby Art by: GhostPrince'
+    - type: Remove
+      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'

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

Resources/Prototypes/_NF/lobbyscreens.yml

@@ -1,11 +1,15 @@
-- type: lobbyBackground
-  id: RisingRed
-  background: /Textures/_NF/LobbyScreens/risingred.png
-
 - type: lobbyBackground
   id: BingGuss
   background: /Textures/_NF/LobbyScreens/bingguss.png
 
 - type: lobbyBackground
   id: Janigang
   background: /Textures/_NF/LobbyScreens/janigang.png
+
+- type: lobbyBackground
+  id: Xeeenoooossss
+  background: /Textures/_NF/LobbyScreens/xeeenoooossss.png
+
+- type: lobbyBackground
+  id: Secrun
+  background: /Textures/_NF/LobbyScreens/secrun.png

Resources/Textures/_NF/LobbyScreens/attributuions.yml

@@ -1,14 +1,19 @@
-- files: ["risingred.png"]
-  license: "CC0-1.0"
-  copyright: "stikyt (268746891003428874) on Discord / @sTiKyt on GitHub / @sTiKyt on Telegram"
-  source: "https://github.com/new-frontiers-14/frontier-station-14"
-
 - files: ["bingguss.png"]
-  license: "CC0-1.0"
+  license: "CC-BY-NC-SA-4.0"
   copyright: "gentlebutter (588410099190726656) on Discord"
   source: "https://cdn.discordapp.com/attachments/1128094390087340114/1171973024011001936/Lobby-art-frontier_clean.png?ex=655e9fef&is=654c2aef&hm=a9c42fc6f803bc0f8307247520a480a5d59dde5f7b196fff0b9045988e5886d8&"
 
 - files: ["janigang.png"]
-  license: "CC0-1.0"
+  license: "CC-BY-NC-SA-4.0"
   copyright: "GhostPrince (115894681304301569) on Discord"
   source: "https://discord.com/channels/1123826877245694004/1128094390087340114/1191491599855788154"
+
+- files: ["xeeenoooossss.png"]
+  license: "CC BY-NC-SA 4.0"
+  copyright: "gentlebutter (588410099190726656) on Discord"
+  source: "https://discord.com/channels/1123826877245694004/1128094390087340114/1197490518951727144"
+
+- files: ["secrun.png"]
+  license: "CC-BY-NC-SA-4.0"
+  copyright: "GhostPrince (115894681304301569) on Discord"
+  source: "https://discord.com/channels/1123826877245694004/1128094390087340114/1196033832017743922"

Resources/Textures/_NF/LobbyScreens/xeeenoooossss.png.yml

@@ -0,0 +1,2 @@
+sample:
+  filter: false