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

Atomizes flamethrower and incendiary grenade crates #3494

Merged

Conversation

zimon9
Copy link
Contributor

@zimon9 zimon9 commented Oct 7, 2024

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

🆑
add: Added flamethrower crate
add: Added incendiary grenade crate
del: Removed incendiary supply crate
/:cl:

@github-actions github-actions bot added the Code change Watch something violently break. label Oct 7, 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.

Otherwise perfect!

code/modules/cargo/packs/sec_supply.dm Outdated Show resolved Hide resolved
code/modules/cargo/packs/sec_supply.dm Outdated Show resolved Hide resolved
code/modules/cargo/packs/sec_supply.dm Outdated Show resolved Hide resolved
@zimon9
Copy link
Contributor Author

zimon9 commented Oct 8, 2024

There we go. It should be cleaner now. Thanks for the suggestions.

@FalloutFalcon FalloutFalcon added this pull request to the merge queue Oct 8, 2024
Merged via the queue into shiptest-ss13:master with commit aa5d8ee Oct 8, 2024
14 checks passed
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
Labels
Code change Watch something violently break.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants