From cd2f107eefb2ba0bf8368ab0efd7f75adf977fec Mon Sep 17 00:00:00 2001
From: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Date: Fri, 14 Jun 2024 13:24:32 -0500
Subject: [PATCH] Moves cult spells off attack_atom (#83961)

## About The Pull Request

`attack_atom`, while sensibly sounding, isn't called for most items,
because they can't be attacked.

## Changelog

:cl: Melbert
qol: Attack animations for cult spells on attackable objects (people,
airlocks)
fix: Fix cult spells on non-attackable objects (metal sheets, blood
decals)
/:cl:
---
 code/modules/antagonists/cult/blood_magic.dm | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm
index 03a05f6c397..192d9c4e66d 100644
--- a/code/modules/antagonists/cult/blood_magic.dm
+++ b/code/modules/antagonists/cult/blood_magic.dm
@@ -379,24 +379,27 @@
 	cast_spell(user, user)
 
 /obj/item/melee/blood_magic/attack(mob/living/M, mob/living/carbon/user)
-	if(!iscarbon(user) || !IS_CULTIST(user))
-		uses = 0
-		qdel(src)
-		return
 	log_combat(user, M, "used a cult spell on", source.name, "")
 	SSblackbox.record_feedback("tally", "cult_spell_invoke", 1, "[name]")
 	M.lastattacker = user.real_name
 	M.lastattackerckey = user.ckey
+	user.do_attack_animation(M)
 	cast_spell(M, user)
 
-/obj/item/melee/blood_magic/attack_atom(atom/attacked_atom, mob/living/user, params)
+/obj/item/melee/blood_magic/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
 	if(!iscarbon(user) || !IS_CULTIST(user))
 		uses = 0
 		qdel(src)
-		return
-	log_combat(user, attacked_atom, "used a cult spell on", source.name, "")
+		return ITEM_INTERACT_BLOCKING
+
+	if(isliving(interacting_with))
+		return ITEM_INTERACT_SKIP_TO_ATTACK
+
+	user.do_attack_animation(interacting_with)
+	log_combat(user, interacting_with, "used a cult spell on", source.name, "")
 	SSblackbox.record_feedback("tally", "cult_spell_invoke", 1, "[name]")
-	cast_spell(attacked_atom, user)
+	cast_spell(interacting_with, user)
+	return ITEM_INTERACT_SUCCESS
 
 /obj/item/melee/blood_magic/proc/cast_spell(atom/target, mob/living/carbon/user)
 	if(invocation)