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

Berserker Rework! #2588

Merged
merged 3 commits into from
Jul 3, 2023
Merged

Berserker Rework! #2588

merged 3 commits into from
Jul 3, 2023

Conversation

RinPin
Copy link
Contributor

@RinPin RinPin commented Jul 1, 2023

Makes the Berserker martial arts avaliable for player through the weapon choice beacon, as well as changing the legion focused description into something more generic, with some changes to make it more suitable for PVE and keeping in line with the other martial arts

adds the NO_DRUGS trait to it, as well as changing the choke slam move (which was a knock prone stunlock vs players) into a wrist wrench combo, which disarms the active hand of whatever it's being held as well as causing minor brute and stamina damage.

adds the AUTO CATCH trait to make it in line with boar and bass while removing the pierce immunity trait (buggy) as well as the no dismemberment, (currently not in effect outside of explosions plus balance)

About The Pull Request

Pre-Merge Checklist

  • [ X] You tested this on a local server.
  • [X ] This code did not runtime during testing.
  • [ X] You documented all of your changes.

Changelog

Rin pin 🆑
add: Adds a rebalanced berserker martial arts to the weapons pool
/:cl:

RinPin and others added 2 commits July 1, 2023 02:42
Makes the Berserker martial arts avaliable for players, with some changes to make it more suitable for PVE and keeping in line with the other martial arts

adds the NO_DRUGS trait to it, as well as changing the choke slam move (which was a knock prone stunlock vs players) into a wrist wrench combo, which disarms the active hand of whatever it's being held as well as causing minor damaga and stamina damage. as well as the AUTO CATCH trait  to make it in line with boar and bass, removes the pierce immunity trait as well as the no dismemberment.
@Tk420634
Copy link
Contributor

Tk420634 commented Jul 1, 2023

We'll do a test merge with this today or tomorrow, I was busy with DCS all day because ofc I was :x

Also fixed your linter by adding a trailing newline, in case you aren't aware thats a requirement for files to have a blank line at the end of them so linux can compile them properly (and we need that, because linux has more memory awareness than windows, lol)

See ya tomorrow!

@Superlagg Superlagg merged commit 3bd0e3e into ARF-SS13:master Jul 3, 2023
6 of 7 checks passed
@RinPin RinPin deleted the Beserk branch July 25, 2023 18:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants