Skip to content

Add new tier of guns and bullets, add .357 caliber, plus minor gun tweaks#482

Merged
NataKilar merged 34 commits intoPersistentSS13:devfrom
genessee-forgot-his-password-again:tier3-munitions
Jan 7, 2024
Merged

Add new tier of guns and bullets, add .357 caliber, plus minor gun tweaks#482
NataKilar merged 34 commits intoPersistentSS13:devfrom
genessee-forgot-his-password-again:tier3-munitions

Conversation

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

@genessee-forgot-his-password-again genessee-forgot-his-password-again commented Jan 1, 2024

Description of changes

Adds a whole new tier of firearms - Tier 2, or 'Advanced', acting as the 'spacer' tier which brings some of the more useful firearms to the table.
image
Advanced ammunition is denoted with the color blue, as apposed to Tier 1 ammo using light red and Tier 0 ammo using brown.

.22LR 'Triple-Threat' HG (Pocket Pistol)
image
The second addition to the pocket pistol category, the 'Triple-Threat' is unique in that it possesses a 3-round burst option alongside the standard semi-automatic fire. It's additionally slightly more accurate than the 'Rimfire'.

.22LR 'Junior' SMG (Submachine Gun)
image
The first fully-automatic weapon in the weapon overhaul. The 'Junior', while chambered in the measly .22LR caliber, has both a semi-automatic and fullauto function, making it extremely effective at spewing bullets at a target quickly. It isn't super accurate, though, especially when using fullauto for extended bursts.

.45 'Paco' HG (Pistol)
image
The 'Paco' is much like it's 'Colt' predecessor, but boasts slightly increased accuracy and reduced fire delay between shots.

.357 'Officer' RV (Revolver)
image
The 'Officer' is an accurate, high-power weapon chambered in the new .357 caliber. It is exceptionally deadly, but can only chamber 5 rounds at a time. It additionally suffers from an extended fire delay.

12g 'Gladdy' SG (Pump-action Shotgun)
image
The 'Gladdy' is the best-in-class for pump-action shotguns; shotguns added in the future will be automatic. It can chamber 7 shells and has a reduced fire delay compared to the 'Teufort'.

5.56 'Deadshot' BA (Bolt-Action Rifle)
image
The 'Deadshot' is the first weapon in the overhaul to possess a built-in scope. Additionally, it is considerably more accurate than the 'Mosin', especially when fired while scoped-in. It has a slightly higher ammunition capacity than the 'Mosin', too.

Laser 'Martin' EG (Laser Pistol)
image
The 'Martin' is a massive step up from the 'Settler' laser pistol, boasting double the charge capacity. However, it still fires the relatively weak Alpha-class beams.

Laser 'Frontrunner' EG (Laser Rifle)
image
The 'Frontrunner' fires the deadly Beta-class beams, and offers an 8-shot charge capacity. It is, however, large and must be stored on the back or in hands.

Also does an assortment of relatively minor tweaks across the board for guns;

  • The Marine and Tagger have had their in-hands recolored to differentiate between the two.
  • The 'Chief' revolver is now chambered in the new .357 caliber instead of .45
  • 12 gauge ammo boxes have been recolored to be less ugly and differentiate between buckshot and slugs more clearly.
  • Pocket pistols now work as actual pistols
  • Weapons with magazines will no longer visually lose their magazine once they run out of bullets
  • Fixes ammo boxes not using the empty box sprite when out of bullets

Why and what will this PR improve

This expands the gun overhaul I've been working on to include a fully-automatic weapon, a scoped weapon, and some consistently reliable firearms across the board. It serves as a reliable mid-game point for people investing R&D into weaponry.

Later on, I'd like to add a few more burst-fire weapons to the T2 mix, plus maybe a handful of T1 and T0 weapons if needed.

This stuff has been kinda balanced based off internal testing, but I'm hoping to get a real good look at balancing at the next testing run.

Authorship

CEV Eris for all sprites
genessee for everything else

Changelog

🆑
add: New .357 caliber, used in the 'Chief' and 'Officer' revolvers; very high damage, but expensive and poor armor penetration compared to .45 or 5.56 - also adds proper speedloaders for .357 revolvers (sorry, Underdog!)
add: Tier 2 ('Advanced') guns; 'Officer' revolver, 'Deadshot' bolt-action rifle, 'Gladdy' shotgun, 'Martin' laser pistol, 'Frontrunner' laser rifle, 'Paco' pistol, 'Triple-Threat' pocket pistol, and 'Junior' submachine gun
tweak: Recolored 12 gauge ammo boxes to more clearly differentiate slugs and buckshot
tweak: The 'Chief' is now chambered in .357 instead of .45
tweak: The Marine and Tagger's in-hand wielded sprites and worn sprites have been recolored to differentiate between the two
bugfix: Pocket pistols now function as firearms
bugfix: Weapons with magazines no longer lose them when they run out of bullets
bugfix: Ammo boxes now appear empty when empty
/:cl:

@genessee-forgot-his-password-again genessee-forgot-his-password-again marked this pull request as draft January 1, 2024 02:18
@genessee-forgot-his-password-again genessee-forgot-his-password-again marked this pull request as ready for review January 1, 2024 03:14
@genessee-forgot-his-password-again genessee-forgot-his-password-again marked this pull request as draft January 1, 2024 03:14
@genessee-forgot-his-password-again
Copy link
Contributor Author

Hmm. I feel like these map tests are failing 4noraising

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

Not sure why map tests are failing (something to do with materials.dm and ore generation, which I haven't touched?) and considering this same issue cropped up last time and then magically fixed itself I'm going to go with it being an issue with Kleibkhar and not anything I did

Please LMK if I missed something and it is, indeed, my fault

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

Very good! Ready 4 review

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

okay now it's actually ready for review (forgot to add the designs to protolathe)

research_excluded = TRUE No newline at end of file
research_excluded = TRUE

/obj/item/gun/projectile/update_base_icon() // sets streamlined way for mag-fed guns to check they sprites
Copy link
Collaborator

Choose a reason for hiding this comment

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

Won't this cause issues with subtypes of /obj/item/gun/projectile that don't have these additional icon states, or do all the guns we current have have them?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I was worried about this, but when I tested it all other weapon subtypes (currently that'd be speedloaders, individually loaded, and bolt-action) have their own 'update_base_icon' up the line, so it doesn't appear to be breaking anything that I could tell when I was testing it.

That's also why the second 'pistol' update_base_icon is needed, because otherwise pistols have their own update_base_icon that overrides this one.

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

Looks like it's the same strata issue cropping up again; should still be OK for review for reasons mentioned previously about this issue

@NataKilar NataKilar merged commit aed0b4d into PersistentSS13:dev Jan 7, 2024
@genessee-forgot-his-password-again genessee-forgot-his-password-again deleted the tier3-munitions branch January 7, 2024 03:29
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