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 rework #1601

Merged
merged 31 commits into from
Oct 29, 2023
Merged

Gun rework #1601

merged 31 commits into from
Oct 29, 2023

Conversation

rye-rice
Copy link
Member

@rye-rice rye-rice commented Nov 7, 2022

About The Pull Request

WIP.

if it wasn't obvious, very based off tgmc

this reworks how guns work, by making them 4x more lethal without touching a single damage value

its a bit difficult to put into words what this does, so i think these 3 gunfights i did with a good friend explains it better than i ever could

https://streamable.com/09in19
https://streamable.com/yel56o
https://streamable.com/x2a0he

if you didnt watch these videos:

  • New guns sounds, TGMC as usual. but some racking sounds are from CEV eris
  • guns now can be wielded, if unwielded, they may cause recoil which not only makes your shots less accurate, but 'scrolls' your screen
  • new suppression effects
  • getting hit hard enough scrolls your screen
  • anything getting hit shakes you as feedback, not just bullets
  • bullets can ricochet naturally upon hitting a surface at a step angle. does not auto aim at your target, so be careful. ricochet sfx taken from CEV eris
  • new effects for bullet impacts. sound effects were taken from TGMC and The Impact Soundening Skyrat-SS13/Skyrat-tg#11697
  • adds the cattleman revolver and Himehabu 22lr pistol. sprites by yours truely

big problem is, in order for all of this to work, a certain key needs to be binded to rack the gun. by default this is SPACE, but moost already have it binded to 'hold throw mode', which is an issue. for one, not only you need to ask everyone to rebind their controls to a very important key, but also a key dedicated to just racking the gun can cause issues. im up for any solutions

  • I affirm that I have tested all of my proposed changes and that any issues found during tested have been addressed.

Why It's Good For The Game

people dont fear gunfights. they think its just a way to pvp. people should be afraid of gunfights, feel the pain OOCly when their blorbo gets hit

Changelog

🆑
add: 22lr and cattleman revolver
add: many gun sounds
balance: guns reworked
/:cl:

@github-actions github-actions bot added Code change Watch something violently break. Sound USSR Anthem 2.66 MB file. labels Nov 7, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Dec 3, 2022

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

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Dec 3, 2022
@rye-rice
Copy link
Member Author

rye-rice commented Jan 6, 2023

you know i forgot i even made this pr wtf

@rye-rice rye-rice closed this Jan 6, 2023
@rye-rice
Copy link
Member Author

rye-rice commented Jan 6, 2023

ill finish this some other day but now is not that day

@rye-rice rye-rice reopened this Sep 25, 2023
@github-actions github-actions bot added the Sprites A bikeshed full of soulless bikes. label Sep 25, 2023
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Sep 25, 2023
@rye-rice
Copy link
Member Author

told you

@shiptest-ss13 shiptest-ss13 deleted a comment from Addust Sep 29, 2023
@shiptest-ss13 shiptest-ss13 deleted a comment from Addust Sep 29, 2023
@Imaginos16
Copy link
Member

Do not harass our contributors. User was temporarily blocked for needless inflammatory remarks.

@BarteG44
Copy link
Contributor

The github drama is real

@rye-rice
Copy link
Member Author

TMed this for a couple of rounds, very happy how it came out and changes the dyanmic of gunfights

@rye-rice rye-rice marked this pull request as ready for review October 11, 2023 07:19
@rye-rice rye-rice requested a review from a team as a code owner October 11, 2023 07:19
@rye-rice
Copy link
Member Author

Should be ready to review, no clue why test is failing

@Addust
Copy link

Addust commented Oct 11, 2023

in a more polite phrasing of my previous statements,

Please do consider placing wield on a seperate key to ensure playerbase sanity. Of course, masochists will retain the option to wield with the use inhand key willingly, but allowing the players to choose between wielding with Z and wielding with literally any other key without losing Z as a use inhand key will greatly improve the gameplay experience with this PR.

@thgvr
Copy link
Member

thgvr commented Oct 11, 2023

It will be done but not in this pr

@Addust
Copy link

Addust commented Oct 11, 2023

It will be done but not in this pr

ok

Copy link
Member

@MarkSuckerberg MarkSuckerberg left a comment

Choose a reason for hiding this comment

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

seems fine

Copy link
Member

@thgvr thgvr left a comment

Choose a reason for hiding this comment

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

yeah. send it

@thgvr thgvr added this pull request to the merge queue Oct 29, 2023
Merged via the queue into shiptest-ss13:master with commit bf4671f Oct 29, 2023
10 checks passed
@MarkSuckerberg
Copy link
Member

let's fucking go

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. Sound USSR Anthem 2.66 MB file. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants