Fixes some cargo gun descriptions and lowers 38 ammo price. #2777
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
github-actions
bot
added
Code change
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
conflict's fixed! |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Co-authored-by: Mark Suckerberg <[email protected]> Signed-off-by: Martinpachu <[email protected]>
Co-authored-by: Theos <[email protected]> Signed-off-by: Martinpachu <[email protected]>
|
fixed this finally |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
fixed...again.. fuck!! |
This reverts commit 84f71c3.
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Closed
MysticalFaceLesS
pushed a commit
to CeladonSS13/Shiptest
that referenced
this pull request
May 25, 2024
…-ss13#2777) <!-- 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 As the name says. ## Why It's Good For The Game 38 Special is supposed to be the cheapest ammo, doing the same damage as 9mm rounds and has guns either with low ammo capacity, or that need to be pumped after every shot. Also i fucked some things up in my last PR. sorry. sorry. im so stupid. dont hit me with the tail. ## Changelog :cl: balance: .38 ammo boxes are cheaper. spellcheck: Fixed some cargo gun descriptions. fix: Fixed an issue regarding multiple stechkin pistols in a singular cargo pack. :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. --> --------- Signed-off-by: Martinpachu <[email protected]> Co-authored-by: Mark Suckerberg <[email protected]> Co-authored-by: Theos <[email protected]>
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
As the name says.
Why It's Good For The Game
38 Special is supposed to be the cheapest ammo, doing the same damage as 9mm rounds and has guns either with low ammo capacity, or that need to be pumped after every shot. Also i fucked some things up in my last PR. sorry. sorry. im so stupid. dont hit me with the tail.
Changelog
🆑
balance: .38 ammo boxes are cheaper.
spellcheck: Fixed some cargo gun descriptions.
fix: Fixed an issue regarding multiple stechkin pistols in a singular cargo pack.
🆑