[MIRROR] Fix cult halo and eyes affecting deconverted cultists [MDB I…

…GNORE] (#1013) * Fix cult halo and eyes affecting deconverted cultists (#80148) --------- Co-authored-by: SkyratBot <[email protected]> Co-authored-by: Tim <[email protected]>
Fluffy-Frontier · Dec 7, 2023 · 95e93b1 · 95e93b1
1 parent b7b32fc
commit 95e93b1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git 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
@@ -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))