Byrd-Station/Byrd
5
3
Fork 17
Code Issues 33 Pull requests 4 Projects 2 Wiki Activity Actions

Bartender weapon selector #409

Merged
LilithArson merged 5 commits from bartender-selector-20260613 into master 2026-06-13 11:47:38 +00:00
Conversation 0 Commits 5 Files changed 21 +316 -105
LilithArson commented 2026-06-13 11:27:04 +00:00
Owner
Copy link

Checklist

Ingame Changelog

🆑

  • add: Re-added .45 magnum rubber ammo
  • add: .45 magnum rubber can now be made in the ammo, security and service techfabs
  • add: Added bartender weapon selector
  • tweak: Booze locker now gets a bartender weapon selector instead of a shotgun, beanbags and baseball bat.
  • tweak: Revamped weapon selector UI
## 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. **Ingame Changelog** <!-- Add a Changelog entry to make players ingame aware of new changes that could affect gameplay.--> :cl: - add: Re-added .45 magnum rubber ammo - add: .45 magnum rubber can now be made in the ammo, security and service techfabs - add: Added bartender weapon selector - tweak: Booze locker now gets a bartender weapon selector instead of a shotgun, beanbags and baseball bat. - tweak: Revamped weapon selector UI
Make .45 rubber printable in lathes
Some checks failed
CRLF Check / CRLF Check (pull_request) Waiting to run
Details
Test Packaging / Test Packaging (pull_request) Waiting to run
Details
RGA schema validator / YAML RGA schema validator (pull_request) Waiting to run
Details
RSI Validator / Validate RSIs (pull_request) Waiting to run
Details
Map file schema validator / YAML map schema validator (pull_request) Waiting to run
Details
YAML Linter / YAML Linter (pull_request) Waiting to run
Details
Close PRs on master / run (pull_request_target) Has been skipped
Details
Check Merge Conflicts / label (pull_request_target) Successful in 15s
Details
Labels: PR / labeler (pull_request_target) Successful in 3s
Details
Labels: Size / size-label (pull_request_target) Successful in 2s
Details
Labels: Untriaged / add_label (pull_request_target) Failing after 3s
Details
Build & Test Map Renderer / build (ubuntu-latest) (pull_request) Has been cancelled
Details
Build & Test Map Renderer / Build & Test Debug (pull_request) Has been cancelled
Details
soft-repoban check / check-author (pull_request) Successful in 3s
Details
ce64d75eff
Let the bartender get two weapons, since they're all less-lethals
All checks were successful
Check Merge Conflicts / label (pull_request_target) Successful in 15s
Details
Labels: PR / labeler (pull_request_target) Successful in 3s
Details
Labels: Size / size-label (pull_request_target) Successful in 2s
Details
Build & Test Map Renderer / build (ubuntu-latest) (pull_request) Successful in 2m23s
Details
CRLF Check / CRLF Check (pull_request) Successful in 16s
Details
Test Packaging / Test Packaging (pull_request) Successful in 6m34s
Details
RGA schema validator / YAML RGA schema validator (pull_request) Successful in 28s
Details
RSI Validator / Validate RSIs (pull_request) Successful in 22s
Details
Map file schema validator / YAML map schema validator (pull_request) Successful in 3m49s
Details
YAML Linter / YAML Linter (pull_request) Successful in 2m33s
Details
Build & Test Map Renderer / Build & Test Debug (pull_request) Successful in 3s
Details
PR Changelogs / changelog (pull_request_target) Successful in 19s
Details
548d2051d6
LilithArson deleted branch bartender-selector-20260613 2026-06-13 11:47:38 +00:00
LilithArson referenced this pull request from a commit 2026-06-13 11:47:39 +00:00
Bartender weapon selector (#409)
byrdbot referenced this pull request from a commit 2026-06-13 11:47:56 +00:00
Automatic changelog update (#409)
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
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!409
No description provided.