From 13d044cff70fea455329309de1f059906d0d6c70 Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 12 May 2022 09:46:55 -0500 Subject: [PATCH] Fix wizard modsuit not having antimagic protection (#66890) * Fix wizard modsuit not having antimagic protection * Change TRAIT_ANTIMAGIC_NO_SELFBLOCK comment --- code/__DEFINES/traits.dm | 2 +- code/modules/mod/modules/modules_antag.dm | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index f17e9f40ac1..15b74027c34 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -218,7 +218,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_NOBREATH "no_breath" #define TRAIT_ANTIMAGIC "anti_magic" #define TRAIT_HOLY "holy" -/// Like antimagic, but doesn't block the user from casting +/// This allows a person who has antimagic to cast spells without getting blocked #define TRAIT_ANTIMAGIC_NO_SELFBLOCK "anti_magic_no_selfblock" #define TRAIT_DEPRESSION "depression" #define TRAIT_JOLLY "jolly" diff --git a/code/modules/mod/modules/modules_antag.dm b/code/modules/mod/modules/modules_antag.dm index 5867d8fd991..6ee8deb0ad9 100644 --- a/code/modules/mod/modules/modules_antag.dm +++ b/code/modules/mod/modules/modules_antag.dm @@ -173,9 +173,11 @@ icon_state = "magic_neutralizer" /obj/item/mod/module/anti_magic/wizard/on_suit_activation() + ADD_TRAIT(mod.wearer, TRAIT_ANTIMAGIC, MOD_TRAIT) ADD_TRAIT(mod.wearer, TRAIT_ANTIMAGIC_NO_SELFBLOCK, MOD_TRAIT) /obj/item/mod/module/anti_magic/wizard/on_suit_deactivation(deleting = FALSE) + REMOVE_TRAIT(mod.wearer, TRAIT_ANTIMAGIC, MOD_TRAIT) REMOVE_TRAIT(mod.wearer, TRAIT_ANTIMAGIC_NO_SELFBLOCK, MOD_TRAIT) ///Insignia - Gives you a skin specific stripe.