[MIRROR] Restore non-functional ash mark ability (#1854)

* Restore non-functional ash mark ability (#81320) --------- Co-authored-by: NovaBot <[email protected]> Co-authored-by: ViktorKoL <[email protected]>
Fluffy-Frontier · Feb 8, 2024 · 606bd7b · 606bd7b
1 parent 007523e
commit 606bd7b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/code/modules/antagonists/heretic/knowledge/ash_lore.dm b/code/modules/antagonists/heretic/knowledge/ash_lore.dm
@@ -84,8 +84,9 @@
 /datum/heretic_knowledge/mark/ash_mark
 	name = "Mark of Ash"
 	desc = "Your Mansus Grasp now applies the Mark of Ash. The mark is triggered from an attack with your Ashen Blade. \
-		When triggered, the victim takes additional stamina and burn damage, and the mark is transferred to any nearby heathens. \
-		Damage dealt is decreased with each transfer."
+		When triggered, the victim takes additional stamina and burn damage, and the mark is transferred to a nearby heathen. \
+		Damage dealt is decreased with each transfer. \
+		Triggering the mark will also greatly reduce the cooldown of your Mansus Grasp."
 	gain_text = "He was a very particular man, always watching in the dead of night. \
 		But in spite of his duty, he regularly tranced through the Manse with his blazing lantern held high. \
 		He shone brightly in the darkness, until the blaze begin to die."
@@ -101,7 +102,7 @@
 	// Also refunds 75% of charge!
 	var/datum/action/cooldown/spell/touch/mansus_grasp/grasp = locate() in source.actions
 	if(grasp)
-		grasp.next_use_time = min(round(grasp.next_use_time - grasp.cooldown_time * 0.75, 0), 0)
+		grasp.next_use_time -= round(grasp.cooldown_time*0.75)
 		grasp.build_all_button_icons()
 
 /datum/heretic_knowledge/knowledge_ritual/ash

diff --git a/code/modules/antagonists/heretic/knowledge/moon_lore.dm b/code/modules/antagonists/heretic/knowledge/moon_lore.dm
@@ -95,17 +95,6 @@
 	route = PATH_MOON
 	mark_type = /datum/status_effect/eldritch/moon
 
-/datum/heretic_knowledge/mark/moon_mark/trigger_mark(mob/living/source, mob/living/target)
-	. = ..()
-	if(!.)
-		return
-
-	// Also refunds 75% of charge!
-	var/datum/action/cooldown/spell/touch/mansus_grasp/grasp = locate() in source.actions
-	if(grasp)
-		grasp.next_use_time = min(round(grasp.next_use_time - grasp.cooldown_time * 0.75, 0), 0)
-		grasp.build_all_button_icons()
-
 /datum/heretic_knowledge/knowledge_ritual/moon
 	next_knowledge = list(/datum/heretic_knowledge/spell/moon_parade)
 	route = PATH_MOON