Skip to content

Commit

Permalink
[MIRROR] Fix cult halo and eyes affecting deconverted cultists [MDB I…
Browse files Browse the repository at this point in the history
…GNORE] (#25477)

* Fix cult halo and eyes affecting deconverted cultists (#80148)

## About The Pull Request

Fixes #69423

Cult halo and eyes were appearing on deconverted cultists due to a delay
when the element gets attatched. This lead to a small window of
oppurtunity where someone could get converted, then deconverted, and
still have the cult icons appear on them later.

## Why It's Good For The Game

The Antichrist is dead.

## Changelog

:cl:
fix: Fix cult halo and eyes affecting deconverted cultists
/:cl:

* Fix cult halo and eyes affecting deconverted cultists

---------

Co-authored-by: Tim <[email protected]>
  • Loading branch information
2 people authored and FFMirrorBot committed Dec 7, 2023
1 parent a7b5732 commit db9791f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
4 changes: 4 additions & 0 deletions code/datums/elements/cult_eyes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions code/datums/elements/cult_halo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit db9791f

Please sign in to comment.