Cherrypicks+ (2026/06/03) #344

Merged

LilithArson merged 19 commits from cherrypicks-20260603 into master 2026-06-03 17:06:13 +00:00

Conversation 0 Commits 19 Files changed 199 +2361 -21

LilithArson commented 2026-06-03 14:36:27 +00:00

Owner

Copy link

PR Changes

Cherrypicks the following PRs:

• Wizden#34127: Job trinket plushies
• Wizden#40762: Golden shaker
• DeltaV#2675: More suits

Reasons Behind Changes

none

Code & Technical details

none

Images; Sprites; Media

none

Checklist

• I read the Pull Request and Changelog Guidelines and Byrd Station's Contributor Ruleset am following them.
• I have added media to this PR, or it does not require an ingame showcase.

Breaking changes

Ingame Changelog

🆑

• add: More suits
• add: Golden shaker for bartender
• add: Job-specific plushie trinkets
• add: Smartequip binds for pockets
• tweak: Bandolier now holds up to 18 shells

## PR Changes Cherrypicks the following PRs: - [Wizden#34127](https://github.com/space-wizards/space-station-14/pull/34127): Job trinket plushies - [Wizden#40762](https://github.com/space-wizards/space-station-14/pull/40762): Golden shaker - [DeltaV#2675](https://github.com/DeltaV-Station/Delta-v/pull/2675): More suits ## Reasons Behind Changes none ## Code & Technical details none ## Images; Sprites; Media none ## Checklist <!--Understand that not following all Contributor rule standards may get your PR closed at a maintainer’s discretion. Failure to follow the Contributor's ruleset may lead to your removal as a contributor.--> <!-- Confirm by placing an X in the brackets [X]: --> - [x] I read the [Pull Request and Changelog Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html) and [Byrd Station's Contributor Ruleset](https://docs.google.com/document/d/1oxCSRBc_2IlrcykljB5SPt783uJX7rMHTT7cImxlKFM/edit?tab=t.0#heading=h.vigrxrnffwji) am following them. - [x] I have added media to this PR, or it does not require an ingame showcase. ## Breaking changes <!-- List any breaking changes, including namespaces, public class/method/field changes, prototype renames; and provide instructions for fixing them. This will be posted in #codebase-changes. --> **Ingame Changelog** <!-- Add a Changelog entry to make players ingame aware of new changes that could affect gameplay.--> :cl: - add: More suits - add: Golden shaker for bartender - add: Job-specific plushie trinkets - add: Smartequip binds for pockets - tweak: Bandolier now holds up to 18 shells

LilithArson added 2 commits 2026-06-03 14:36:27 +00:00

Wizden#34127: Plushies d50c80d4ff

Wizden#34127: Loadouts 9df7803109

forgejo-actions added the

Changes: No C#

Changes: Sprites

size/L

labels 2026-06-03 14:36:48 +00:00

LilithArson added 4 commits 2026-06-03 14:54:56 +00:00

DV#2675: Sprites 06de69156d

DV#2675: Loadouts 68b78ba967

Wizden#40762: Sprites ae5cecfb62

Wizden#40762: Golden shaker f43704aadb

LilithArson added 1 commit 2026-06-03 14:56:51 +00:00

Fix a few mistakes c1e4545f61

LilithArson added 1 commit 2026-06-03 15:23:51 +00:00

Fix remaining errors 0232f948b1

LilithArson added 3 commits 2026-06-03 15:48:34 +00:00

double-barrel -> double-barreled 23cb893d3e

Make the Bandolier be storage instead of ammo 0ea6da61a6

smartequip for pockets be6939c859

forgejo-actions added the

Changes: UI

label 2026-06-03 15:48:54 +00:00

LilithArson changed title from Cherrypicks (2026/06/03) to Cherrypicks+ (2026/06/03) 2026-06-03 15:50:20 +00:00

LilithArson added 2 commits 2026-06-03 15:56:53 +00:00

Make damp rag marginally more useful fb5197c254

Fix pocket bind double register 08803b0b54

LilithArson added 2 commits 2026-06-03 16:19:29 +00:00

Wizden#43353: Sprites a997237214

Wizden#43353: Book hunt 5008c9bc5f

LilithArson added 1 commit 2026-06-03 16:21:38 +00:00

Fix leftover d011449554

LilithArson added 3 commits 2026-06-03 16:30:12 +00:00

Revert "Fix leftover" ... f2d11ceccb

This reverts commit d011449554.

Revert "Wizden#43353: Book hunt" ... dab3c4e1a9

This reverts commit 5008c9bc5f.

Revert "Wizden#43353: Sprites" ... c1d7e3cb79

This reverts commit a997237214.

LilithArson merged commit 411dd1d4c4 into master 2026-06-03 17:06:13 +00:00

LilithArson deleted branch cherrypicks-20260603 2026-06-03 17:06:13 +00:00

LilithArson referenced this pull request from a commit 2026-06-03 17:06:13 +00:00

Cherrypicks+ (2026/06/03) (#344)

byrdbot referenced this pull request from a commit 2026-06-03 17:06:31 +00:00

Automatic changelog update (#344)

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

bug

Something isn't working

  

Changes: Audio

  

Changes: Map

  

Changes: No C#

  

Changes: Sprites

  

Changes: UI

  

documentation

Improvements or additions to documentation

  

duplicate

This issue or pull request already exists

  

enhancement

New feature or request

  

good first issue

Good for newcomers

  

help wanted

Extra attention is needed

  

holding to vote

This is currently being voted for by the Byrds.

  

invalid

This doesn't seem right

  

question

Further information is requested

  

size/L

  

size/M

  

size/S

  

size/XL

  

size/XS

  

S: Merge Conflict

  

S: Untriaged

  

wontfix

This will not be worked on

No labels

bug

Changes: Audio

Changes: Map

Changes: No C#

Changes: Sprites

Changes: UI

documentation

duplicate

enhancement

good first issue

help wanted

holding to vote

invalid

question

size/L

size/M

size/S

size/XL

size/XS

S: Merge Conflict

S: Untriaged

wontfix

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

Byrd-Station/Byrd!344

No description provided.