applies the previous fixes for cult on a closed PR

code/datums/antagonists/datum_cult.dm

@@ -2,20 +2,21 @@
 	var/datum/action/innate/cultcomm/communion = new
 
 /datum/antagonist/cult/Destroy()
-	qdel(communion)
+	QDEL_NULL(communion)
 	return ..()
 
 /datum/antagonist/cult/proc/add_objectives()
 	var/list/target_candidates = list()
 	for(var/mob/living/carbon/human/player in GLOB.player_list)
-		if(player.mind && !is_convertable_to_cult(player) && (player != owner) && isliving(player))
+		if(player.mind && !player.mind.has_antag_datum(ANTAG_DATUM_CULT) && !is_convertable_to_cult(player) && (player != owner) && player.stat != DEAD)
 			target_candidates += player.mind
 	if(target_candidates.len == 0)
 		message_admins("Cult Sacrifice: Could not find unconvertable target, checking for convertable target.")
 		for(var/mob/living/carbon/human/player in GLOB.player_list)
-			if(player.mind && (player != owner) && isliving(player))
+			if(player.mind && !player.mind.has_antag_datum(ANTAG_DATUM_CULT) && (player != owner) && player.stat != DEAD)
 				target_candidates += player.mind
-	if(target_candidates.len > 0)
+	listclearnulls(target_candidates)
+	if(LAZYLEN(target_candidates))
 		GLOB.sac_mind = pick(target_candidates)
 		if(!GLOB.sac_mind)
 			message_admins("Cult Sacrifice: ERROR -  Null target chosen!")
@@ -33,7 +34,6 @@
 		GLOB.sac_complete = TRUE
 	SSticker.mode.cult_objectives += "sacrifice"
 	SSticker.mode.cult_objectives += "eldergod"
-	on_gain()
 
 /datum/antagonist/cult/proc/cult_memorization(datum/mind/cult_mind)
 	var/mob/living/current = cult_mind.current
@@ -47,7 +47,8 @@
 					explanation = "The veil has already been weakened here, proceed to the final objective."
 			if("eldergod")
 				explanation = "Summon Nar-Sie by invoking the rune 'Summon Nar-Sie' with nine acolytes on it. You must do this after sacrificing your target."
-		to_chat(current, "<B>Objective #[obj_count]</B>: [explanation]")
+		if(!silent)
+			to_chat(current, "<B>Objective #[obj_count]</B>: [explanation]")
 		cult_mind.memory += "<B>Objective #[obj_count]</B>: [explanation]<BR>"
 
 /datum/antagonist/cult/can_be_owned(datum/mind/new_owner)
@@ -58,16 +59,16 @@
 /datum/antagonist/cult/on_gain()
 	. = ..()
 	var/mob/living/current = owner.current
-	if(SSticker.mode.cult_objectives.len == 0)
+	if(!LAZYLEN(SSticker.mode.cult_objectives))
 		add_objectives()
-		return
 	SSticker.mode.cult += owner // Only add after they've been given objectives
 	cult_memorization(owner)
 	if(jobban_isbanned(current, ROLE_CULTIST))
 		addtimer(CALLBACK(SSticker.mode, /datum/game_mode.proc/replace_jobbaned_player, current, ROLE_CULTIST, ROLE_CULTIST), 0)
 	SSticker.mode.update_cult_icons_added(owner)
-	current.throw_alert("bloodsense", /obj/screen/alert/bloodsense)
 	current.log_message("<font color=#960000>Has been converted to the cult of Nar'Sie!</font>", INDIVIDUAL_ATTACK_LOG)
+	if(GLOB.blood_target && GLOB.blood_target_image && current.client)
+		current.client.images += GLOB.blood_target_image
 
 /datum/antagonist/cult/apply_innate_effects(mob/living/mob_override)
 	. = ..()
@@ -79,6 +80,7 @@
 	if(!GLOB.cult_mastered)
 		current.verbs += /mob/living/proc/cult_master
 	communion.Grant(current)
+	current.throw_alert("bloodsense", /obj/screen/alert/bloodsense)
 
 /datum/antagonist/cult/remove_innate_effects(mob/living/mob_override)
 	. = ..()
@@ -97,8 +99,50 @@
 	owner.wipe_memory()
 	SSticker.mode.cult -= owner
 	SSticker.mode.update_cult_icons_removed(owner)
-	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>")
+		to_chat(owner.current, "<span class='userdanger'>An unfamiliar white light flashes through your mind, cleansing the taint of the Geometer and all your memories as her servant.</span>")
+		owner.current.log_message("<font color=#960000>Has renounced the cult of Nar'Sie!</font>", INDIVIDUAL_ATTACK_LOG)
+		owner.current.visible_message("<span class='big'>[owner.current] looks like [owner.current.p_they()] just reverted to their old faith!</span>")
+	if(GLOB.blood_target && GLOB.blood_target_image && owner.current.client)
+		owner.current.client.images -= GLOB.blood_target_image
 	. = ..()
+
+/datum/antagonist/cult/master
+	var/datum/action/innate/cultmast/finalreck/reckoning = new
+	var/datum/action/innate/cultmast/cultmark/bloodmark = new
+
+/datum/antagonist/cult/master/Destroy()
+	QDEL_NULL(reckoning)
+	QDEL_NULL(bloodmark)
+	return ..()
+
+/datum/antagonist/cult/master/on_gain()
+	. = ..()
+	var/mob/living/current = owner.current
+	SSticker.mode.set_antag_hud(current, "cultmaster")
+
+/datum/antagonist/cult/master/greet()
+	to_chat(owner.current, "<span class='cultlarge'>You are the cult's Master</span>. As the cult's Master, you have a unique title and loud voice when communicating, are capable of marking \
+	targets, such as a location or a noncultist, to direct the cult to them, and, finally, you are capable of summoning the entire living cult to your location <b><i>once</i></b>.")
+	to_chat(owner.current, "Use these abilities to direct the cult to victory at any cost.")
+
+/datum/antagonist/cult/master/apply_innate_effects(mob/living/mob_override)
+	. = ..()
+	var/mob/living/current = owner.current
+	if(mob_override)
+		current = mob_override
+	if(!GLOB.reckoning_complete)
+		reckoning.Grant(current)
+	bloodmark.Grant(current)
+	current.update_action_buttons_icon()
+	current.apply_status_effect(/datum/status_effect/cult_master)
+
+/datum/antagonist/cult/master/remove_innate_effects(mob/living/mob_override)
+	. = ..()
+	var/mob/living/current = owner.current
+	if(mob_override)
+		current = mob_override
+	reckoning.Remove(current)
+	bloodmark.Remove(current)
+	current.update_action_buttons_icon()
+	current.remove_status_effect(/datum/status_effect/cult_master)