From 5ac1cc817d8c4773290c80db75fec64d5b32aee3 Mon Sep 17 00:00:00 2001 From: ppi13 Date: Mon, 20 Nov 2023 20:10:04 +0100 Subject: [PATCH] Fixes a runtime in mind traits and makes IS_HOLY work versus vampires (#23200) * Fixes mind trait runtime * DGamerL suggested changes Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Contrabang suggested changes * Contra suggestions and improvements --------- Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --- code/__HELPERS/trait_helpers.dm | 2 +- .../antagonists/vampire/vampire_powers/vampire_powers.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/__HELPERS/trait_helpers.dm b/code/__HELPERS/trait_helpers.dm index f465d8e65e5..b6705008791 100644 --- a/code/__HELPERS/trait_helpers.dm +++ b/code/__HELPERS/trait_helpers.dm @@ -127,7 +127,7 @@ : FALSE) #define HAS_TRAIT_NOT_FROM(target, trait, source) (target.status_traits ? (target.status_traits[trait] ? (length(target.status_traits[trait] - source) > 0) : FALSE) : FALSE) /// A simple helper for checking traits in a mob's mind -#define HAS_MIND_TRAIT(target, trait) (HAS_TRAIT(target, trait) || (target.mind ? HAS_TRAIT(target.mind, trait) : FALSE)) +#define HAS_MIND_TRAIT(target, trait) (istype(target, /datum/mind) ? HAS_TRAIT(target, trait) : (target.mind ? HAS_TRAIT(target.mind, trait) : FALSE)) /// Gives a unique trait source for any given datum #define UNIQUE_TRAIT_SOURCE(target) "unique_source_[UID(target)]" diff --git a/code/modules/antagonists/vampire/vampire_powers/vampire_powers.dm b/code/modules/antagonists/vampire/vampire_powers/vampire_powers.dm index 56b4a980940..e0bd78307b9 100644 --- a/code/modules/antagonists/vampire/vampire_powers/vampire_powers.dm +++ b/code/modules/antagonists/vampire/vampire_powers/vampire_powers.dm @@ -8,7 +8,7 @@ if(V?.get_ability(/datum/vampire_passive/full)) return TRUE //Holy characters are resistant to vampire powers - if(HAS_MIND_TRAIT(user, TRAIT_HOLY)) + if(HAS_MIND_TRAIT(src, TRAIT_HOLY)) return FALSE return TRUE