Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Attachment Update + A few new attachments #4040

Merged
merged 30 commits into from
Feb 14, 2025

Conversation

Gristlebee
Copy link
Contributor

@Gristlebee Gristlebee commented Jan 19, 2025

About The Pull Request

Adds two new lists to help handle initialization for valid attachments on gun's attachment holder lists, weapon_class_attachments (for attachments specific to a gun type, eg scopes for rifles) and unique_attachments (for attachments specific to that gun eg. folding stocks on the saber) and refused_attachments (attachments the gun can't take.)

Adds secondary actions to items, currently bound to shift-space by default. Using secondary action on a gun will cycle through it's firemodes, if any.

Underbarrel guns now support hand unloading and magazines.

Underbarrel guns now come in guncases.

Underbarrel shotgun is now pumped, holds two shots, and had it's price increased to 1200.

Adds the Hognose underbarrel pistol, alof tube attachment and underbarrel energy cannon.

The Hognose and alof can be bought in outpost cargo, and the underbarrel energy cannon can be bought in the black market.

Fixes being unable to load underbarrel guns while weapons with bolts like illestren were closed.

Energy guns have a muzzle slot so they can take bayonets properly.

Pistols can no longer take underbarrel guns.

Fixes a few typos

Why It's Good For The Game

Adding new attachments to the game isn't great right now since it operates off a single list. If a gun needs to have a different list of attachments it can take, it needs a snowflaked valid attachment list that needs to updated along with everything else whenever a new attachment is added which adds a lot of work. Organizing the lists into different categories should hopefully make things less messy to work with.

Underbarrel guns now come in cases for consistency.

The firemode hotkey was added due to feedback about how awkward it was to quickly swap firemodes to use an underbarrel gun, especially weapons with multiple firemodes since you had to moouse up and click on a HUD element. Having a hotkey should be easier.

The underbarrel shotgun was changed to make it feel better to use after feedback.

New attachments are cool I think, and work as proof of concept for the new mechanics in the update.

Changelog

🆑
add: Hognose, alof, underbarrel energy cannon
add: Underbarrel guns come in cases.
add: Secondary actions and hotkey.
add: Muzzle slot for eguns
balance: Pistols can no longer take underbarrel guns.
balance: Underbarrel shotgun holds two rounds, price increased to 1200
fix: Fixes being unable to load underbarrel guns while gun bolts were closed.
fix: slings being funky
spellcheck: typos
code: new attachment lists, weapon_class_attachments, unique_attachments, refused_attachments
/:cl:

@Gristlebee Gristlebee requested review from FalloutFalcon and a team as code owners January 19, 2025 23:34
@github-actions github-actions bot added DME Edit Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Jan 19, 2025
@FalloutFalcon FalloutFalcon added Feature REALLY causes more bugs in the future that we won't know about. Test Merge Candidate You do it for free. labels Jan 20, 2025
code/modules/projectiles/gun.dm Outdated Show resolved Hide resolved
@Erikafox
Copy link
Contributor

Erikafox commented Feb 7, 2025

I would like pistols to refuse underbarrel attachments.

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Feb 11, 2025
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Feb 11, 2025
@FalloutFalcon FalloutFalcon added this pull request to the merge queue Feb 14, 2025
Merged via the queue into shiptest-ss13:master with commit cbf40ef Feb 14, 2025
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. DME Edit Feature REALLY causes more bugs in the future that we won't know about. Sprites A bikeshed full of soulless bikes. Test Merge Candidate You do it for free.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants