This repository was archived by the owner on May 22, 2025. It is now read-only.
Finishes off remaining anti_magic_check and uses the proper version #20583
Conversation
This file contains hidden or 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
JohnFulpWillard
commented
Oct 9, 2023
| ADD_TRAIT(src, TRAIT_RECENTLY_BLOCKED_MAGIC, MAGIC_TRAIT) | ||
| addtimer(TRAIT_CALLBACK_REMOVE(src, TRAIT_RECENTLY_BLOCKED_MAGIC, MAGIC_TRAIT), 6 SECONDS) | ||
|
|
||
| /* //comment this in if you want antimagic to have a visible effect. |
Contributor
Author
There was a problem hiding this comment.
This was part of the port but it wasn't a feature before so I didn't add it.
I can do it now if it's wanted, it essentially puts a glow around the character when they block magic (and plays a sound) for good feedback that the person is magic immune.
Moltijoe
approved these changes
Oct 15, 2023
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
Document the changes in your pull request
Antimagic checks are currently split between the old barely functional strung together shitcode of
anti_magic_check, and the better version that currently doesn't work as good because the component doesn't take it into account ofcan_block_magic. This updates all instances of anti_magic_check to its proper can_block_magic use, and updates the component to only take that one into account now.I also reverted the stealth nerf of Bibles against Revenants/Devils/Conversion, and added messages to the tinfoil hat letting you know when it gets used (since it has limited use).
This will be made even better with #20569 which adds bitflag support for the component, but that's not the point of the PR.
Ports
tgstation/tgstation#76616 (Mostly)
tgstation/tgstation#64124
Why is this good for the game?
Testing
just trust me bro
Spriting
Wiki Documentation
Changelog
🆑
bugfix: Bibles now protect against unholy stuff again.
bugfix: Antimagic protection now works properly and more consistently.
/:cl: