Byrd-Station/Byrd
Byrd-Station/Byrd
Watch
4
5
Fork
You've already forked Byrd
 22
Code Issues 33 Pull requests 35 Projects 1 Wiki Activity Actions 37

Added more weapons from upstream #1306 #1062

Open
QuillTheCreature wants to merge 1 commit from QuillTheCreature/Byrd:entities/weapons/morestuff into master
pull from: QuillTheCreature/Byrd:entities/weapons/morestuff
merge into: Byrd-Station:master
Conversation 0 Commits 1 Files changed 56 +520 -18
QuillTheCreature commented 2026-10-12 20:12:11 +00:00
Member

Short description

Added more weapons and balance changes from upstream: https://github.com/ProjectOmu/OmuStation/pull/1603

Why we need to add this

Discord request, upstream.

Checklist

Ingame Changelog

🆑 Quill

  • add: Added twin revolvers for warden designed for midrange AP.
  • add: Added a shotgun, crossbow and disabler smg for brigmed.
  • add: Added T4 Research for a AP shotgun shell.
  • tweak: buffed the HoS laser shotgun and smg to have more capacity.
  • tweak: Buffed the R6, fires like your life depends on it, hits like a frying pan in melee.
<!-- Link definitions, do not edit --> [guidelines]: https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html [ruleset]: https://rules.byrdstation.space/#h.vigrxrnffwji ## Short description Added more weapons and balance changes from upstream: https://github.com/ProjectOmu/OmuStation/pull/1603 ## Why we need to add this Discord request, upstream. ## Checklist <!-- Check boxes for faster reviewing of your PR --> - [x] I do not require assistance to complete the PR. - [x] I have verified that the changes work before posting/requesting review of my PR. - [x] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [x] I have read the [Pull Request and Changelog Guidelines][guidelines] and [Byrd Station's Contributor Ruleset][ruleset]. ### Ingame Changelog :cl: Quill - add: Added twin revolvers for warden designed for midrange AP. - add: Added a shotgun, crossbow and disabler smg for brigmed. - add: Added T4 Research for a AP shotgun shell. - tweak: buffed the HoS laser shotgun and smg to have more capacity. - tweak: Buffed the R6, fires like your life depends on it, hits like a frying pan in melee.
Added more weapons from upstream #1306
Some checks failed
Close PRs on master / run (pull_request_target) Has been skipped
Details
Labels: PR / labeler (pull_request_target) Failing after 32s
Details
Labels: Size / size-label (pull_request_target) Failing after 27s
Details
CRLF Check / CRLF Check (pull_request) Failing after 1m30s
Details
Diff RSIs / Diff (pull_request) Failing after 29s
Details
Test Packaging / Test Packaging (pull_request) Failing after 16s
Details
RGA schema validator / YAML RGA schema validator (pull_request) Failing after 1m16s
Details
RSI Validator / Validate RSIs (pull_request) Failing after 26s
Details
Map file schema validator / YAML map schema validator (pull_request) Failing after 1m8s
Details
YAML Linter / YAML Linter (pull_request) Failing after 20s
Details
948077aeec
Some checks failed
Close PRs on master / run (pull_request_target) Has been skipped
Details
Labels: PR / labeler (pull_request_target) Failing after 32s
Details
Labels: Size / size-label (pull_request_target) Failing after 27s
Details
CRLF Check / CRLF Check (pull_request) Failing after 1m30s
Details
Diff RSIs / Diff (pull_request) Failing after 29s
Details
Test Packaging / Test Packaging (pull_request) Failing after 16s
Details
RGA schema validator / YAML RGA schema validator (pull_request) Failing after 1m16s
Details
RSI Validator / Validate RSIs (pull_request) Failing after 26s
Details
Map file schema validator / YAML map schema validator (pull_request) Failing after 1m8s
Details
YAML Linter / YAML Linter (pull_request) Failing after 20s
Details
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u "entities/weapons/morestuff:QuillTheCreature-entities/weapons/morestuff"
git switch "QuillTheCreature-entities/weapons/morestuff"
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Area/Accessibility
Area: Accessibility settings and features.

  
Area/Admin Tooling
Area: Admin tooling and moderation

  
Area/Art
Area: Art with no implications for other areas.

  
Area/Atmospherics
Area: Atmospherics

  
Area/Cargo
Area: Cargo department and related mechanics

  
Area/Character / Species
Area: Player characters and species features and content.

  
Area/Chat
Area: Chat-related features and changes, most likely technical.

  
Area/Combat
Area: Combat features, changes, balancing.

  
Area/Command
Area: Command department, where it isn't applicable to other departments.

  
Area/Database
Area: Changes to Database code.

  
Area/Engineering
Area: Engineering department, doesn't include Atmospherics.

  
Area/Graphics
Area: Changes to shaders or overlays.

  
Area/Guidebook
Area: Ingame guidebook, content or technical implementation.

  
Area/Mapping
Area: Maps, or tools used for mapping

  
Area/Medical
Area: Medical department, including Chemistr

  
Area/Preferences / Options
Area: Player preferences and options.

  
Area/Roleplay / Lore
Area: Roleplay aspects or content that primarily target the game's lore, rather than mechanics

  
Area/Roundflow / Antag
Area: Roundflow - "What happens in the game", including antagonist roles and their capabilities.

  
Area/Rules
Area: Changes to Server rules, SoP, or Space Law.

  
Area/Salvage
Area: Salvage changes

  
Area/Science
Area: Science department, not including Silicons.

  
Area/Security
Area: Security department, including Detectives, HoS

  
Area/Service
Area: Service department, including cooking, botany, etc

  
Area/Silicons
Area: Relates to Silicon roles, including AI.

  
bug
This is in regards to a bug.

  
Changes: Audio

   
Changes: Map

   
Changes: No C#

   
Changes: Sprites

   
Changes: UI

   
documentation
Improvements or additions to documentation

  
DON'T MERGE
This is under review, fixes, or needs significant changes.

  
duplicate
This issue or pull request already exists

  
good first issue
Good for newcomers

  
help wanted
Extra attention is needed

  
holding to vote
This is currently being voted for by the Byrds.

  
Note/Port
A port from another repository.

  
Note/Upstream
A PR from upstream.

  
Priority
Critical
 Critical priority task!!

  
Priority
High
 High priority task

  
Priority
Low
 Low priority task

  
Priority
Normal
 Normal priority task

  
size/L

   
size/M

   
size/S

   
size/XL

   
size/XS

   
State/Approved
This PR has been approved.

  
State/invalid
This doesn't seem right

  
State/Merge Conflict

   
State/Needs Changes
Changes/Concerns have been brought up and should be made before review.

  
State/Needs Discussion
Discussion needed for changes, talk about it.

  
State/Untriaged

   
Type/Balance Change
Changes something in the game related to balancing.

  
Type/Bugfix
Fixes a known issue/bug.

  
Type/Documentation
Makes changes to documentation in the repository. This includes attributions changes.

  
Type/Enhancement
New feature or request, change to game.

  
Type/Feature
Adds completely new stuff to the game.

  
Type/Question
Further information is requested.

  
wontfix
This will not be worked on

No labels
Area/Accessibility
Area/Admin Tooling
Area/Art
Area/Atmospherics
Area/Cargo
Area/Character / Species
Area/Chat
Area/Combat
Area/Command
Area/Database
Area/Engineering
Area/Graphics
Area/Guidebook
Area/Mapping
Area/Medical
Area/Preferences / Options
Area/Roleplay / Lore
Area/Roundflow / Antag
Area/Rules
Area/Salvage
Area/Science
Area/Security
Area/Service
Area/Silicons
bug
Changes: Audio
Changes: Map
Changes: No C#
Changes: Sprites
Changes: UI
documentation
DON'T MERGE
duplicate
good first issue
help wanted
holding to vote
Note/Port
Note/Upstream
Priority
Critical
Priority
High
Priority
Low
Priority
Normal
size/L
size/M
size/S
size/XL
size/XS
State/Approved
State/invalid
State/Merge Conflict
State/Needs Changes
State/Needs Discussion
State/Untriaged
Type/Balance Change
Type/Bugfix
Type/Documentation
Type/Enhancement
Type/Feature
Type/Question
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!1062
No description provided.