From 2e9e7f54882534f189375abfe4ee840ce428732b Mon Sep 17 00:00:00 2001
From: CitadelStationBot <CitadelStationBot>
Date: Fri, 16 Jun 2017 12:53:49 -0500
Subject: [PATCH] Cultists must be human to run for Cult Master status

---
 code/datums/status_effects/buffs.dm    | 9 +++++----
 code/game/gamemodes/cult/cult_comms.dm | 7 +------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm
index a0338f72b0..a2d486be3f 100644
--- a/code/datums/status_effects/buffs.dm
+++ b/code/datums/status_effects/buffs.dm
@@ -232,19 +232,20 @@
 /datum/status_effect/cult_master
 	id = "The Cult Master"
 	duration = -1
-	tick_interval = 100
 	alert_type = null
+	on_remove_on_mob_delete = TRUE
 	var/alive = TRUE
 
 /datum/status_effect/cult_master/proc/deathrattle()
+	if(!QDELETED(GLOB.cult_narsie))
+		return //if nar-sie is alive, don't even worry about it
 	var/area/A = get_area(owner)
 	for(var/datum/mind/B in SSticker.mode.cult)
 		if(isliving(B.current))
 			var/mob/living/M = B.current
 			M << 'sound/hallucinations/veryfar_noise.ogg'
-			to_chat(M, "<span class='cultlarge'>The Cult's Master, [owner], has fallen in the [A]!")
-			
-			
+			to_chat(M, "<span class='cultlarge'>The Cult's Master, [owner], has fallen in \the [A]!</span>")
+
 /datum/status_effect/cult_master/tick()
 	if(owner.stat != DEAD && !alive)
 		alive = TRUE
diff --git a/code/game/gamemodes/cult/cult_comms.dm b/code/game/gamemodes/cult/cult_comms.dm
index 9620d30063..61ad770968 100644
--- a/code/game/gamemodes/cult/cult_comms.dm
+++ b/code/game/gamemodes/cult/cult_comms.dm
@@ -81,17 +81,12 @@
 	popup.open()
 	return 1
 
-/mob/living/proc/cult_master()
-	set category = "Cultist"
-	set name = "Assert Leadership"
-	pollCultists(src)  // This proc handles the distribution of cult master actions
-
 /datum/action/innate/cult/mastervote
 	name = "Assert Leadership"
 	button_icon_state = "cultvote"
 
 /datum/action/innate/cult/mastervote/IsAvailable()
-	if(GLOB.cult_vote_called)
+	if(GLOB.cult_vote_called || !ishuman(owner))
 		return FALSE
 	return ..()