From 329aabf301b14fab70c11afc8bc34b91d3bcb7b3 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Thu, 17 May 2018 23:50:17 -0500 Subject: [PATCH] Update cult.dm --- code/modules/antagonists/cult/cult.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm index 972d44d35d..bd879f8ad7 100644 --- a/code/modules/antagonists/cult/cult.dm +++ b/code/modules/antagonists/cult/cult.dm @@ -128,11 +128,7 @@ SSticker.mode.cult -= owner SSticker.mode.update_cult_icons_removed(owner) if(!silent) -<<<<<<< HEAD - owner.current.visible_message("[owner.current] looks like [owner.current.p_they()] just reverted to their old faith!", null, null, null, owner.current) -======= owner.current.visible_message("[owner.current] looks like [owner.current.p_theyve()] just reverted to [owner.current.p_their()] old faith!", null, null, null, owner.current) ->>>>>>> bf2e6bd... Fixes decon message pronouns (#37870) to_chat(owner.current, "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!", INDIVIDUAL_ATTACK_LOG) if(cult_team.blood_target && cult_team.blood_target_image && owner.current.client)