Skip to content

ammo expansion + moar guns#463

Merged
NataKilar merged 26 commits intoPersistentSS13:devfrom
genessee-forgot-his-password-again:gun-expansion-part2
Sep 11, 2023
Merged

ammo expansion + moar guns#463
NataKilar merged 26 commits intoPersistentSS13:devfrom
genessee-forgot-his-password-again:gun-expansion-part2

Conversation

@genessee-forgot-his-password-again
Copy link
Contributor

@genessee-forgot-his-password-again genessee-forgot-his-password-again commented Jul 18, 2023

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)
image

.22LR Zip (tier 0)
image

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

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:

@genessee-forgot-his-password-again genessee-forgot-his-password-again marked this pull request as ready for review September 10, 2023 21:32
@genessee-forgot-his-password-again
Copy link
Contributor Author

Success!

Copy link
Collaborator

@NataKilar NataKilar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@NataKilar NataKilar merged commit 6a23866 into PersistentSS13:dev Sep 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants