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

Ports Anti-magic from TG. #27560

Merged
merged 15 commits into from
Jan 2, 2025
Merged

Conversation

Qwertytoforty
Copy link
Contributor

@Qwertytoforty Qwertytoforty commented Dec 5, 2024

TODO:

  • Wait for the plush pr to get in which handles magic hands.
  • Add / sprite nullrod for chaplain that is a talisman that grants full antimagic, but has no force.
  • mention in the spellbook the wizard hardsuit is antimagic / allow antimagic casting

What Does This PR Do

Adds antimagic.
This wonderful trait allows a user to be resistant to mind magic, unholy magic, or magic:tm: magic.
For example, nullrods will make a person immune to cult or vampire spells, but a fireball to a face will still hurt.
The immortality talisman miners and wizards get provides antimagic and allows casting with antimagic.
The beserker armor provides antimagic, but does not allow casting of magic.
The ERT gamma inquisitor armor provides antimagic but does not allow the casting of magic.
The wizard hardsuit provides antimagic and allows casting with antimagic.
Some spells can be cast with antimagic, things like bless, or the bynat.
adds COMSIG_ATOM_HOLY_ATTACK, needed for heretic

Why It's Good For The Game

Needed for heretic.
Makes handling of cult / vampires better.
Allows for wizards to get a potential weakness, though it doesnt protect the user from getting guns summoned on their ass, or just a normal gun a wizard uses.
As for heretic, allows one to potentially equip ERT (as an admin) or security (as a player with chaplain or minings help) to better deal with them.

Testing

cast so many spells. Note, some will have been missed, or may not be antimagic flagged properly. I went through each one, but there are a lot of spells in the code.
Cult handed and magic handed people with antimagic
Shot them with magic projectiles
Tried to cast spells with antimagic


Declaration

  • I confirm that I either do not require pre-approval for this PR, or I have obtained such approval and have included a screenshot to demonstrate this below.

image

Changelog

🆑
add: Adds antimagic. Nullrods better protect from cult and vampire spells / abilities, but not fireballs or wizard magic.
add: Adds full antimagic to the wizard hardsuit, gamma inquisitor ERT armor, immortality talisman, berserker armor. Some of these will disrupt your magic casting.

/:cl:

@Qwertytoforty Qwertytoforty marked this pull request as draft December 5, 2024 23:58
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally Sprites This PR modifies the game sprites Sound This PR modifies the game sound labels Dec 6, 2024
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting review This PR is awaiting review from the review team -Status: Awaiting approval This PR is waiting for approval internally and removed -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally -Status: Awaiting review This PR is awaiting review from the review team labels Dec 6, 2024
@spacegeese
Copy link
Contributor

heretic?

@TravisAngeI
Copy link

heretic?

upcoming project for a heretic port

@SynthTwo
Copy link
Contributor

SynthTwo commented Dec 7, 2024

!wiki_label

@github-actions github-actions bot added Requires Wiki Update Useful for Wiki Contributers to search for things that need updating Merge Conflict This PR is merge conflicted labels Dec 7, 2024
@ParadiseSS13-Bot ParadiseSS13-Bot added -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 Dec 21, 2024
@github-actions github-actions bot added Merge Conflict This PR is merge conflicted and removed Merge Conflict This PR is merge conflicted labels Dec 21, 2024
@github-actions github-actions bot removed the Merge Conflict This PR is merge conflicted label Dec 23, 2024
@Qwertytoforty Qwertytoforty marked this pull request as ready for review December 30, 2024 15:17
@Qwertytoforty Qwertytoforty changed the title Ports Anti-magic from TG. [DNM] Ports Anti-magic from TG. [DNM till 27736] Dec 30, 2024
@DGamerL DGamerL added the Feature This PR is a new addition to the game label Dec 30, 2024
@DGamerL DGamerL added the Balance This PR will modify how effective something is or isnt label Dec 30, 2024
@github-actions github-actions bot added the Merge Conflict This PR is merge conflicted label Dec 30, 2024
@github-actions github-actions bot removed the Merge Conflict This PR is merge conflicted label Dec 30, 2024
@Qwertytoforty Qwertytoforty changed the title Ports Anti-magic from TG. [DNM till 27736] Ports Anti-magic from TG. Dec 31, 2024
code/__HELPERS/trait_helpers.dm Outdated Show resolved Hide resolved
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
@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 Jan 1, 2025
code/datums/status_effects/buffs.dm Outdated Show resolved Hide resolved
code/game/gamemodes/wizard/magic_tarot.dm Outdated Show resolved Hide resolved
Burzah added 2 commits January 2, 2025 01:30
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
@Burzah Burzah enabled auto-merge January 2, 2025 08:34
@Burzah Burzah added this pull request to the merge queue Jan 2, 2025
Merged via the queue into ParadiseSS13:master with commit 7bbebbb Jan 2, 2025
17 checks passed
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 Feature This PR is a new addition to the game Requires Wiki Update Useful for Wiki Contributers to search for things that need updating Sound This PR modifies the game sound Sprites This PR modifies the game sprites
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants