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

Tonfa milicyjna #267

Merged
merged 15 commits into from
Mar 8, 2024
Merged

Tonfa milicyjna #267

merged 15 commits into from
Mar 8, 2024

Conversation

UnibelUnibel
Copy link

@UnibelUnibel UnibelUnibel commented Feb 29, 2024

About The Pull Request

Port z: BeeStation/BeeStation-Hornet#10112
Dodaje tonfę milicyjną.
Główne wytłumaczenie różnic pomiędzy tonfą a zwykłą pałką:

The baton inherits most regular baton traits however the following is different:

(oryg.)
"It displays attack animation on stamina attacks.
It has less brute damage than the other batons (12). Having now the same brute (8) and throw damage (7) as the stun baton but, like the billy club, applies stam damage on harm as well (same as brute, 8)
Deals more stamina damage (25) than the Deputy Baton (20) but considerably less than the Detective Baton (55)
It has no cooldown as opposed to the Deputy Baton (10) and Detective Baton (20).
Targeting different limbs has different outcomes:
Targeting the torso is the fastest way to stam crit.
Targeting the head will knock the target unconscious if his stamina damage is above 89.
Targeting the hands will disarm the person after 3 hits.
Targeting the legs makes the target trip."

Why It's Good For The Game

#264

"It's meant to FEEL like combat without actually hurting the individual and meant to give a better conclusion to an arrest than a 2 tap stun baton if the suspect decides to fight.
It also would be difficult to type bait someone into stamcrit with this weapon."

Testing Photographs and Procedure

Screenshots&Videos

tonfa6

tonfa5

tonfa4

tonfa3

tonfa2

tonfa1

Changelog

🆑 Reprimann (sprite)
add: Dodano milicyjną tonfę
add: Dodano milicyjną tonfę do SecVendora
tweak: Security zamiast zwykłej pałki dostaje na początku rundy milicyjną tonfę
/:cl:

@greatwizardman
Copy link

więcej non-lethal sposobów na poskromienie borowika :-)
https://www.youtube.com/watch?v=stMe2w_gDrU

Copy link

github-actions bot commented Mar 1, 2024

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

@UnibelUnibel
Copy link
Author

Gotowe do merge

@Joker66613 Joker66613 merged commit 505a897 into aq33:master Mar 8, 2024
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants