From 66bc68418415de83b6790d4d8b096c311c813648 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Thu, 18 Jan 2018 17:58:54 -0500
Subject: [PATCH 1/2] Merge pull request #34552 from Robustin/revert3

All crew can purify the Blood Bastard Sword (again)
---
 code/game/objects/items/storage/book.dm | 34 ++++++++++++-------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm
index 06430ef5ce..ff7933b6da 100644
--- a/code/game/objects/items/storage/book.dm
+++ b/code/game/objects/items/storage/book.dm
@@ -156,23 +156,23 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "bible",
 			var/unholy2clean = A.reagents.get_reagent_amount("unholywater")
 			A.reagents.del_reagent("unholywater")
 			A.reagents.add_reagent("holywater",unholy2clean)
-		if(istype(A, /obj/item/twohanded/required/cult_bastard))
-			var/obj/item/twohanded/required/cult_bastard/sword = A
-			to_chat(user, "<span class='notice'>You begin to exorcise [sword].</span>")
-			playsound(src,'sound/hallucinations/veryfar_noise.ogg',40,1)
-			if(do_after(user, 40, target = sword))
-				playsound(src,'sound/effects/pray_chaplain.ogg',60,1)
-				for(var/obj/item/device/soulstone/SS in sword.contents)
-					SS.usability = TRUE
-					for(var/mob/living/simple_animal/shade/EX in SS)
-						SSticker.mode.remove_cultist(EX.mind, 1, 0)
-						EX.icon_state = "ghost1"
-						EX.name = "Purified [EX.name]"
-					SS.release_shades(user)
-					qdel(SS)
-				new /obj/item/nullrod/claymore(get_turf(sword))
-				user.visible_message("<span class='notice'>[user] has purified the [sword]!!</span>")
-				qdel(sword)
+	if(istype(A, /obj/item/twohanded/required/cult_bastard) && !iscultist(user))
+		var/obj/item/twohanded/required/cult_bastard/sword = A
+		to_chat(user, "<span class='notice'>You begin to exorcise [sword].</span>")
+		playsound(src,'sound/hallucinations/veryfar_noise.ogg',40,1)
+		if(do_after(user, 40, target = sword))
+			playsound(src,'sound/effects/pray_chaplain.ogg',60,1)
+			for(var/obj/item/device/soulstone/SS in sword.contents)
+				SS.usability = TRUE
+				for(var/mob/living/simple_animal/shade/EX in SS)
+					SSticker.mode.remove_cultist(EX.mind, 1, 0)
+					EX.icon_state = "ghost1"
+					EX.name = "Purified [EX.name]"
+				SS.release_shades(user)
+				qdel(SS)
+			new /obj/item/nullrod/claymore(get_turf(sword))
+			user.visible_message("<span class='notice'>[user] has purified the [sword]!!</span>")
+			qdel(sword)
 
 
 /obj/item/storage/book/bible/booze