-
-
Notifications
You must be signed in to change notification settings - Fork 542
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
Atomizes flamethrower and incendiary grenade crates #3494
Merged
FalloutFalcon
merged 5 commits into
shiptest-ss13:master
from
zimon9:flamethrower-crate-atomization
Oct 8, 2024
Merged
Atomizes flamethrower and incendiary grenade crates #3494
FalloutFalcon
merged 5 commits into
shiptest-ss13:master
from
zimon9:flamethrower-crate-atomization
Oct 8, 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
…imon9/Shiptest-PR-testing into flamethrower-crate-atomization
FalloutFalcon
requested changes
Oct 7, 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.
Otherwise perfect!
There we go. It should be cleaner now. Thanks for the suggestions. |
FalloutFalcon
approved these changes
Oct 8, 2024
shiptest-server
pushed a commit
that referenced
this pull request
Oct 8, 2024
zimon9
added a commit
to zimon9/Shiptest-PR-testing
that referenced
this pull request
Oct 29, 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 This change splits the incendiary cargo crate, containing 3 flamethrowers and 3 incendiary grenades for 5000 credits, into two crates: | Flamethrower Crate | Incendiary Grenade Crate | |--------------------|--------------------------| | 1x flamethrower | 1x incendiary grenade | | 1250 credits | 750 credits | If added together, this brings the total cost, if one were to replicate the kit, to 6000 credits. ## Why It's Good For The Game This crate was long overdue for atomization, just like how all of the weapon crates available right now have already been atomized. ## Changelog :cl: add: Added flamethrower crate add: Added incendiary grenade crate del: Removed incendiary supply crate /: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. -->
zimon9
pushed a commit
to zimon9/Shiptest-PR-testing
that referenced
this pull request
Oct 29, 2024
MrCat15352
pushed a commit
to MrCat15352/MrCat
that referenced
this pull request
Dec 27, 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 This change splits the incendiary cargo crate, containing 3 flamethrowers and 3 incendiary grenades for 5000 credits, into two crates: | Flamethrower Crate | Incendiary Grenade Crate | |--------------------|--------------------------| | 1x flamethrower | 1x incendiary grenade | | 1250 credits | 750 credits | If added together, this brings the total cost, if one were to replicate the kit, to 6000 credits. ## Why It's Good For The Game This crate was long overdue for atomization, just like how all of the weapon crates available right now have already been atomized. ## Changelog :cl: add: Added flamethrower crate add: Added incendiary grenade crate del: Removed incendiary supply crate /: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
This change splits the incendiary cargo crate, containing 3 flamethrowers and 3 incendiary grenades for 5000 credits, into two crates:
If added together, this brings the total cost, if one were to replicate the kit, to 6000 credits.
Why It's Good For The Game
This crate was long overdue for atomization, just like how all of the weapon crates available right now have already been atomized.
Changelog
🆑
add: Added flamethrower crate
add: Added incendiary grenade crate
del: Removed incendiary supply crate
/:cl: