From 96c2cf2676bd2f5089df31252510aa17ebc4f3a6 Mon Sep 17 00:00:00 2001
From: kiwedespars <47008095+kiwedespars@users.noreply.github.com>
Date: Sat, 13 Mar 2021 19:04:09 -0800
Subject: [PATCH] fixes marks

- marks are no longer set by the blade and detonated by the hand, outside of flesh
- fixed it so sickles can no longer be used by nonheretics, again, needs testing for heretic minions (ghouls)
---
 .../antagonists/eldritch_cult/eldritch_items.dm   | 15 ++++++++++-----
 .../eldritch_cult/knowledge/flesh_lore.dm         |  3 ++-
 .../eldritch_cult/knowledge/rust_lore.dm          |  3 ++-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/code/modules/antagonists/eldritch_cult/eldritch_items.dm b/code/modules/antagonists/eldritch_cult/eldritch_items.dm
index 6b4a42baf0..95fa4d8cd1 100644
--- a/code/modules/antagonists/eldritch_cult/eldritch_items.dm
+++ b/code/modules/antagonists/eldritch_cult/eldritch_items.dm
@@ -95,12 +95,17 @@
 	. = ..()
 	linked_action = new(src)
 
-/obj/item/melee/sickly_blade/attack(mob/living/M, mob/living/user)
-	if(!(IS_HERETIC(user) || !IS_HERETIC_MONSTER(user)))
+/obj/item/melee/sickly_blade/attack(mob/living/target, mob/living/user)
+	if(!(IS_HERETIC(user) || IS_HERETIC_MONSTER(user)))
 		to_chat(user,"<span class='danger'>You feel a pulse of alien intellect lash out at your mind!</span>")
-		var/mob/living/carbon/human/human_user = user
-		human_user.AdjustParalyzed(5 SECONDS)
-		return FALSE
+		user.DefaultCombatKnockdown(100)
+		user.dropItemToGround(src, TRUE)
+		if(ishuman(user))
+			var/mob/living/carbon/human/H = user
+			H.apply_damage(rand(force/2, force), BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM))
+		else
+			user.adjustBruteLoss(rand(force/2,force))
+		return
 	return ..()
 
 /obj/item/melee/sickly_blade/pickup(mob/user)
diff --git a/code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm b/code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm
index 7145987297..7b737f582d 100644
--- a/code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm
+++ b/code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm
@@ -141,9 +141,10 @@
 	banned_knowledge = list(/datum/eldritch_knowledge/rust_mark,/datum/eldritch_knowledge/ash_mark,/datum/eldritch_knowledge/void_mark)
 	route = PATH_FLESH
 
-/datum/eldritch_knowledge/flesh_mark/on_eldritch_blade(target,user,proximity_flag,click_parameters)
+/datum/eldritch_knowledge/flesh_mark/on_mansus_grasp(atom/target, mob/user, proximity_flag, click_parameters)
 	. = ..()
 	if(isliving(target))
+		. = TRUE
 		var/mob/living/living_target = target
 		living_target.apply_status_effect(/datum/status_effect/eldritch/flesh)
 
diff --git a/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm b/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm
index ad0cbf6423..8184beb3aa 100644
--- a/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm
+++ b/code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm
@@ -87,9 +87,10 @@
 	banned_knowledge = list(/datum/eldritch_knowledge/ash_mark,/datum/eldritch_knowledge/flesh_mark,/datum/eldritch_knowledge/void_mark)
 	route = PATH_RUST
 
-/datum/eldritch_knowledge/rust_mark/on_eldritch_blade(target,user,proximity_flag,click_parameters)
+/datum/eldritch_knowledge/rust_mark/on_mansus_grasp(atom/target, mob/user, proximity_flag, click_parameters)
 	. = ..()
 	if(isliving(target))
+		. = TRUE
 		var/mob/living/living_target = target
 		living_target.apply_status_effect(/datum/status_effect/eldritch/rust)