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

Russian revolver #19978

Closed
wants to merge 17 commits into from
Closed

Conversation

MACMAN2003
Copy link
Contributor

@MACMAN2003 MACMAN2003 commented Sep 10, 2023

About the PR

Adds in a joke revolver "gun" that is incapable of being used in combat, but is instead used to play Russian Roulette. It can only be used by the player holding it, and is only capable of harming the player holding it.

Why / Balance

It'd make for some hilarious additions to the spess guy funny moments compilations. As for balance, I'm pretty sure it'd just add a few more patients to medbay each round.

Technical details

I don't know if I can explain the technical details because I barely understand them myself lol.

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase
revolvershowcase.mp4

Breaking changes

Content.Shared.Weapons.Ranged.Systems.SharedGunSystem.Revolver.Cycle() was changed from private to public, and a new method "RouletteifyRevolver" was added into it.

Changelog

🆑 MACMAN2003, forthbridge, Ubaser

  • add: Added a revolver to the Barkeep's booze locker that can be used to play Russian Roulette.

@github-actions github-actions bot added the Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. label Sep 10, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Sep 10, 2023

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

Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi

State Old New Status
inhand-left Modified
inhand-right Modified

Resources/Textures/Objects/Fun/russianrevolver.rsi

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

Edit: diff updated after 9380995

@lzk228
Copy link
Contributor

lzk228 commented Sep 10, 2023

#8524 :trollface:

@misandrie
Copy link
Contributor

#8524 :trollface:

Not a real gun per se, and it has unique functionality.

@Errant-4
Copy link
Contributor

It's kind of weird conceptually to introduce a gun that looks like a gun, but arbitrarily can only be used on yourself

@deltanedas
Copy link
Contributor

it should be possible to use any gun on yourself, in the ideal world

@misandrie
Copy link
Contributor

it should be possible to use any gun on yourself, in the ideal world

/suicide with gun in hand if gun has a bullet in chamber

@BRINGit34
Copy link

Maybe it should be like one of those cartoon guns where the barrel is pointing the wrong way. Just to make it more clear

@BolloTea
Copy link

Finally some normal bar entertainment 🤡

@BolloTea
Copy link

All that remains is to make a reverse pistol for the antagonist clown

@Partmedia
Copy link
Contributor

It would be better if this were not a separate weapon, but rather a change that allowed the normal revolver to target yourself. I also don't like the culturally insensitive use of "Russian revolver" and "Russianize", because this sounds like an insult to a whole cultural group.

@BolloTea
Copy link

BolloTea commented Sep 10, 2023

It would be better if this were not a separate weapon, but rather a change that allowed the normal revolver to target yourself. I also don't like the culturally insensitive use of "Russian revolver" and "Russianize", because this sounds like an insult to a whole cultural group.

Excuse me, but do you have any ideas on what to call a revolver for playing "Russian Roulette"? Besides, there is nothing offensive in this.
In addition, on the paradise build (as well as on many others) it is called “Russian revolver”.

@MACMAN2003
Copy link
Contributor Author

MACMAN2003 commented Sep 10, 2023

It would be better if this were not a separate weapon, but rather a change that allowed the normal revolver to target yourself. I also don't like the culturally insensitive use of "Russian revolver" and "Russianize", because this sounds like an insult to a whole cultural group.

Do you have any suggestions for alternative names for the gun and/or the "Russianize" method?

@LankLTE
Copy link
Contributor

LankLTE commented Sep 10, 2023

Don't really see how the name of the gun is culturally insensitive (any more than Russian Roulette itself would be, which to my knowledge isn't much). That said I do agree that having this as its' own revolver seems kind of weird, especially when the revolver looks like a normal gun instead of a cartoony one with the barrel turned around (which would at least warrant looking funny).

@LankLTE
Copy link
Contributor

LankLTE commented Sep 10, 2023

I forgot that this was for the bar- that'd obviously make it difficult to implement as a normal revolver without giving the barkeep their own revolver, which would cause other issues. It's still preferred that this isn't its' own gun, so some other solution would be appreciated if you could find one.
Also, the method name should be changed. Something like MakeRoulette could work better

@BolloTea
Copy link

The cartoon version with the barrel upside down is not appropriate. Yes, it wouldn't be bad if every weapon could have a suicide function. But a separate revolver for playing roulette is the best solution not to be a full-fledged weapon. This is just a way to test your nerves of steel with friends, after a friendly drinking session in a bar, or as an emergency way to exit the game.

@Partmedia
Copy link
Contributor

Maybe you could investigate adding a component field to the GunComponent that would allow the shooter to shoot themselves, setting this to false by default.

@forgotmyotheraccount
Copy link
Contributor

it should be possible to use any gun on yourself, in the ideal world

/suicide with gun in hand if gun has a bullet in chamber

This is the clear answer. Introducing a new weapon called the "russian revolver" that can only be used on yourself seems silly, no matter what angle you look at it from.

Ideally someone who inputs /suicide while also holding a firearm should have the trigger pulled, and if it's got a lethal round in the chamber it should discharge and kill. If not, it fails. There should be other contextual /suicide methods, like slitting your throat with blades. As it stands /suicide is just a ragequit when it could be a legitimate RP option.

@Hmeister-fake
Copy link
Contributor

My one tidbit is the ammo, cause if it comes with real 45. ammo then a fella with an actual revolver can use it but for real. Maybe make it kill you the same way with any ammo type and fill it with practice rounds?

@AJCM-git
Copy link
Contributor

AJCM-git commented Sep 10, 2023

I think adding the functionality to "shuffle" the chamber/ammo of any gun with a verb, and then allowing clicking on yourself (with a do_after of course), /suicide, or both to kill yo/crit you if there is a bullet in the chamber would make a decent implementation for russian roullete.

@forgotmyotheraccount
Copy link
Contributor

My one tidbit is the ammo, cause if it comes with real 45. ammo then a fella with an actual revolver can use it but for real. Maybe make it kill you the same way with any ammo type and fill it with practice rounds?

Even blanks can kill you IRL. Practice rounds could put you into crit rather than killing.

@BolloTea
Copy link

it should be possible to use any gun on yourself, in the ideal world

/suicide with gun in hand if gun has a bullet in chamber

This is the clear answer. Introducing a new weapon called the "russian revolver" that can only be used on yourself seems silly, no matter what angle you look at it from.

I bet that if you indicate in the description that this revolver is intended exclusively for playing roulette, then many questions and misunderstandings will go away by themselves. But regarding suicide, you can do things differently. Give a short delay to the rest of the weapon before shooting yourself, so that you can cancel the action if it is accidental or just collect your thoughts. And the roulette revolver itself has the possibility of instant suicide, because you have already consciously taken a step towards this game.

@BolloTea
Copy link

BolloTea commented Sep 10, 2023

Simply, the essence of this pr is not only to add suicide, but also to add an inferior weapon to the bartender, aimed at the entertainment of the station crew)
I want to note that it is LEGAL, and in order for players to remember it better, it is worth adding a separate texture for this!
I'm done, sorry.

@UbaserB
Copy link
Contributor

UbaserB commented Sep 10, 2023

Hello, i’m the one who designed the idea of this concept based on ss13’s russian revolvers. As it stands, it is not meant to be a form of suicide as despite the fact it can kill you because /suicide currently works far too well for that. The reason why there is this specific revolver is primarily because from my experience playing russian roulette is way too funny and if it doesn’t right out kill you there isn’t that comedy factor in play. I don’t mind changing changing a few things to specify that its meant to be for the roulette game, and i don’t believe the bullet is an issue either since the only other revolvers in the game are the detective’s, syndicate’s python and the deckard (if i remember correctly). About another point, i understand that “accidentally killing yourself” is an issue as its an instakill; and i was thinking that requiring harm mode to be active could be a solution for that. We just didnt know how to go about coding it and thought it wasnt exactly necessary so we left it out.

@UbaserB
Copy link
Contributor

UbaserB commented Sep 10, 2023

Simply, the essence of this pr is not only to add suicide, but also to add an inferior weapon to the bartender, aimed at the entertainment of the station crew)
I want to note that it is LEGAL, and in order for players to remember it better, it is worth adding a separate texture for this!
I'm done, sorry.

i copied the inspector sprites, did a rehue and changed some minor details since i thought it would fit better into the game’s style. Should i resprite it entirely then?

@UbaserB
Copy link
Contributor

UbaserB commented Sep 10, 2023

I forgot that this was for the bar- that'd obviously make it difficult to implement as a normal revolver without giving the barkeep their own revolver, which would cause other issues. It's still preferred that this isn't its' own gun, so some other solution would be appreciated if you could find one.
Also, the method name should be changed. Something like MakeRoulette could work better

Just clearing it up, its not technically a gun. Its a joke item, similar to soap or space glue. It simply looks like a revolver and (partially) acts like one.

@asperger-sind
Copy link
Contributor

Just clearing it up, its not technically a gun. Its a joke item, similar to soap or space glue. It simply looks like a revolver and (partially) acts like one.

Soap and glue both have legitimate gameplay appliances, this PR adds an item that has exclusively one purely esoteric feature.

@BolloTea
Copy link

The curved trunk is certainly comical, but it would be more suitable for a clown and not a bartender. So, a curved trunk is a big stupidity that should not be added. I think many will agree with this

@BolloTea
Copy link

About another point, i understand that “accidentally killing yourself” is an issue as its an instakill; and i was thinking that requiring harm mode to be active could be a solution for that. We just didnt know how to go about coding it and thought it wasnt exactly necessary so we left it out.

Sorry, translation difficulties. I meant the delay for other weapons, and not specifically for the Russian revolver. Sorry if I misled you. Nevertheless, your pr is what many have been waiting for, especially old like me. So, thank you very much for your work.
Удачи🤠

@BolloTea
Copy link

My 2c on the matter (devi asked for takes on the pr in the discord)

The sprite should be a normal revolver with a curved barrel facing towards the user, the name should also be changed to "Russian Roulette Revolver" rather than just staying as "Russian Revolver" because that (along with the current sprites) can be interpreted as a "normal" Russian revolver, also change the method name to "make roulette" as Lank suggested.

Ideally all guns would be able to shoot the user but that's probably out of scope, even if that gets coded the barkeep still could have a Russian roulette revolver because its the big silly

Overall good PR, I don't see a reason to not have this in-game.

And to avoid confusion, you need to make a correct description, and not change the name

@UbaserB
Copy link
Contributor

UbaserB commented Sep 11, 2023

My 2c on the matter (devi asked for takes on the pr in the discord)
The sprite should be a normal revolver with a curved barrel facing towards the user, the name should also be changed to "Russian Roulette Revolver" rather than just staying as "Russian Revolver" because that (along with the current sprites) can be interpreted as a "normal" Russian revolver, also change the method name to "make roulette" as Lank suggested.
Ideally all guns would be able to shoot the user but that's probably out of scope, even if that gets coded the barkeep still could have a Russian roulette revolver because its the big silly
Overall good PR, I don't see a reason to not have this in-game.

And to avoid confusion, you need to make a correct description, and not change the name

we also did this

@github-actions github-actions bot added the Merge Conflict This PR currently has conflicts that need to be addressed. label Sep 11, 2023
@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@VektorZ1
Copy link

Would be many times cooler to add the ability to point any revolver at yourself for a game of Russian roulette.

@Emisse
Copy link
Contributor

Emisse commented Sep 11, 2023

you should just be able to shoot yourself with a gun

@deltanedas
Copy link
Contributor

actions are bloat and would be annoying, imo it should be when you click yourself with a gun it makes a popup saying you place the barrel in your mouth and close your eyes, then when its up inflict 2x or whatever damage because its going right into your brain

@MACMAN2003
Copy link
Contributor Author

i love waking up to a merge conflict
how do i fix that

@UbaserB
Copy link
Contributor

UbaserB commented Sep 11, 2023

you should just be able to shoot yourself with a gun

An issue with letting this happen means that the average person wouldnt be able to play russian revolver. You’re not allowed to carry a gun on your person unless you are security or the bartender, and this is simply meant to be a friendly game of russian roulette. However, i suppose it wouldn’t be hard to add an additional feature of using /suicide command while holding a gun to kill yourself with certainty.

@github-actions github-actions bot removed the Merge Conflict This PR currently has conflicts that need to be addressed. label Sep 11, 2023
@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 Sep 11, 2023
@Partmedia Partmedia added the Needs Discussion Anyone can contribute to this issue and add their two cents. label Sep 15, 2023
@UbaserB
Copy link
Contributor

UbaserB commented Sep 25, 2023

This should just be an action to shoot a gun at yourself as we already have spins. If you really want add a separate action that runs the suicide command rather than just shooting yourself.

After trying to figure out how to implement this, we came to the realisation that not only should this change be done in a separate PR, but it is way out of scope for what we are trying to implement. Currently as it stands though, there is no issue with the current code and functions normally ingame.

Copy link
Contributor

@metalgearsloth metalgearsloth left a comment

Choose a reason for hiding this comment

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

From discord:
no new guns
shouldn't "roulettify"
shouldn't be its own component
should just use an action
it also shouldn't be a 98.5% chance of spawning inside the booze locker

@metalgearsloth metalgearsloth added Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged. and removed Status: Needs Review This PR requires new reviews before it can be merged. labels Sep 25, 2023
@MACMAN2003
Copy link
Contributor Author

it's not a real gun, it's a toy.
as for switching it to an action, i have no idea how to implement that.

@Partmedia
Copy link
Contributor

I'm going to go ahead and close this, because to address the reviewer comments this would require a bit of a rework. Please feel free to open a new PR for this once it is ready.

@Partmedia Partmedia closed this Oct 6, 2023
@UbaserB UbaserB mentioned this pull request Jan 16, 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. Needs Discussion Anyone can contribute to this issue and add their two cents. Status: Awaiting Changes This PR needs its reviews addressed or changes to be made in order to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet