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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Makes it so that you can pull with a krav maga ability enabled #627

Merged
merged 2 commits into from
Nov 12, 2020

Conversation

ColonyBot
Copy link
Collaborator

Original PR: yogstation13/Yogstation#10390

Intent of your Pull Request

grab_act had no functioning with krav maga other than just using the prepared ability, so now you will have to either be on harm or disarm intent.

Why is this good for the game?

Fixes #9937
It lets you grab while having a krav maga ability prepared.

Changelog

馃啈
tweak: lets you grab with a krav maga ability prepared
/:cl:

@TheGamerdk TheGamerdk merged commit 0037a15 into master Nov 12, 2020
@TheGamerdk TheGamerdk deleted the upstream-merge-10390 branch November 12, 2020 14:30
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.

None yet

2 participants