From fac8c05323e9b3038f3fa8fe76e1817caaa2f045 Mon Sep 17 00:00:00 2001 From: Alan Date: Sat, 1 Aug 2026 02:15:29 -0400 Subject: [PATCH] Migrate cookie summoning book to the new attack chain. (#32307) * Migrate cookie summoning book to the new attack chain. * Add fingerprint. --- code/_onclick/click_override.dm | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/code/_onclick/click_override.dm b/code/_onclick/click_override.dm index cb8232babe7..59cb9b7d962 100644 --- a/code/_onclick/click_override.dm +++ b/code/_onclick/click_override.dm @@ -24,22 +24,31 @@ icon = 'icons/obj/library.dmi' icon_state = "book" var/datum/middle_click_override/clickBehavior = new /datum/middle_click_override/badmin_clicker + new_attack_chain = TRUE + +/obj/item/badmin_book/activate_self(mob/living/user as mob) + if(..()) + return ITEM_INTERACT_COMPLETE -/obj/item/badmin_book/attack_self__legacy__attackchain(mob/living/user as mob) if(user.middleClickOverride) to_chat(user, SPAN_WARNING("You try to draw power from [src], but you cannot hold the power at this time!")) - return + return ITEM_INTERACT_COMPLETE + + add_fingerprint(user) user.middleClickOverride = clickBehavior to_chat(user, SPAN_NOTICE("You draw a bit of power from [src], you can use middle click or alt click to release the power!")) + return ITEM_INTERACT_COMPLETE /datum/middle_click_override/badmin_clicker var/summon_path = /obj/item/food/cookie -/datum/middle_click_override/badmin_clicker/onClick(atom/A, mob/living/user) - var/atom/movable/newObject = new summon_path - newObject.loc = get_turf(A) - to_chat(user, SPAN_NOTICE("You release the power you had stored up, summoning \a [newObject.name]!")) - usr.loc.visible_message(SPAN_NOTICE("[user] waves [user.p_their()] hand and summons \a [newObject.name]!")) +/datum/middle_click_override/badmin_clicker/onClick(atom/target, mob/living/user) + var/atom/movable/new_object = new summon_path(get_turf(target)) + user.visible_message( + SPAN_NOTICE("[user] waves [user.p_their()] hand and summons \a [new_object]!"), + SPAN_NOTICE("You release the power you had stored up, summoning \a [new_object]!"), + SPAN_HEAR("You're not sure, but you think you hear \a [new_object] appear out of thin air!") + ) ..() /datum/middle_click_override/shock_implant