[MIRROR] Kicks Martial Arts out of the attack chain (yippee), makes it use signals, plus a large clean up of existing martial arts #1799
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…t use signals, plus a large clean up of existing martial arts (#734) * Kicks Martial Arts out of the attack chain (yippee), makes it use signals, plus a large clean up of existing martial arts * Fix conflicts --------- Co-authored-by: MrMelbert <[email protected]> Co-authored-by: Mal <[email protected]>
Steals-The-PRs
added
Mirroring conflict
…into upstream-mirror-734
…into upstream-mirror-734
AnywayFarus
added a commit
that referenced
this pull request
Feb 7, 2024
Iajret
pushed a commit
that referenced
this pull request
Apr 4, 2024
#1799) * Clowns can no longer kill themselves with holographic eswords (#82402) ## About The Pull Request Currently clowns (or any clumsy mob) can kill themselves with holographic eswords by opening and closing them repeatedly. The damage done is normal brute damage instead of stamina. This PR fixes that, and adds some extra options to the `/datum/component/transforming` component to adjust the amount of damage dealt to clumsy users. It also makes the damage type inherited from the parent of the component. ## Why It's Good For The Game Fixes #82398 Doesn't make sense for a supposedly harmless holographic esword to be able to hurt someone, even if they're clumsy. Also allows for more control over the transforming component. ## Changelog :cl: fix: Holographic energy swords have undergone some more rigorous safety inspections, and should no longer be a danger to clumsy crew members. /:cl: * Clowns can no longer kill themselves with holographic eswords --------- Co-authored-by: Nick <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Mirrored on Nova: NovaSector/NovaSector#734
Original PR: tgstation/tgstation#81097
About The Pull Request
Kicks Martial Arts out of the attack chain.
All martial arts block checking is now handled by the arts themselves, meaning you can selectively decide for a martial arts strike to not be blocked. Maybe good for the future.
A comprehensive cleanup of all existing martial arts. Improving var names, code, adding some missing animation calls, etc.
Fixes #74829
Why It's Good For The Game
Untangles the mess that is martial arts, making it a lot easier to work with the attack chain and making it overall a ton more consistent.
Changelog
🆑 Melbert
refactor: Big martial arts refactor, they should now overall act a ton more consistent. Also technically any mob can do martial arts. Let me know if something is funky.
/:cl: