Merge branch 'new-frontiers-14:master' into 2024-01-22-MachineMagnet

Resources/Audio/Lobby/attributions.yml

@@ -77,9 +77,4 @@
 - files: ["every_light_is_blinking_at_once.ogg"]
   license: "CC-BY-NC-SA-3.0"
   copyright: "every light is blinking at once by Alexander Divine."
-  source: "https://soundcloud.com/alexanderdivine/every-light-is-blinking-at-once"
-
-- files: ["victory.ogg"]
-  license: "CC-BY-NC-SA-3.0"
-  copyright: "Victory by Koruu Chan. Rights reserved by Checkraze. Converted from WAV to OGG."
-  source: "https://github.com/Cheackraze"
+  source: "https://soundcloud.com/alexanderdivine/every-light-is-blinking-at-once"

Resources/Audio/_NF/Lobby/attributions.yml

@@ -0,0 +1,9 @@
+- files: ["victory.ogg"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Victory by Koruu Chan. Rights reserved by Checkraze. Converted from WAV to OGG."
+  source: "https://github.com/Cheackraze"
+
+- files: ["shibamata.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "Shibamata midi remake. Likely original: https://www.nicovideo.jp/watch/sm32841166"
+  source: "https://github.com/Elijahrane/arcadia-station/blob/c2ea3f44d4de4c0a337aeddb12f167a89c5ed3ef/Resources/Audio/Lobby/shibamata.ogg"

Resources/Changelog/Changelog.yml

@@ -2878,3 +2878,57 @@ Entries:
         your fast food delivery with your very own fast food delivery ship.
   id: 4754
   time: '2024-01-21T18:52:29.0000000+00:00'
+- author: MagnusCrowe
+  changes:
+    - type: Add
+      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'
+- author: erhardsteinhauer
+  changes:
+    - type: Add
+      message: Added NC Kilderkin - bar/brewery ship.
+  id: 4758
+  time: '2024-01-24T01:30:58.0000000+00:00'
+- author: McBosserson
+  changes:
+    - type: Add
+      message: Shibamata as lobby song
+  id: 4759
+  time: '2024-01-24T19:07:40.0000000+00:00'
+- author: dvir01
+  changes:
+    - type: Add
+      message: Added a small gyro to be used in smaller ships.
+  id: 4760
+  time: '2024-01-24T22:24:47.0000000+00:00'
+- author: dvir01
+  changes:
+    - type: Add
+      message: >-
+        NT Added the security guard job to frontier to help SR & STC keep the
+        outpost safe.
+  id: 4761
+  time: '2024-01-24T22:30:31.0000000+00:00'
+- author: dvir01
+  changes:
+    - type: Add
+      message: Added ashtray to the shadycig vender.
+  id: 4762
+  time: '2024-01-24T22:34:48.0000000+00:00'

Resources/Locale/en-US/_NF/job/job-description.ftl

@@ -1,3 +1,4 @@
 job-description-mercenary = Execute the bidding of anyone- for the right price. Enjoy being unbound from the confines of the law.
-job-description-stc = Expertly de-conflict the space around the station and help the NFSD issue fines for overdocked ships.
 job-description-pilot = Pilot spaceships from point A to B, outmaneuver pirates and dodge asteroids. You are a leaf on the solar wind, let others marvel at how you soar.
+job-description-security-guard = Patrol the empty halls, whistle simple tunes you heard on radio, jingle your keychain and scurry away at the sight of danger.
+job-description-stc = Expertly de-conflict the space around the station and help the NFSD issue fines for overdocked ships.

Resources/Locale/en-US/_NF/job/job-names.ftl

@@ -1,8 +1,10 @@
 job-name-mercenary = Mercenary
-job-name-stc = Station Traffic Controller
 job-name-pilot = Pilot
+job-name-security-guard = Security Guard
+job-name-stc = Station Traffic Controller
 
 # Role timers - Make these alphabetical or I cut you
 JobMercenary = Mercenary
-JobSTC = Station Traffic Controller
 JobPilot = Pilot
+JobSecurityGuard = Security Guard
+JobSTC = Station Traffic Controller

Resources/Locale/en-US/_NF/prototypes/access/accesses.ftl

@@ -1,5 +1,3 @@
-id-card-access-level-frontier = Station Traffic Controller
-
-id-card-access-level-mercenary = Mercenary
-
+id-card-access-level-frontier = Frontier
 id-card-access-level-pilot = Pilot
+id-card-access-level-mercenary = Mercenary

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