From 95e93b1f5e9490d8a5d40f98d8f74a51ea2d6113 Mon Sep 17 00:00:00 2001 From: Iajret Creature <122297233+Steals-The-PRs@users.noreply.github.com> Date: Thu, 7 Dec 2023 14:24:26 +0300 Subject: [PATCH] [MIRROR] Fix cult halo and eyes affecting deconverted cultists [MDB IGNORE] (#1013) * Fix cult halo and eyes affecting deconverted cultists (#80148) --------- Co-authored-by: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Co-authored-by: Tim --- code/datums/elements/cult_eyes.dm | 4 ++++ code/datums/elements/cult_halo.dm | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/code/datums/elements/cult_eyes.dm b/code/datums/elements/cult_eyes.dm index 388d902c735..3a46aa42c95 100644 --- a/code/datums/elements/cult_eyes.dm +++ b/code/datums/elements/cult_eyes.dm @@ -22,6 +22,10 @@ /datum/element/cult_eyes/proc/set_eyes(mob/living/target) SIGNAL_HANDLER + if(!IS_CULTIST(target)) + target.RemoveElement(/datum/element/cult_eyes) + return + ADD_TRAIT(target, TRAIT_UNNATURAL_RED_GLOWY_EYES, CULT_TRAIT) if (ishuman(target)) var/mob/living/carbon/human/human_parent = target diff --git a/code/datums/elements/cult_halo.dm b/code/datums/elements/cult_halo.dm index f20e5765561..d6da6d8145a 100644 --- a/code/datums/elements/cult_halo.dm +++ b/code/datums/elements/cult_halo.dm @@ -22,6 +22,10 @@ /datum/element/cult_halo/proc/set_halo(mob/living/target) SIGNAL_HANDLER + if(!IS_CULTIST(target)) + target.RemoveElement(/datum/element/cult_halo) + return + ADD_TRAIT(target, TRAIT_CULT_HALO, CULT_TRAIT) var/mutable_appearance/new_halo_overlay = mutable_appearance('icons/effects/cult/halo.dmi', "halo[rand(1, 6)]", -HALO_LAYER) if (ishuman(target))