Salvage Bounty Rework by TeddiousbearPA · Pull Request #5510 · ss14Starlight/space-station-14

TeddiousbearPA · 2026-08-04T04:32:05Z

Short description

Reworking the very antiquated salvage bounty system to add tickets as part of the rewards, and add new bounties as well.?
Adds 7 new bounties, linked in PR Workshop

Why we need to add this

Dated system in desperate need of updating
PR Workshop:https://discord.com/channels/1272545509562777621/1530812074358476902

Media (Video/Screenshots)

2026-08-04.00-15-11.mp4

Checks

I do not require assistance to complete the PR.
Before posting/requesting review of a PR, I have verified that the changes work.
I have added screenshots/videos of the changes, or this PR does not change in-game mechanics.
I affirm that my changes are licensed under the MIT License and grant permission for use in this repository under its conditions.

Changelog

🆑 Teddiousbear
-add: Ticket rewards to salvage bounties.
-add: 6 New salvage bounties.

Added Experimental Plushie to Plush Vendor

New (primarily) formal uniforms for sec including: Formal Senior Brigmedic Formal Brigmedic Formal Warden Formal Senior Secoff/Dutyoff Formal Secoff/Dutyoff Formal Deputy (Secoff) Deputy's Hat

fixed the names of senior formal security uniform and description of deputy jumpskirt

Adds Spaces Asshole to the jukebox playlist

This reverts commit d8fcf3e.

fixed requests from rinary and bot

…ce-station-14 into starlight-dev

Removed armor and zombification resistance entries from jumpsuits.

…ce-station-14 into starlight-dev

…A/space-station-14 into Salv-Bounty-Rework

github-actions · 2026-08-11T14:24:08Z

Content + Integration Test Results

Failed Tests

❌ JobWeightTest

Multiple failures or warnings in test:
  1) Test was dirty-disposed.
     at Robust.UnitTesting.Pool.TestPair`2.OnDirtyDispose() in /home/runner/work/space-station-14/space-station-14/RobustToolbox/Robust.UnitTesting/Pool/TestPair.Recycle.cs:line 44
   at System.Runtime.CompilerServices.AsyncMethodBuilderCore.Start[TStateMachine](TStateMachine& stateMachine)
   at Robust.UnitTesting.Pool.TestPair`2.OnDirtyDispose()
   at Robust.UnitTesting.Pool.TestPair`2.DisposeAsync() in /home/runner/work/space-station-14/space-station-14/RobustToolbox/Robust.UnitTesting/Pool/TestPair.Recycle.cs:line 146
   at System.Runtime.CompilerServices.AsyncMethodBuilderCore.Start[TStateMachine](TStateMachine& stateMachine)
   at Robust.UnitTesting.Pool.TestPair`2.DisposeAsync()
   at Content.IntegrationTests.Fixtures.GameTest.DoTeardown() in /home/runner/work/space-station-14/space-station-14/Content.IntegrationTests/Fixtures/GameTest.cs:line 262
  2) TearDown : System.InvalidOperationException : Collection was modified; enumeration operation may not execute.
  --TearDown
   at Robust.Client.GameStates.ClientGameStateManager.PartialStateReset(GameState state, Boolean resetAllEntities, Boolean deleteClientEntities, Boolean deleteClientChildren) in /home/runner/work/space-station-14/space-station-14/RobustToolbox/Robust.Client/GameStates/ClientGameStateManager.cs:line 1288
   at Robust.Client.GameStates.ClientGameStateManager.ApplyGameState() in /home/runner/work/space-station-14/space-station-14/RobustToolbox/Robust.Client/GameStates/ClientGameStateManager.cs:line 426
   at Robust.Client.GameController.Tick(FrameEventArgs frameEventArgs) in /home/runner/work/space-station-14/space-station-14/RobustToolbox/Robust.Client/GameController/GameController.cs:line 617
   at Robust.UnitTesting.RobustIntegrationTest.IntegrationGameLoop.SingleThreadRunUntilEmpty() in /home/runner/work/space-station-14/space-station-14/RobustToolbox/Robust.UnitTesting/RobustIntegrationTest.cs:line 1250
   at Robust.UnitTesting.RobustIntegrationTest.IntegrationGameLoop.Run() in /home/runner/work/space-station-14/space-station-14/RobustToolbox/Robust.UnitTesting/RobustIntegrationTest.cs:line 1237
   at Robust.UnitTesting.RobustIntegrationTest.ClientIntegrationInstance.ThreadMain() in /home/runner/work/space-station-14/space-station-14/RobustToolbox/Robust.UnitTesting/RobustIntegrationTest.cs:line 1047
--- End of stack trace from previous location ---
   at Robust.UnitTesting.RobustIntegrationTest.IntegrationInstance.WaitIdleImplAsync(Boolean throwOnUnhandled, CancellationToken cancellationToken) in /home/runner/work/space-station-14/space-station-14/RobustToolbox/Robust.UnitTesting/RobustIntegrationTest.cs:line 566
   at Robust.UnitTesting.RobustIntegrationTest.IntegrationInstance.WaitRunTicks(Int32 ticks) in /home/runner/work/space-station-14/space-station-14/RobustToolbox/Robust.UnitTesting/RobustIntegrationTest.cs:line 653
   at Robust.UnitTesting.Pool.TestPair`2.RunTicksSync(Int32 ticks) in /home/runner/work/space-station-14/space-station-14/RobustToolbox/Robust.UnitTesting/Pool/TestPair.Helpers.cs:line 185
   at Robust.UnitTesting.Pool.TestPair`2.RunUntilSynced() in /home/runner/work/space-station-14/space-station-14/RobustToolbox/Robust.UnitTesting/Pool/TestPair.Helpers.cs:line 226
   at Content.IntegrationTests.Fixtures.GameTest.DoTeardown() in /home/runner/work/space-station-14/space-station-14/Content.IntegrationTests/Fixtures/GameTest.cs:line 243
   at Content.IntegrationTests.Fixtures.GameTest.DoTeardown() in /home/runner/work/space-station-14/space-station-14/Content.IntegrationTests/Fixtures/GameTest.cs:line 262
   at NUnit.Framework.Internal.Commands.SetUpTearDownItem.RunTearDown(TestExecutionContext context)

Trace:


1)    at Robust.UnitTesting.Pool.TestPair`2.OnDirtyDispose() in /home/runner/work/space-station-14/space-station-14/RobustToolbox/Robust.UnitTesting/Pool/TestPair.Recycle.cs:line 44
   at System.Runtime.CompilerServices.AsyncMethodBuilderCore.Start[TStateMachine](TStateMachine& stateMachine)
   at Robust.UnitTesting.Pool.TestPair`2.OnDirtyDispose()
   at Robust.UnitTesting.Pool.TestPair`2.DisposeAsync() in /home/runner/work/space-station-14/space-station-14/RobustToolbox/Robust.UnitTesting/Pool/TestPair.Recycle.cs:line 146
   at System.Runtime.CompilerServices.AsyncMethodBuilderCore.Start[TStateMachine](TStateMachine& stateMachine)
   at Robust.UnitTesting.Pool.TestPair`2.DisposeAsync()
   at Content.IntegrationTests.Fixtures.GameTest.DoTeardown() in /home/runner/work/space-station-14/space-station-14/Content.IntegrationTests/Fixtures/GameTest.cs:line 262
2) --TearDown
   at Robust.Client.GameStates.ClientGameStateManager.PartialStateReset(GameState state, Boolean resetAllEntities, Boolean deleteClientEntities, Boolean deleteClientChildren) in /home/runner/work/space-station-14/space-station-14/RobustToolbox/Robust.Client/GameStates/ClientGameStateManager.cs:line 1288
   at Robust.Client.GameStates.ClientGameStateManager.ApplyGameState() in /home/runner/work/space-station-14/space-station-14/RobustToolbox/Robust.Client/GameStates/ClientGameStateManager.cs:line 426
   at Robust.Client.GameController.Tick(FrameEventArgs frameEventArgs) in /home/runner/work/space-station-14/space-station-14/RobustToolbox/Robust.Client/GameController/GameController.cs:line 617
   at Robust.UnitTesting.RobustIntegrationTest.IntegrationGameLoop.SingleThreadRunUntilEmpty() in /home/runner/work/space-station-14/space-station-14/RobustToolbox/Robust.UnitTesting/RobustIntegrationTest.cs:line 1250
   at Robust.UnitTesting.RobustIntegrationTest.IntegrationGameLoop.Run() in /home/runner/work/space-station-14/space-station-14/RobustToolbox/Robust.UnitTesting/RobustIntegrationTest.cs:line 1237
   at Robust.UnitTesting.RobustIntegrationTest.ClientIntegrationInstance.ThreadMain() in /home/runner/work/space-station-14/space-station-14/RobustToolbox/Robust.UnitTesting/RobustIntegrationTest.cs:line 1047
--- End of stack trace from previous location ---
   at Robust.UnitTesting.RobustIntegrationTest.IntegrationInstance.WaitIdleImplAsync(Boolean throwOnUnhandled, CancellationToken cancellationToken) in /home/runner/work/space-station-14/space-station-14/RobustToolbox/Robust.UnitTesting/RobustIntegrationTest.cs:line 566
   at Robust.UnitTesting.RobustIntegrationTest.IntegrationInstance.WaitRunTicks(Int32 ticks) in /home/runner/work/space-station-14/space-station-14/RobustToolbox/Robust.UnitTesting/RobustIntegrationTest.cs:line 653
   at Robust.UnitTesting.Pool.TestPair`2.RunTicksSync(Int32 ticks) in /home/runner/work/space-station-14/space-station-14/RobustToolbox/Robust.UnitTesting/Pool/TestPair.Helpers.cs:line 185
   at Robust.UnitTesting.Pool.TestPair`2.RunUntilSynced() in /home/runner/work/space-station-14/space-station-14/RobustToolbox/Robust.UnitTesting/Pool/TestPair.Helpers.cs:line 226
   at Content.IntegrationTests.Fixtures.GameTest.DoTeardown() in /home/runner/work/space-station-14/space-station-14/Content.IntegrationTests/Fixtures/GameTest.cs:line 243
   at Content.IntegrationTests.Fixtures.GameTest.DoTeardown() in /home/runner/work/space-station-14/space-station-14/Content.IntegrationTests/Fixtures/GameTest.cs:line 262
   at NUnit.Framework.Internal.Commands.SetUpTearDownItem.RunTearDown(TestExecutionContext context)

Tests 📝	Passed ✅	Failed ❌	Duration ⏱️
1694	1674	1	11m 13s

Github Test Reporter by CTRF 💚

🔄 This comment has been updated

coderabbitai · 2026-08-12T11:15:52Z

Note

GitHub couldn't provide a complete incremental comparison for this pull request, so CodeRabbit is performing a full review instead. This review may take a little longer.

…A/space-station-14 into Salv-Bounty-Rework

…ng standards in modifications

…ng standards in modifications pt 2

…unty-Rework

Thank you Rinary! Co-authored-by: Rinary <rinary.super@gmail.com>

…unty-Rework

TeddiousbearPA and others added 24 commits June 1, 2026 17:55

Added Experimental Plushie to Plush Vendor

5bc115a

Added Experimental Plushie to Plush Vendor

Merge branch 'starlight-dev' into starlight-dev

e7665ea

Merge branch 'starlight-dev' into starlight-dev

32304fd

Update plushies.yml

8fe1a80

Merge branch 'ss14Starlight:starlight-dev' into starlight-dev

9371316

New Uniforms for Secoff/Dutyoff/Warden/Brigmedic

8fd7dcc

New (primarily) formal uniforms for sec including: Formal Senior Brigmedic Formal Brigmedic Formal Warden Formal Senior Secoff/Dutyoff Formal Secoff/Dutyoff Formal Deputy (Secoff) Deputy's Hat

Fixed names and description

68fbcc0

fixed the names of senior formal security uniform and description of deputy jumpskirt

Adding Space Asshole to Jukebox

d8fcf3e

Adds Spaces Asshole to the jukebox playlist

Revert "Adding Space Asshole to Jukebox"

79f1d47

This reverts commit d8fcf3e.

Merge branch 'ss14Starlight:starlight-dev' into starlight-dev

5ede388

fixes

7313666

fixed requests from rinary and bot

Merge branch 'starlight-dev' of https://github.com/TeddiousbearPA/spa…

c79db4d

…ce-station-14 into starlight-dev

Merge branch 'starlight-dev' into starlight-dev

5ff540c

Rename senior duty officer loadout items

15043c7

Rename loadout IDs for senior duty officer

3e8249a

Remove armor and zombification resistance from jumpsuits

b5e20e9

Removed armor and zombification resistance entries from jumpsuits.

Merge branch 'ss14Starlight:starlight-dev' into starlight-dev

b0db1d6

Merge branch 'ss14Starlight:starlight-dev' into starlight-dev

79dc21f

Merge branch 'starlight-dev' of https://github.com/TeddiousbearPA/spa…

671ecd2

…ce-station-14 into starlight-dev

Merge branch 'starlight-dev' of https://github.com/TeddiousbearPA/spa…

4c451f6

…ce-station-14 into starlight-dev

Merge branch 'ss14Starlight:starlight-dev' into starlight-dev

07861ee

Initial

d080c7d

draftable

913acb8

Comments and Xaml edits

9bee880

TeddiousbearPA added 3 commits August 10, 2026 02:00

Merge branch 'starlight-dev' into Salv-Bounty-Rework

e9ad1dc

fixes

616b408

Merge branch 'Salv-Bounty-Rework' of https://github.com/TeddiousbearP…

3808203

…A/space-station-14 into Salv-Bounty-Rework

Merge branch 'starlight-dev' into Salv-Bounty-Rework

e0d30ea

TeddiousbearPA added 7 commits August 12, 2026 21:31

shard 2 fix pls

0b5d1ad

Merge branch 'Salv-Bounty-Rework' of https://github.com/TeddiousbearP…

162867f

…A/space-station-14 into Salv-Bounty-Rework

Merge branch 'ss14Starlight:starlight-dev' into Salv-Bounty-Rework

9007b92

Removed Nuke Bounty, created new salvage_jobs.yml in _starlight

4776ffc

Moved all additions to new _starlight files, fixed starlight commenti…

c2abc2a

…ng standards in modifications

Moved all additions to new _starlight files, fixed starlight commenti…

48cf6b6

…ng standards in modifications pt 2

Merge remote-tracking branch 'origin/Salv-Bounty-Rework' into Salv-Bo…

76bc7bd

…unty-Rework

Rinary1 requested changes Aug 16, 2026

View reviewed changes

starlightgithub Bot added S: Awaiting Changes Status: Changes are required before another review can happen and removed S: Needs Review Status: Requires additional reviews before being fully accepted. Not to be replaced by S: Approved. labels Aug 16, 2026

TeddiousbearPA and others added 3 commits August 16, 2026 12:50

Apply suggestions from code review

7716552

Thank you Rinary! Co-authored-by: Rinary <rinary.super@gmail.com>

cargo-bounty-console.ftl additions moved to new _starlight proto

156e157

Merge remote-tracking branch 'origin/Salv-Bounty-Rework' into Salv-Bo…

b1735c0

…unty-Rework

TeddiousbearPA requested a review from Rinary1 August 16, 2026 17:12

github-actions Bot added S: Needs Review Status: Requires additional reviews before being fully accepted. Not to be replaced by S: Approved. and removed S: Awaiting Changes Status: Changes are required before another review can happen labels Aug 16, 2026

Rinary1 approved these changes Aug 18, 2026

View reviewed changes

starlightgithub Bot added S: Approved Status: Reviewed and approved by at least one maintainer or dev; a PR may require another approval. and removed S: Needs Review Status: Requires additional reviews before being fully accepted. Not to be replaced by S: Approved. labels Aug 18, 2026

Rinary1 added this pull request to the merge queue Aug 18, 2026

Merged via the queue into ss14Starlight:starlight-dev with commit f61f7b2 Aug 18, 2026
21 of 26 checks passed

starlightgithub Bot added a commit that referenced this pull request Aug 18, 2026

Changelog: PR #5510 [skip ci]

df91fd3

TeddiousbearPA deleted the Salv-Bounty-Rework branch August 18, 2026 22:29

Navigation Menu

Uh oh!

Salvage Bounty Rework - #5510

Salvage Bounty Rework#5510
Rinary1 merged 45 commits into
ss14Starlight:starlight-devfrom
TeddiousbearPA:Salv-Bounty-Rework

TeddiousbearPA commented Aug 4, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Aug 11, 2026 •

edited

Loading

Uh oh!

coderabbitai Bot commented Aug 12, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

TeddiousbearPA commented Aug 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Short description

Why we need to add this

Media (Video/Screenshots)

Checks

Uh oh!

github-actions Bot commented Aug 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Content + Integration Test Results

Failed Tests

Uh oh!

coderabbitai Bot commented Aug 12, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

TeddiousbearPA commented Aug 4, 2026 •

edited

Loading

github-actions Bot commented Aug 11, 2026 •

edited

Loading