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

Gun Safeties #2443

Merged
merged 7 commits into from
Nov 10, 2023
Merged

Gun Safeties #2443

merged 7 commits into from
Nov 10, 2023

Conversation

rye-rice
Copy link
Member

@rye-rice rye-rice commented Oct 31, 2023

About The Pull Request

Request from a friend

Adds gun safeties as I have seen people accidentally discharge their weapons one too many times

Adjusts tactical reload to 1 second rather than 1.2 seconds

Screenshot_7922

Screenshot_7923

overlay only appears in inventory
Screenshot_7924

Why It's Good For The Game

Gun safety RP
Accidentally shooting someone happens far too many times to be just a 'skill issue'

Changelog

🆑
add: Adds gun safetys
balance: Tacitcal reload time adjusted from 1.2 seconds to 1 second
/:cl:

@rye-rice rye-rice requested a review from a team as a code owner October 31, 2023 21:04
@github-actions github-actions bot added Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels Oct 31, 2023
@Zevotech
Copy link
Contributor

Could you make the click not audible/visible to nearby players? I know it might be like, a balance issue but I don't want my crewmate to know I nearly accidentally shot them while trying to examine them. Its awkward both IC and OOC.

@rye-rice
Copy link
Member Author

Oh that's fair, ill go edit that then

Though that removes opportunities to scream at the miner for bad gun safety

@thgvr
Copy link
Member

thgvr commented Oct 31, 2023

Dunno, I think the sound being audible is good

@rye-rice
Copy link
Member Author

im pretty sure they're refering to the click when a gun fails to fire, not the toggle saftey click

@thgvr
Copy link
Member

thgvr commented Oct 31, 2023

That's kinda funny tbh

@Zevotech
Copy link
Contributor

Its a tossup between it being IC'ly reactible and it being an OOC mistake someone makes. Most of the time when someone gets shot accidentally both players acknowledge it was a misclick or positioning mistake and shrug it off IC without much fanfare to it. I just. dont like the awkwardness of someone hearing the click as i'm looking at them and having to see the internal calculation of "did he just try to shoot me or was it a mistake and should i acknowledge it IC"

@tmtmtl30
Copy link
Contributor

I believe the safety typically blocks the trigger from moving, so it shouldn't make a click round when you attempt to fire with the safety on.

@thgvr
Copy link
Member

thgvr commented Oct 31, 2023

I'm no gun nut but I'm fairly certain it varies

@thgvr
Copy link
Member

thgvr commented Oct 31, 2023

Also, incredible, it fails the projectile unit test because the gun can't fire from having a safety on. Could be worth editing the unit test to disable the safety before firing?

@rye-rice
Copy link
Member Author

LMAO, i think i can fix it, maybe

@Sun-Soaked
Copy link
Member

That's kinda funny tbh

From a mechanical standpoint, you should ALWAYS get auditory feedback on your gun failing to fire. If it just happens in the forest without making a sound, it feels like a misinput and can get clunky quickly, especially if it's in a combat sitch

@thgvr thgvr changed the title Gun Safetys Gun Safeties Nov 1, 2023
@thgvr
Copy link
Member

thgvr commented Nov 7, 2023

Good to go?

@rye-rice
Copy link
Member Author

rye-rice commented Nov 8, 2023

Yes it is ready more or less

@thgvr
Copy link
Member

thgvr commented Nov 8, 2023

Will review and merge tomorrow

code/modules/projectiles/gun.dm Outdated Show resolved Hide resolved
code/modules/projectiles/gun.dm Outdated Show resolved Hide resolved
code/modules/projectiles/gun.dm Outdated Show resolved Hide resolved
code/modules/projectiles/gun.dm Outdated Show resolved Hide resolved
rye-rice and others added 4 commits November 8, 2023 19:00
Co-authored-by: Mark Suckerberg <[email protected]>
Signed-off-by: retlaw34 <[email protected]>
Co-authored-by: Mark Suckerberg <[email protected]>
Signed-off-by: retlaw34 <[email protected]>
Co-authored-by: Mark Suckerberg <[email protected]>
Signed-off-by: retlaw34 <[email protected]>
Co-authored-by: Mark Suckerberg <[email protected]>
Signed-off-by: retlaw34 <[email protected]>
@thgvr
Copy link
Member

thgvr commented Nov 10, 2023

I didn't review it but Mark did

@thgvr thgvr added this pull request to the merge queue Nov 10, 2023
Merged via the queue into shiptest-ss13:master with commit b49ca39 Nov 10, 2023
10 checks passed
MysticalFaceLesS added a commit to CeladonSS13/Shiptest that referenced this pull request Nov 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants