ammo expansion + moar guns#463
Merged
NataKilar merged 26 commits intoPersistentSS13:devfrom Sep 11, 2023
Merged
Conversation
Contributor
Author
|
Success! |
NataKilar
approved these changes
Sep 11, 2023
Collaborator
NataKilar
left a comment
There was a problem hiding this comment.
Willing to give this a shot. In the future I'd like to balance projectile weapons with more complicated material costs (brass and gunpowder), but these changes seem to be a good start.
This file contains hidden or 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
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.
Description of changes
This PR adds the .22LR, .45, and 5.56x45mm bullet calibers. Additionally, it adds two new .22LR guns - the Rimfire and Zip. Each caliber comes in two tiers, 'makeshift' and 'standard'.
All guns which used 10mm (or 'pistol' caliber) now use .45. This includes the Colt, Colt-M, Chief, and Underdog.
All guns which used 5.56 (or 'rifle' caliber) now use 5.56x45mm. This includes the Minuteman and Mosin.
All guns which used .50 (or 'shotgun' caliber) now use 12g. This includes the Slider, Bouncer, and Teufort.
Various minor tweaks to some guns have been made across the board.
Legacy ammunition types have been disallowed from printing due to them being useless now that they don't fit in any printable gun.
.22LR Rimfire (tier 1)

.22LR Zip (tier 0)

12g Bouncer [Sawn-off variant] (tier 1)

Why and what will this PR improve
The new ammunition systems encourage more time being put into research - low-quality ammunition is cheap and easy to research, but isn't very effective. Better tiers of ammo cost more research and supplies to acquire, but are more effective. The same goes for magazines, which are researched in the same way.
Having our own ammunition system allows us to easier tweak it than trying to work around the Nebula-based ammunition system.
Magazines are now universal based on their caliber rather than being build specifically for one gun. This makes researching a .45 magazine far more useful if you plan on using .45 weapons, without locking the player into one gun just because that's the only gun they've researched the specific magazine for.
Authorship
sprites by cev eris
code by genessee
Changelog
🆑
add: A new .22LR caliber and associated magazines and bullets (handmade and simple tier) for use in pocket pistols
add: The .22LR 'Rimfire' pocket pistol - it's small enough to be stored in your pocket!
add: The .22LR 'Zip' pistol - it's the only weapon in the 'handmade' tier to be able to use magazines; not a small weapon like other .22LR guns, though
add: A new .45 caliber and associated magazines and bullets (handmade and simple tier) for use in pistols and weak revolvers
add: A sawn-off variant of the 12g Bouncer shotgun - sawn-off is smaller and can be held on the belt, but is more inaccurate
add: A new 12g caliber and associated bullets (handmade and simple tier, slug and buckshot variants for each tier) for use in shotguns
tweak: The Colt, Colt-M, Chief, and Underdog are now chambered in .45 instead of 10mm.
tweak: Made Chief more accurate, made Colt less accurate
add: A new 5.56x45mm caliber and associated magazines and bullets (handmade and simple tier) for use in bolt-action and automatic rifles
tweak: The Minuteman and Mosin are now chambered in 5.56x45mm instead of 5.56.
/:cl: