From a39b67309dea5ee74b68365de1dbdab17185b2dd Mon Sep 17 00:00:00 2001 From: Xander3359 <66163761+Xander3359@users.noreply.github.com> Date: Sat, 29 Jun 2024 11:28:17 -0400 Subject: [PATCH] Fix being unable to add a flux core to new the combat heart cybernetic (#84420) ## About The Pull Request Fix being unable to add a flux core to new the combat heart cybernetic ## Why It's Good For The Game bugfix ## Changelog :cl: fix: Fix being unable to add a flux core to new the combat heart cybernetic /:cl: --------- Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> --- .../organs/internal/heart/heart_anomalock.dm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/code/modules/surgery/organs/internal/heart/heart_anomalock.dm b/code/modules/surgery/organs/internal/heart/heart_anomalock.dm index 3016d52912e..e9da6197ed2 100644 --- a/code/modules/surgery/organs/internal/heart/heart_anomalock.dm +++ b/code/modules/surgery/organs/internal/heart/heart_anomalock.dm @@ -114,19 +114,20 @@ /obj/item/organ/internal/heart/cybernetic/anomalock/proc/get_held_mob() return owner -/obj/item/organ/internal/heart/cybernetic/anomalock/attackby(obj/item/item, mob/living/user, params) - if(!istype(item.type, required_anomaly)) - return ..() +/obj/item/organ/internal/heart/cybernetic/anomalock/item_interaction(mob/living/user, obj/item/tool, list/modifiers) + if(!istype(tool, required_anomaly)) + return NONE if(core) balloon_alert(user, "core already in!") - return - if(!user.transferItemToLoc(item, src)) - return - core = item + return ITEM_INTERACT_BLOCKING + if(!user.transferItemToLoc(tool, src)) + return ITEM_INTERACT_BLOCKING + core = tool balloon_alert(user, "core installed") playsound(src, 'sound/machines/click.ogg', 30, TRUE) add_organ_trait(TRAIT_SHOCKIMMUNE) update_icon_state() + return ITEM_INTERACT_SUCCESS /obj/item/organ/internal/heart/cybernetic/anomalock/screwdriver_act(mob/living/user, obj/item/tool) . = ..()