Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Reworks, resprites, or in a few cases deletes, shotgun shells including but not limited to skyrat shotgun shells #1225

Merged
merged 1 commit into from
Dec 27, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Original PR: Skyrat-SS13/Skyrat-tg#25352

About The Pull Request

Its funny how many shotgun shells we have that you either can't use or that simply outperform the others in every task ever.

So, lets get straight to it and talk changes:

As a guideline, any lethal shell should be aiming for about 50 damage total, where non-lethal shells should be aiming for about 60 stamina damage.

Buckshot, magnum, and express, all do the same total damage (48), with their differences being number of pellets and damage per pellet.

Rubbershot damage was reduced by one (1) per pellet.

Flechettes are back and no longer penetrate armor, think of them like .35 sol's ripper rounds but for a shotgun.

Hunter shells are back, except not as buckshot and simply a slug that should do 80 damage to any mob typed as "MOB_BEAST"

Beehive and antitide are now like the magnum and express shot for less-lethals. Beehives (now hornet's nests) still bounce off walls toward targets, and antitide (now stardust) still embeds and causes pain damage on movement.

Importantly, there are no armor piercing shotgun ammos anymore. Every projectile either is weak to armor or simply lacks armor penetration.

How This Contributes To The Skyrat Roleplay Experience

As I said before, we have a lot of shotgun shell variety but can't use a lot of it because shells will randomly be either insane or have no reason to be used over the other shells. This also results in witless mappers putting what is accidentally the strongest shotgun shell ever on a map without thinking of it.

Ideally now, every shell has a purpose, people can have preferences based on what they want rather than what the meta shell is. Looking at you magnum buckshot.

Proof of Testing

Screenshots/Videos

These files are too big for github ok just trust me on this one

https://cdn.discordapp.com/attachments/640744619302453316/1179855783308046356/shotguns_hell_first_half.mp4?ex=657b4d53&is=6568d853&hm=1e32641af5b19e3684fa567b34bec3107d171bf706b65fe1170c4e2986c6d00d&

https://cdn.discordapp.com/attachments/640744619302453316/1179855805592371230/shotguns_hell_second_half.mp4?ex=657b4d58&is=6568d858&hm=c82a692c035270eec2daffb919f42354a94d5603f6823e3f720f1efe4844579c&

image
image

Changelog

🆑 Paxilmaniac
balance: Shotgun shells, ESPECIALLY skyrat's shotgun shells, have been rebalanced to not either be useless or insane in every situation, see pr for details.
image: New sprites for some projectiles, like flechettes and whatnot
/:cl:

…ng but not limited to skyrat shotgun shells (#25352)

* oh yeah baby

* fixes the cargo company too

* fixes stuff that was missing

* oops thats invisible

* Update modular_skyrat/modules/shotgunrebalance/code/ammobox.dm

Co-authored-by: Bloop <[email protected]>

* Update modular_skyrat/modules/shotgunrebalance/code/ammobox.dm

Co-authored-by: Bloop <[email protected]>

* Update modular_skyrat/modules/shotgunrebalance/code/ammobox.dm

Co-authored-by: Bloop <[email protected]>

* Update modular_skyrat/modules/shotgunrebalance/code/ammobox.dm

Co-authored-by: Bloop <[email protected]>

* Update modular_skyrat/modules/shotgunrebalance/code/ammobox.dm

Co-authored-by: Bloop <[email protected]>

* Update modular_skyrat/modules/shotgunrebalance/code/ammobox.dm

Co-authored-by: Bloop <[email protected]>

* Update modular_skyrat/modules/shotgunrebalance/code/ammobox.dm

Co-authored-by: Bloop <[email protected]>

* Update modular_skyrat/modules/shotgunrebalance/code/ammobox.dm

Co-authored-by: Bloop <[email protected]>

* Update modular_skyrat/modules/shotgunrebalance/code/ammobox.dm

Co-authored-by: Bloop <[email protected]>

* Update modular_skyrat/modules/shotgunrebalance/code/ammobox.dm

Co-authored-by: Bloop <[email protected]>

* Update modular_skyrat/modules/shotgunrebalance/code/ammobox.dm

Co-authored-by: Bloop <[email protected]>

* Update modular_skyrat/modules/shotgunrebalance/code/ammobox.dm

Co-authored-by: Bloop <[email protected]>

---------

Co-authored-by: Bloop <[email protected]>
@Iajret Iajret merged commit 0ae0626 into master Dec 27, 2023
23 checks passed
@Iajret Iajret deleted the upstream-mirror-25352 branch December 27, 2023 20:46
AnywayFarus added a commit that referenced this pull request Dec 27, 2023
Iajret pushed a commit that referenced this pull request Mar 1, 2024
* New Shields and Sprites for them (#81615)

## About The Pull Request
Updates shield sprites to new more polished and 3/4 perspective ones.

<details>

![shielding
show](https://github.com/tgstation/tgstation/assets/42353186/823d1d24-6fdd-40c9-84b4-2b9b61d70813)

</details>

Adds 2 new shield types:
- **Improvised Shield.** Made out of 10 iron sheets and 2 sticky tape
pieces. Weaker then buckler shield and breaks after 2 gunshots or 4
baton hits, but has a 50% (BASE FOR ALL OTHER SHIELDS) blocking chance
instead of 30% that buckler has. Bulky
- **Ballistic Shield.** Printed at Security Techfab for a lot of
titanium after getting weapon research. Strong against projectiles, but
weaker than riot shield against melee. Bulky

Both of these shields break, and both of them are their own subtype. As
such you can still only craft strobe shield with a riot shield.
## Why It's Good For The Game

The sprites of shields were very ancient and extremely flat, this gives
them a more refreshed look.

Ballistic Shield is added because Riot Shield was weakened against
projectiles, Ballistic Shield gives the crew a way to get access to
protection against projectiles at some point in the round.
Improvised Shield adds a second improvised shield in the game (after
Buckler Shield). It's balanced by being weaker than Buckler, but higher
block chance, this adds an interesting choice for players on which
shield to craft.
## Changelog
:cl:
add: Adds 2 new shields to the game! Ballistic Shield - researched by
Science, and Improvised Shield - made out of iron and sticky tape
image: Riot, Strobe, Telescopic, Energy shields got new less flat
sprites!
/:cl:

* New Shields and Sprites for them

* Update screenshot_antag_icons_loneinfiltrator.png

---------

Co-authored-by: DrTuxedo <[email protected]>
Co-authored-by: Mal <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants