From f43b731bd30bea6b59c769069174fee2d2c23604 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 1 Feb 2022 14:28:41 +0100 Subject: [PATCH] [MIRROR] Fixes the span of cult deconversion text, and removes a duplicate definition [MDB IGNORE] (#11201) * Fixes the span of cult deconversion text, and removes a duplicate definition (#64552) Fixes the span of cult de-conversion text. span_warning was completely overtaking the purple that normally comes with de-conversion text, which was very easy to confuse. Removes the span_warning. Removes the duplicate definition of /datum/antagonist/cult/on_removal(), since i'm here. * Fixes the span of cult deconversion text, and removes a duplicate definition Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> --- code/modules/antagonists/cult/cult.dm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm index 1da7ffef1dd..f303e545c27 100644 --- a/code/modules/antagonists/cult/cult.dm +++ b/code/modules/antagonists/cult/cult.dm @@ -72,6 +72,12 @@ /datum/antagonist/cult/on_removal() REMOVE_TRAIT(owner.current, TRAIT_HEALS_FROM_CULT_PYLONS, CULT_TRAIT) + if(!silent) + owner.current.visible_message(span_deconversion_message("[owner.current] looks like [owner.current.p_theyve()] just reverted to [owner.current.p_their()] old faith!"), ignored_mobs = owner.current) + to_chat(owner.current, span_userdanger("An unfamiliar white light flashes through your mind, cleansing the taint of the Geometer and all your memories as her servant.")) + owner.current.log_message("has renounced the cult of Nar'Sie!", LOG_ATTACK, color="#960000") + if(cult_team.blood_target && cult_team.blood_target_image && owner.current.client) + owner.current.client.images -= cult_team.blood_target_image return ..() @@ -166,15 +172,6 @@ to_chat(owner.current, span_warning("You feel something interfering with your mental conditioning, but you resist it!")) return -/datum/antagonist/cult/on_removal() - if(!silent) - owner.current.visible_message(span_deconversion_message(span_warning("[owner.current] looks like [owner.current.p_theyve()] just reverted to [owner.current.p_their()] old faith!")), null, null, null, owner.current) - to_chat(owner.current, span_userdanger("An unfamiliar white light flashes through your mind, cleansing the taint of the Geometer and all your memories as her servant.")) - owner.current.log_message("has renounced the cult of Nar'Sie!", LOG_ATTACK, color="#960000") - if(cult_team.blood_target && cult_team.blood_target_image && owner.current.client) - owner.current.client.images -= cult_team.blood_target_image - . = ..() - /datum/antagonist/cult/admin_add(datum/mind/new_owner,mob/admin) give_equipment = FALSE new_owner.add_antag_datum(src)