-
-
Notifications
You must be signed in to change notification settings - Fork 543
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
Imaginos16
merged 5 commits into
shiptest-ss13:master
from
Gristlebee:Surplus-38-Ammo-fix
Mar 28, 2024
Merged
Fixes 38 Surplus being unprintable in the autolathe and 38 speedloader description #2840
Imaginos16
merged 5 commits into
shiptest-ss13:master
from
Gristlebee:Surplus-38-Ammo-fix
Mar 28, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
west3436
reviewed
Mar 20, 2024
Standardizing the designs, desc reflects new ammo stats
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
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. |
MarkSuckerberg
approved these changes
Mar 27, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
good catch
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
Mar 27, 2024
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
Mar 27, 2024
Insane |
shiptest-server
pushed a commit
that referenced
this pull request
Mar 28, 2024
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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: