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

Removes instant stuns from Sleeping Carp #18219

Merged
merged 3 commits into from
Jul 6, 2022

Conversation

Inadvizable
Copy link
Contributor

@Inadvizable Inadvizable commented Jul 5, 2022

What Does This PR Do

Keelhaul combo's stun has been changed to a knockdown, the duration is 2 seconds longer to compensate. When used on a horizontal target, items are knocked out of their hands instead. A redundant check has been simplified, as well.

Grab intent no longer puts the target in aggressive (blue) grab instantly.

Part of the project by @hal9000PR.

Why It's Good For The Game

Keelhaul is quite devastating in the hands of even a moderately robust user when other weapons do not cause instant stuns. It can be used to stun the opponent and remove their weapon reliably. This is possible even after the user is knocked down themselves, as carp is a martial art, and thus the user remains armed. A knockdown brings it up to par with the rest of the combat system, as counterplay is still possible after being hit with the combo. Keelhaul was from the get-go meant to knock the target down, however this possibility did not exist at the time. Now that the possibility exists, and we are removing instant stuns, it is time to change it.

Instant aggressive grabs are very clunky, and are effectively an instant stun, just press Z. This has to go, too.

Changelog

🆑
tweak: Sleeping Carp's Keelhaul combo knocks down, rather than stunning the opponent. Already knocked down enemies simply drop their weapons. The duration is 2 seconds longer.
tweak: Sleeping Carp no longer gives you the ability to perform instant aggressive grabs.
/:cl:

@AffectedArc07 AffectedArc07 added Balance This PR will modify how effective something is or isnt Project Progression labels Jul 5, 2022
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting approval This PR is waiting for approval internally -Status: Awaiting review This PR is awaiting review from the review team and removed -Status: Awaiting approval This PR is waiting for approval internally labels Jul 5, 2022
@KittyNoodle
Copy link
Contributor

Make it deal some stam damage, feels weird that it doesn’t

@Inadvizable
Copy link
Contributor Author

Make it deal some stam damage, feels weird that it doesn’t

It does.

Copy link
Member

@hal9000PR hal9000PR left a comment

Choose a reason for hiding this comment

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

Would you remove the instant aggressive grab? it is super clunky to use and it is basically a one click instant stun.

code/modules/martial_arts/combos/sleeping_carp/keelhaul.dm Outdated Show resolved Hide resolved
Inadvizable and others added 2 commits July 6, 2022 20:18
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
@Inadvizable Inadvizable changed the title Changes Sleeping Carp's Keelhaul combo from stun to knockdown Removes instant stuns from Sleeping Carp Jul 6, 2022
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting merge This PR is ready for merge and removed -Status: Awaiting review This PR is awaiting review from the review team labels Jul 6, 2022
@hal9000PR hal9000PR merged commit 24248d0 into ParadiseSS13:master Jul 6, 2022
github-actions bot added a commit that referenced this pull request Jul 6, 2022
@Inadvizable Inadvizable deleted the remove-this-fishy-stun branch July 7, 2022 14:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
-Status: Awaiting merge This PR is ready for merge Balance This PR will modify how effective something is or isnt
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants