cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 22:50:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes the span of cult deconversion text, and removes a duplicate definition [MDB IGNORE] (#11201)

Browse Source 
* 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>
This commit is contained in:
SkyratBot
2022-02-01 13:28:41 +00:00
committed by GitHub
co-authored by MrMelbert
parent a379edc037
commit f43b731bd3
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/cult/cult.dm
+6 -9
View File
@@ -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)