Bullet Stack Fixes + Other #3568
Merged
+37
−28
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
Comment on lines
+19
to
+28
| STR.set_holdable(list( | ||
| /obj/item/storage/box/ammo, | ||
| /obj/item/mine, | ||
| /obj/item/grenade, | ||
| /obj/item/ammo_casing/caseless/rocket, | ||
| /obj/item/ammo_box/magazine/ammo_stack, | ||
| /obj/item/ammo_casing, | ||
| /obj/item/mine, | ||
| /obj/item/grenade | ||
| )) |
There was a problem hiding this comment.
I would go ahead and make this a var because sub types always end up needed edge cases for this.
Closed
|
needs another TM? |
Should be ready? Question mark? |
thgvr
reviewed
Oct 18, 2024
| @@ -490,7 +492,7 @@ | |||
| /obj/item/storage/box/ammo/a44roum_hp | |||
| name = "box of HP .44 roumain ammo" | |||
| desc = "A box of .44 roumain rubbershot ammo, designed to disable targets without causing serious damage." | |||
| icon_state = "a44roum-rubber" | |||
| icon_state = "a44roum-hp" | |||
There was a problem hiding this comment.
that doesn't seem right. is there no sprite for -rubber here?
There was a problem hiding this comment.
This isn't rubber. This is hollow point.
zimon9
pushed a commit
to zimon9/Shiptest-PR-testing
that referenced
this pull request
Oct 29, 2024
## About The Pull Request - Fixes .299 Eoehoma being 5 per stack instead of 15 - Fixes 5.56x42 CLIP being 5 per stack instead of 15 - Rebalanced the tinyass .22lr bullet stacks to be 25 instead of 15, for 100 rounds per box - Changed the ammo can to be bulky and lets it hold 4 ammo boxes, fixes pre-spawned ammo cans to actually fit ammo boxes - Ammo cans can only hold ammo and explosives - Fixed a few icons and descriptions for ammo boxes - Fixed 12g beanbag to actually have beanbag inside / along with 12g rubbershot - Increased the speed of reloading until we get loading benches - .22 is out of the black market since its in cargo ## Why It's Good For The Game Fixes a bunch of stuff leftover from Bulletstacks. Rebalanced a few ammostacks to actually be usable with their guns. You will no longer have to stand in place for 3 minutes to reload a single Pounder panmag. Bug fixes good. ## Changelog :cl: balance: .22lr is now 25 per handful instead of 12 balance: Reloading speed from stacks doubled balance: Increase ammo can to bulky and lets it hold 4 normal-sized ammoboxes, can only hold ammo and explosives. balance: Adjusted price of .299 Eoehoma slightly, adds a second box to the cargo order since its 60 instead of 120 fix: Fixes a bunch of bullet stacks to have correct numbers fix: Larger handfuls (.22lr) fix: Mapped in ammo cans now hold their boxes fix: 12g beanbag now has beanbag instead of rubber + beanbag fix: Ammo box icons and descriptions del: Removed .22lr from the blackmarket. Its in cargo already. /:cl:
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
Why It's Good For The Game
Fixes a bunch of stuff leftover from Bulletstacks. Rebalanced a few ammostacks to actually be usable with their guns. You will no longer have to stand in place for 3 minutes to reload a single Pounder panmag. Bug fixes good.
Changelog
🆑
balance: .22lr is now 25 per handful instead of 12
balance: Reloading speed from stacks doubled
balance: Increase ammo can to bulky and lets it hold 4 normal-sized ammoboxes, can only hold ammo and explosives.
balance: Adjusted price of .299 Eoehoma slightly, adds a second box to the cargo order since its 60 instead of 120
fix: Fixes a bunch of bullet stacks to have correct numbers
fix: Larger handfuls (.22lr)
fix: Mapped in ammo cans now hold their boxes
fix: 12g beanbag now has beanbag instead of rubber + beanbag
fix: Ammo box icons and descriptions
del: Removed .22lr from the blackmarket. Its in cargo already.
/:cl: