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

Small gun changes #3048

Merged
merged 22 commits into from
Jun 26, 2024
Merged

Small gun changes #3048

merged 22 commits into from
Jun 26, 2024

Conversation

Gristlebee
Copy link
Contributor

About The Pull Request

Makes the combat shotgun bulky instead of huge, and the compact combat shotgun medium instead of bulky

Repaths the saber SMG to be a child of the skm carbine so the stock is able to fold and changes

Adds automatic fire to the TEC-9 and makes it normal sized.

Why It's Good For The Game

The combat shotgun being huge is a holdover from station based server balance. It being bulky now will make it be able to fit in armor vests. Moves the compact combat shotgun down to normal as a result since it's supposed to be the compact version.

The Saber and TEC-9 changes are so they're accurate to their descriptions of having a folding stock and having a fast rate of fire respectively. Ups the TEC-9 to normal sized as a result since having an automatic pistol you can fit in your boot is probably not good.

Changelog

🆑

tweak: Saber SMG stock folds
tweak: TEC-9 Pistol is now automatic and normal sized
balance: Combat shotgun is now bulky, and the compact combat shotgun is normal.
/:cl:

@Gristlebee Gristlebee requested review from a team as code owners May 31, 2024 07:18
@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. DME Edit Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels May 31, 2024
@FalloutFalcon FalloutFalcon added the Balance/Rebalance Makes powergaming easier in expected ways, or easier in unexpected ways. label May 31, 2024
Copy link
Member

@rye-rice rye-rice left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please be aware anything with the old gun pallete/ WS era zeta style is intentionally elft untouched as the proto SMG is unlikely to survive a planned NT/SL gun rework, and also be aware that i'm avoiding putting more things under skm_carbine as foldable stocks are meant to be attachments, eg you dont need to do weird subtyping like this.

This approval is for the sprites and shotgun, I'm unsure about the changes i mentioned however.

@rye-rice
Copy link
Member

rye-rice commented Jun 2, 2024

Oh and the TEC-9 has a 0% chance of living post scarborgh PR, be aware of that as well

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jun 6, 2024
Copy link
Contributor

github-actions bot commented Jun 6, 2024

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

@Gristlebee Gristlebee requested a review from FalloutFalcon as a code owner June 6, 2024 21:37
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Jun 6, 2024
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jun 9, 2024
Copy link
Contributor

github-actions bot commented Jun 9, 2024

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

@github-actions github-actions bot removed Merge Conflict Use Git Hooks, you're welcome. DME Edit labels Jun 9, 2024
Copy link
Member

@FalloutFalcon FalloutFalcon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good otherwise

code/modules/projectiles/guns/ballistic/pistol.dm Outdated Show resolved Hide resolved
@github-actions github-actions bot requested a review from FalloutFalcon June 11, 2024 01:51
@github-actions github-actions bot requested a review from FalloutFalcon June 18, 2024 00:55
@FalloutFalcon FalloutFalcon enabled auto-merge June 24, 2024 05:14
@FalloutFalcon FalloutFalcon added this pull request to the merge queue Jun 25, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 25, 2024
@github-actions github-actions bot requested a review from FalloutFalcon June 26, 2024 04:18
@thgvr thgvr added this pull request to the merge queue Jun 26, 2024
Merged via the queue into shiptest-ss13:master with commit d1e86af Jun 26, 2024
14 checks passed
MrCat15352 pushed a commit to MrCat15352/MrCat that referenced this pull request Jun 30, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

Makes the combat shotgun bulky instead of huge, and the compact combat
shotgun medium instead of bulky

Repaths the saber SMG to be a child of the skm carbine so the stock is
able to fold and changes

Adds automatic fire to the TEC-9 and makes it normal sized.

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

The combat shotgun being huge is a holdover from station based server
balance. It being bulky now will make it be able to fit in armor vests.
Moves the compact combat shotgun down to normal as a result since it's
supposed to be the compact version.

The Saber and TEC-9 changes are so they're accurate to their
descriptions of having a folding stock and having a fast rate of fire
respectively. Ups the TEC-9 to normal sized as a result since having an
automatic pistol you can fit in your boot is probably not good.

:cl:

tweak: Saber SMG stock folds
tweak: TEC-9 Pistol is now automatic and normal sized
balance: Combat shotgun is now bulky, and the compact combat shotgun is
normal.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Jun 30, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

Makes the combat shotgun bulky instead of huge, and the compact combat
shotgun medium instead of bulky

Repaths the saber SMG to be a child of the skm carbine so the stock is
able to fold and changes

Adds automatic fire to the TEC-9 and makes it normal sized.

## Why It's Good For The Game

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

The combat shotgun being huge is a holdover from station based server
balance. It being bulky now will make it be able to fit in armor vests.
Moves the compact combat shotgun down to normal as a result since it's
supposed to be the compact version.

The Saber and TEC-9 changes are so they're accurate to their
descriptions of having a folding stock and having a fast rate of fire
respectively. Ups the TEC-9 to normal sized as a result since having an
automatic pistol you can fit in your boot is probably not good.

## Changelog

:cl:

tweak: Saber SMG stock folds
tweak: TEC-9 Pistol is now automatic and normal sized
balance: Combat shotgun is now bulky, and the compact combat shotgun is
normal.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
@Gristlebee Gristlebee deleted the guns-changes branch July 3, 2024 06:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Balance/Rebalance Makes powergaming easier in expected ways, or easier in unexpected ways. Code change Watch something violently break. Map Change Tile placing is hard. Thank you for your service. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants