From b465225bc20b8d2a73ba21fc2da6434b73f296d4 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Fri, 12 Feb 2021 18:53:38 -0700
Subject: [PATCH 1/3] Update eldritch_items.dm

---
 code/modules/antagonists/eldritch_cult/eldritch_items.dm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/modules/antagonists/eldritch_cult/eldritch_items.dm b/code/modules/antagonists/eldritch_cult/eldritch_items.dm
index fbf0740e50..d4dd819e96 100644
--- a/code/modules/antagonists/eldritch_cult/eldritch_items.dm
+++ b/code/modules/antagonists/eldritch_cult/eldritch_items.dm
@@ -67,6 +67,9 @@
 		return FALSE
 
 /datum/action/innate/heretic_shatter/Activate()
+	if(!CHECK_MOBILITY(holder, MOBILITY_USE))
+		to_chat(holder, "<span class='warning'>You can't do that right now!</span>")
+		return
 	var/turf/safe_turf = find_safe_turf(zlevels = sword.z, extended_safety_checks = TRUE)
 	do_teleport(holder,safe_turf,forceMove = TRUE)
 	to_chat(holder,"<span class='warning'>You feel a gust of energy flow through your body... the Rusted Hills heard your call...</span>")

From acf06abed5cc10f8ab3ad173fbd4fc355ad64553 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Fri, 12 Feb 2021 22:50:09 -0700
Subject: [PATCH 2/3] Update eldritch_items.dm

---
 code/modules/antagonists/eldritch_cult/eldritch_items.dm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/code/modules/antagonists/eldritch_cult/eldritch_items.dm b/code/modules/antagonists/eldritch_cult/eldritch_items.dm
index d4dd819e96..f46fd8593a 100644
--- a/code/modules/antagonists/eldritch_cult/eldritch_items.dm
+++ b/code/modules/antagonists/eldritch_cult/eldritch_items.dm
@@ -62,14 +62,12 @@
 
 /datum/action/innate/heretic_shatter/IsAvailable()
 	if(IS_HERETIC(holder) || IS_HERETIC_MONSTER(holder))
-		return TRUE
+		return ..()
 	else
 		return FALSE
 
 /datum/action/innate/heretic_shatter/Activate()
-	if(!CHECK_MOBILITY(holder, MOBILITY_USE))
-		to_chat(holder, "<span class='warning'>You can't do that right now!</span>")
-		return
+	. = ..()
 	var/turf/safe_turf = find_safe_turf(zlevels = sword.z, extended_safety_checks = TRUE)
 	do_teleport(holder,safe_turf,forceMove = TRUE)
 	to_chat(holder,"<span class='warning'>You feel a gust of energy flow through your body... the Rusted Hills heard your call...</span>")

From 14c9fe655cb99c01a7b9e360734ec71d16110029 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Thu, 18 Feb 2021 17:00:28 -0700
Subject: [PATCH 3/3] Update eldritch_items.dm

---
 code/modules/antagonists/eldritch_cult/eldritch_items.dm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/modules/antagonists/eldritch_cult/eldritch_items.dm b/code/modules/antagonists/eldritch_cult/eldritch_items.dm
index f46fd8593a..ea6d1d50e2 100644
--- a/code/modules/antagonists/eldritch_cult/eldritch_items.dm
+++ b/code/modules/antagonists/eldritch_cult/eldritch_items.dm
@@ -50,7 +50,8 @@
 	background_icon_state = "bg_ecult"
 	button_icon_state = "shatter"
 	icon_icon = 'icons/mob/actions/actions_ecult.dmi'
-	check_flags = MOBILITY_HOLD|MOBILITY_MOVE|MOBILITY_USE
+	check_flags = NONE	// required_mobility_flags handles this
+	required_mobility_flags = MOBILITY_HOLD|MOBILITY_MOVE|MOBILITY_USE
 	var/mob/living/carbon/human/holder
 	var/obj/item/melee/sickly_blade/sword