Bullet stacks #3456
Merged
Bullet stacks #3456
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
|
it's peam |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
Map Change
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
This reverts commit 8922a42.
github-actions
bot
removed
the
Map Change
github-actions
bot
added
the
Map Change
|
You can get invisible 0 bullet stacks. Just activate 1 bullet bullet stacks in your hand. |
my cranial implant explodes |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
This is now ready |
Comment on lines
5
to
10
| desc = "A 7-round speed loader for quickly reloading .357 revolvers. These rounds do good damage with average performance against armor." | ||
| icon_state = "speedloader_357-6" | ||
| base_icon_state = "speedloader_357" | ||
| ammo_type = /obj/item/ammo_casing/a357 | ||
| caliber = ".357" | ||
| max_ammo = 7 |
There was a problem hiding this comment.
Suggested change
| desc = "A 7-round speed loader for quickly reloading .357 revolvers. These rounds do good damage with average performance against armor." | |
| icon_state = "speedloader_357-6" | |
| base_icon_state = "speedloader_357" | |
| ammo_type = /obj/item/ammo_casing/a357 | |
| caliber = ".357" | |
| max_ammo = 7 | |
| desc = "A 6-round speed loader for quickly reloading .357 revolvers. These rounds do good damage with average performance against armor." | |
| icon_state = "speedloader_357-6" | |
| base_icon_state = "speedloader_357" | |
| ammo_type = /obj/item/ammo_casing/a357 | |
| caliber = ".357" | |
| max_ammo = 6 |
shiptest-server
pushed a commit
that referenced
this pull request
Oct 12, 2024
zimon9
pushed 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 Partial port of Mojave-Sun/mojave-sun-13#2076 and surrounding PRs Adds bullet handfuls. You can only have the same type of ammunition in a handful. No mismatched stacks Spent casings are not stackable. Generally, the rule is: * By default, stacks can contain 12 rounds. * Pistol-equivalent stacks contain 15 rounds. * Shotshell stacks contain 8 rounds. * Rifle stacks contain 15 rounds. * Large calibre stacks contain 5 rounds. Also replaces old ammo boxes with storage boxes that come pre-filled with stacks of bullets like this:  Here's how the stacks look:   ## Changelog :cl: add: Added bullet stacks, they allow you to stack ammo of the same type into a group. balance: Changed old ammo boxes into storage items containing stacks of bullets /: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: thgvr <[email protected]>
zimon9
pushed a commit
to zimon9/Shiptest-PR-testing
that referenced
this pull request
Oct 29, 2024
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
Partial port of Mojave-Sun/mojave-sun-13#2076 and surrounding PRs
Adds bullet handfuls. You can only have the same type of ammunition in a handful. No mismatched stacks
Spent casings are not stackable.
Generally, the rule is:
Also replaces old ammo boxes with storage boxes that come pre-filled with stacks of bullets like this:
Here's how the stacks look:
Changelog
🆑
add: Added bullet stacks, they allow you to stack ammo of the same type into a group.
balance: Changed old ammo boxes into storage items containing stacks of bullets
/:cl: