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

Fixes 38 Surplus being unprintable in the autolathe and 38 speedloader description #2840

Merged
merged 5 commits into from
Mar 28, 2024

Conversation

Gristlebee
Copy link
Contributor

@Gristlebee Gristlebee commented Mar 16, 2024

About The Pull Request

Fixes #2814 and makes 38 surplus ammo able to be printed from the autolathe. Changes the damage blurb on the 38 speedloader to reflect standard 38 ammo's new stats.

Why It's Good For The Game

Bug fixes are good.

Changelog

🆑
fix: 38 Surplus ammo should be printable in the autolathe.
fix: 38 speedloader damage blurb is accurate to it's new stats.
/:cl:

@github-actions github-actions bot added the Code change Watch something violently break. label Mar 16, 2024
@Gristlebee Gristlebee changed the title Fixes 38 Surplus being unprintable in the autolathe Fixes 38 Surplus being unprintable in the autolathe and 38 speedloader description Mar 25, 2024
@Gristlebee
Copy link
Contributor Author

Updated the speedloader desc while I was at it since 38 now has the same stats as 9mm. Changed the PR description to reflect that I added back the protolathe flag. Everything should be in order.

Copy link
Member

@MarkSuckerberg MarkSuckerberg left a comment

Choose a reason for hiding this comment

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

good catch

@MarkSuckerberg MarkSuckerberg added this pull request to the merge queue Mar 27, 2024
@MarkSuckerberg MarkSuckerberg removed this pull request from the merge queue due to a manual request Mar 27, 2024
@MarkSuckerberg MarkSuckerberg added this pull request to the merge queue Mar 27, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Mar 27, 2024
@MarkSuckerberg MarkSuckerberg added this pull request to the merge queue Mar 27, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Mar 27, 2024
@Imaginos16
Copy link
Member

Insane

@Imaginos16 Imaginos16 added this pull request to the merge queue Mar 28, 2024
Merged via the queue into shiptest-ss13:master with commit 4ca313c Mar 28, 2024
14 checks passed
@Gristlebee Gristlebee deleted the Surplus-38-Ammo-fix branch March 28, 2024 18:33
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Apr 12, 2024
…r description (shiptest-ss13#2840)

<!-- 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! -->
Fixes shiptest-ss13#2814 and makes 38 surplus ammo able to be printed from the
autolathe. Changes the damage blurb on the 38 speedloader to reflect
standard 38 ammo's new stats.
## Why It's Good For The Game
Bug fixes are good.

<!-- 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. -->

## Changelog

:cl:
fix: 38 Surplus ammo should be printable in the autolathe.
fix: 38 speedloader damage blurb is accurate to it's new stats.
/: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 Apr 15, 2024
…r description (shiptest-ss13#2840)

<!-- 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! -->
Fixes shiptest-ss13#2814 and makes 38 surplus ammo able to be printed from the
autolathe. Changes the damage blurb on the 38 speedloader to reflect
standard 38 ammo's new stats.
## Why It's Good For The Game
Bug fixes are good.

<!-- 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. -->

## Changelog

:cl:
fix: 38 Surplus ammo should be printable in the autolathe.
fix: 38 speedloader damage blurb is accurate to it's new stats.
/: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. -->
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] 38 Surplus isnt in the autolathe
4 participants