From 3c8b9492f84bd9901592d1cae94ed1a955037df4 Mon Sep 17 00:00:00 2001 From: 1080pCat <96908085+1080pCat@users.noreply.github.com> Date: Thu, 12 Dec 2024 02:19:04 +1000 Subject: [PATCH] his grace attack chain migration (#27580) --- code/game/objects/items/his_grace.dm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/his_grace.dm b/code/game/objects/items/his_grace.dm index 388dfc7f602..393209b5c0f 100644 --- a/code/game/objects/items/his_grace.dm +++ b/code/game/objects/items/his_grace.dm @@ -30,6 +30,8 @@ var/victims = 0 var/victims_needed = 25 + new_attack_chain = TRUE + /obj/item/his_grace/Initialize(mapload) . = ..() START_PROCESSING(SSprocessing, src) @@ -61,15 +63,19 @@ else . += "single_latch" -/obj/item/his_grace/attack_self__legacy__attackchain(mob/living/user) +/obj/item/his_grace/activate_self(mob/user) + if(..()) + return FINISH_ATTACK + if(!awakened) INVOKE_ASYNC(src, PROC_REF(awaken), user) -/obj/item/his_grace/attack__legacy__attackchain(mob/living/M, mob/user) - if(awakened && M.stat) - consume(M) +/obj/item/his_grace/attack(mob/living/target, mob/living/user, params) + if(awakened && target.stat) + consume(target) + return FINISH_ATTACK else - ..() + return ..() /obj/item/his_grace/can_be_pulled(user, grab_state, force, show_message = FALSE) //you can't pull his grace return FALSE