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

Rework the Flare Gun & add a Security Shell Gun. #32829

Open
wants to merge 8 commits into
base: master
Choose a base branch
from

Conversation

BramvanZijp
Copy link
Contributor

@BramvanZijp BramvanZijp commented Oct 15, 2024

About the PR

Several changes were made in this PR:

  1. Rework flare guns, they now work sort of like a pistol except without the magazine. They start closed with a shell loaded in them, then you can fire it. The empty shell does not eject. Then you press E on it to unbolt and open it, which drops the current shell on the ground and allow you to put a new shell inside, then you can close it again to fire again.
  2. Add a security shell gun, which is a resprited flare gun restricted to security, and is craftable in the sec techfab. This is designed to launch beanbag or tranq rounds, though it can also make use of lethal shells in a pinch.
  3. Flare guns are now twice as likely to spawn in emergency lockers.

Why / Balance

A sprite for an opened flare gun has existed in the code, but it is never used. It also just makes sense to have to open it for the old shell to fall out and you to be able to put the new shell back in, this also prevents spam reloading and firing it with the extra added step.

As for the security shell gun, it is craftable in the secfab and designed to be used with beanbag and tranquilizer shells. From my experience these shells, especially tranquilizer, very rarely see use due to the hastle of carrying around the entire shotgun just to use these non-lethal shells and the fact that it would be frowned upon outside alert levels that warrant lethals, at which point you are better off taking lethal shells instead. This would allow security to carry one of these around on lower alert levels and still use the shells.

Technical details

The flare gun now uses the code used by pistols (excluding a magazine) instead of that used by shotguns. Also, improvised, beanbag, tranquilizer and flare rounds now have the ShotgunShellLight, if somebody intends to re-introduce #22349 properly, this can be used for that. (The Security Shell Gun should still be able to fire lethals.)

Media

A video of the regular flare gun with the new bolt mechanics:
https://github.com/user-attachments/assets/00f46007-03b7-4c97-b6ab-a08704112558

The new security shell gun sprites: (Just recolored to be red)
base bolt-open

Requirements

Changelog

🆑 BramvanZijp

  • tweak: Flare guns have been reworked to no longer automatically eject shells after firing, and must now be opened manually to insert or eject shells.
  • tweak: Flare guns are twice as likely to appear in emergency closets.
  • add: Added the security shell gun to the security techfab, a modified flare gun designed to let security fire nonlethal .50 shells, though it can also fire lethal shells in a pinch.

@github-actions github-actions bot added No C# For things that don't need code. Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. labels Oct 15, 2024
Copy link
Contributor

github-actions bot commented Oct 15, 2024

RSI Diff Bot; head commit b1e9217 merging into d871313
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun_security.rsi

State Old New Status
base Added
bolt-open Added
equipped-BELT Added
equipped-SUITSTORAGE Added
inhand-left Added
inhand-right Added

Edit: diff updated after b1e9217

@BramvanZijp
Copy link
Contributor Author

For the record, later on it may be good to have a system where the plastic flaregun can backfire if using lethal shells, but for now it should probably be disabled which is done in this PR.

@superjj18
Copy link
Contributor

superjj18 commented Oct 15, 2024

Pretty sure irl flare guns are 12 guage so yes they can totally fire lethal rounds.

I'd rather the lethal rounds work while also breaking the flare gun(and maybe causing some minor burn damage to the shooter). If you're going for realism that's probably better than arbitrarily limiting the type of round for no reason. If they want a quick burst of damage, they get one shot and a broken flaregun

Whitelists are lame and aren't communicated to the player

(Also I feel the manual reloading makes it more annoying to use, but at the same time I get why so that's easier to accept)

@BramvanZijp
Copy link
Contributor Author

BramvanZijp commented Oct 15, 2024

Pretty sure irl flare guns are 12 guage so yes they can totally fire lethal rounds.

I'd rather the lethal rounds work while also blowing up the flare gun, as if you're going for realism that's probably better than arbitrarily limiting the type of round for no reason.

Whitelists are lame and aren't communicated to the player

Ill find a way to have them blow up instead, should it just be the clown/monkey blow-up or an actual explosion?

Also, this is literally added to the item description but fair ig

@KaiserMaus
Copy link

What about makeshift shotgun shell? Flare can fire this munitions?

@BramvanZijp
Copy link
Contributor Author

What about makeshift shotgun shell? Flare can fire this munitions?

That should probably be defined as a light shell yea

@superjj18
Copy link
Contributor

superjj18 commented Oct 15, 2024

Pretty sure irl flare guns are 12 guage so yes they can totally fire lethal rounds.

I'd rather the lethal rounds work while also blowing up the flare gun, as if you're going for realism that's probably better than arbitrarily limiting the type of round for no reason.

Whitelists are lame and aren't communicated to the player

Ill find a way to have them blow up instead, should it just be the clown/monkey blow-up or an actual explosion?

Also, this is literally added to the item description but fair ig

I think it would slightly burn their hand. Wouldn't severely wound them or even knock them over, but the flare gun definitely wouldn't be able to fire again.(the handle and the barrel would likely break apart)

You could probably just separate the handle and barrel into two sprites, have the flaregun turn into a handle and spawn the barrel item on the ground. Something like that

@BramvanZijp
Copy link
Contributor Author

Its going to be a pain to properly sort the flaregun blowing up with lethal shells in this PR, and it also feels a bit too far out of its scope. So It has been removed, if somebody else wants to re-add #22349 properly, please do so (And please make sure the sec shell gun is not effected.)

@BramvanZijp
Copy link
Contributor Author

BramvanZijp commented Oct 16, 2024

(To clarify, this means that for now, flare guns can still fire lethal shells, which I originally removed in this PR.)

name: security shell gun
parent: [BaseItem, BaseSecurityContraband]
id: WeaponFlareGunSecurity
description: A modified flare gun designed to be used by security to launch non-lethal shotgun shells such as beanbags or tranquilizers. Can still fire lethal shells if neccesary.
Copy link
Contributor

Choose a reason for hiding this comment

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

If it's suppose to be a non-lethal device, I'm not sure if it firing lethal shells is a good idea. What purpose is this meant to serve?

All new weapons need approval by either sloth or DrSmugleaf (#8524)

Copy link
Contributor

Choose a reason for hiding this comment

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

Well... it's realistic as many irl flare guns are 12 gauge, and it's kind of a cool cheap improvised weapon.

Copy link
Contributor Author

@BramvanZijp BramvanZijp Oct 26, 2024

Choose a reason for hiding this comment

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

Quoted from #design-discussion.

Regular passengers will only have access to the regular flare gun (made out of plastic). You can fire shells in it just fine, but if you try to fire any shell other than a flare shell, the flaregun explodes and turns into a broken one, and we can maybe roll a 50% for the gun blowing up in their hand (clumsy system) or it “””working””” and shooting the shot, but one time.

Security will get a metal flaregun that just works with all shells. This is how they work in real life.


Furthermore, the purpose of being able to fire lethal shells is both realism and for in an emergency self defense situation. I would assume giving out lethal sec shell guns is still considered a lethal weapon and thus code red only.
As for the weapon approval, a maintainer said it should be fine unless somebody complains, so let me know if I need to still get review keeping in mind this is just a reskin of an already existing weapon while that weapon is being changed to no longer be lethal.

{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/3f9ebb72931ff884427c3004a594ec61aaaa7041/icons/obj/guns/projectile/flaregun.dmi and edited",
Copy link
Contributor

Choose a reason for hiding this comment

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

Eris textures are usually not compatible with ours, this will need art director approval

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is the exact texture used by the current ingame flaregun, just with the orange pixels changed out for red ones, let me know if that is still a problem.

@chromiumboy chromiumboy added the Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged. label Oct 26, 2024
@chromiumboy chromiumboy self-assigned this Oct 26, 2024
@github-actions github-actions bot added Status: Needs Review This PR requires new reviews before it can be merged. and removed Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged. labels Oct 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. No C# For things that don't need code. Status: Needs Review This PR requires new reviews before it can be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants