From f59497fa091c39f66512f8cf6c343e2b15bcbb15 Mon Sep 17 00:00:00 2001
From: Joseph Knutson <47765135+Cazdon@users.noreply.github.com>
Date: Sat, 15 Feb 2020 22:23:52 -0500
Subject: [PATCH] Cult Fixes and Tweaks: Admins can cult anyone, Constructs get
 their comms back. (#12816)

* allows admins to cult anyone

* Constructs get cult chat again

* made it ONLY cult constructs get cult comms
---
 code/datums/mind.dm                     | 4 +---
 code/game/gamemodes/cult/cult.dm        | 2 +-
 code/game/gamemodes/wizard/soulstone.dm | 3 +++
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index dd1a88b8b36..036d70fa17a 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -225,9 +225,7 @@
 
 /datum/mind/proc/memory_edit_cult(mob/living/carbon/human/H)
 	. = _memory_edit_header("cult")
-	if(ismindshielded(H))
-		. += "<B>NO</B>|cultist"
-	else if(src in SSticker.mode.cult)
+	if(src in SSticker.mode.cult)
 		. += "<a href='?src=[UID()];cult=clear'>no</a>|<b><font color='red'>CULTIST</font></b>"
 		. += "<br>Give <a href='?src=[UID()];cult=tome'>tome</a>|<a href='?src=[UID()];cult=equip'>equip</a>."
 	else
diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm
index 113487dc1dc..39e3c5b7d3f 100644
--- a/code/game/gamemodes/cult/cult.dm
+++ b/code/game/gamemodes/cult/cult.dm
@@ -182,7 +182,7 @@ var/global/list/all_cults = list()
 	if(!istype(cult_mind))
 		return 0
 	var/datum/game_mode/cult/cult_mode = SSticker.mode
-	if(!(cult_mind in cult) && is_convertable_to_cult(cult_mind))
+	if(!(cult_mind in cult))
 		cult += cult_mind
 		cult_mind.current.faction |= "cult"
 		var/datum/action/innate/cultcomm/C = new()
diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm
index 2edbb41cb95..d97ec2af5fd 100644
--- a/code/game/gamemodes/wizard/soulstone.dm
+++ b/code/game/gamemodes/wizard/soulstone.dm
@@ -281,6 +281,9 @@
 
 /proc/init_construct(mob/living/simple_animal/hostile/construct/C, mob/living/simple_animal/shade/SH, obj/item/soulstone/SS, obj/structure/constructshell/T)
 	SH.mind.transfer_to(C)
+	if(iscultist(C))
+		var/datum/action/innate/cultcomm/CC = new()
+			CC.Grant(C) //We have to grant the cult comms again because they're lost during the mind transfer.
 	qdel(T)
 	qdel(SH)
 	to_chat(C, "<B>You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.</B>")