From 3fff6d4a1d36706e15adc3c4002123de4cf52718 Mon Sep 17 00:00:00 2001
From: CitadelStationBot <CitadelStationBot>
Date: Mon, 1 May 2017 20:27:03 -0500
Subject: [PATCH] Fixes cult datum giving the action button to the mind instead
 of mob

---
 code/datums/antagonists/datum_clockcult.dm |  2 +-
 code/datums/antagonists/datum_cult.dm      | 26 +++++++++++++---------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/code/datums/antagonists/datum_clockcult.dm b/code/datums/antagonists/datum_clockcult.dm
index ba18e76f02..85ff6f8930 100644
--- a/code/datums/antagonists/datum_clockcult.dm
+++ b/code/datums/antagonists/datum_clockcult.dm
@@ -16,7 +16,7 @@
 	if(!istype(current))
 		return
 	if(jobban_isbanned(current, ROLE_SERVANT_OF_RATVAR))
-		addtimer(CALLBACK(SSticker.mode, /datum/game_mode.proc/replace_jobbaned_player, owner, ROLE_SERVANT_OF_RATVAR, ROLE_SERVANT_OF_RATVAR), 0)
+		addtimer(CALLBACK(SSticker.mode, /datum/game_mode.proc/replace_jobbaned_player, current, ROLE_SERVANT_OF_RATVAR, ROLE_SERVANT_OF_RATVAR), 0)
 	owner.current.log_message("<font color=#BE8700>Has been converted to the cult of Ratvar!</font>", INDIVIDUAL_ATTACK_LOG)
 	if(issilicon(current))
 		var/mob/living/silicon/S = owner
diff --git a/code/datums/antagonists/datum_cult.dm b/code/datums/antagonists/datum_cult.dm
index 69c9849782..e6db239241 100644
--- a/code/datums/antagonists/datum_cult.dm
+++ b/code/datums/antagonists/datum_cult.dm
@@ -10,24 +10,30 @@
 	if(!owner)
 		return
 	if(jobban_isbanned(owner.current, ROLE_CULTIST))
-		addtimer(CALLBACK(SSticker.mode, /datum/game_mode.proc/replace_jobbaned_player, owner, ROLE_CULTIST, ROLE_CULTIST), 0)
+		addtimer(CALLBACK(SSticker.mode, /datum/game_mode.proc/replace_jobbaned_player, owner.current, ROLE_CULTIST, ROLE_CULTIST), 0)
 	owner.current.log_message("<font color=#960000>Has been converted to the cult of Nar'Sie!</font>", INDIVIDUAL_ATTACK_LOG)
 
-/datum/antagonist/cult/apply_innate_effects()
+/datum/antagonist/cult/apply_innate_effects(mob/living/mob_override)
 	. = ..()
-	owner.current.faction |= "cult"
-	owner.current.verbs += /mob/living/proc/cult_help
-	communion.Grant(owner)
+	var/mob/living/current = owner.current
+	if(mob_override)
+		current = mob_override
+	current.faction |= "cult"
+	current.verbs += /mob/living/proc/cult_help
+	communion.Grant(current)
 
-/datum/antagonist/cult/remove_innate_effects()
+/datum/antagonist/cult/remove_innate_effects(mob/living/mob_override)
 	. = ..()
-	owner.current.faction -= "cult"
-	owner.current.verbs -= /mob/living/proc/cult_help
-
+	var/mob/living/current = owner.current
+	if(mob_override)
+		current = mob_override
+	current.faction -= "cult"
+	current.verbs -= /mob/living/proc/cult_help
+	communion.Remove(current)
 
 /datum/antagonist/cult/on_removal()
 	. = ..()
 	to_chat(owner, "<span class='userdanger'>An unfamiliar white light flashes through your mind, cleansing the taint of the Dark One and all your memories as its servant.</span>")
 	owner.current.log_message("<font color=#960000>Has renounced the cult of Nar'Sie!</font>", INDIVIDUAL_ATTACK_LOG)
 	if(!silent)
-		owner.current.visible_message("<span class='big'>[owner] looks like [owner.current.p_they()] just reverted to their old faith!</span>")
\ No newline at end of file
+		owner.current.visible_message("<span class='big'>[owner] looks like [owner.current.p_they()] just reverted to their old faith!</span>")