cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 14:39:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moves cult spells off attack_atom (#83961)

Browse Source 
## About The Pull Request

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

## Changelog

🆑 Melbert
qol: Attack animations for cult spells on attackable objects (people,
airlocks)
fix: Fix cult spells on non-attackable objects (metal sheets, blood
decals)
/🆑
This commit is contained in:
MrMelbert
2024-06-14 12:24:32 -06:00
committed by GitHub
parent 46447b0a61
commit cd2f107eef
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/cult/blood_magic.dm
+11 -8
View File
@@ -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)