From ddf455378781f6bc0c5055e97e4e372baaa33154 Mon Sep 17 00:00:00 2001 From: grungussuss <96586172+grungussuss@users.noreply.github.com> Date: Sun, 6 Jul 2025 22:07:51 +0300 Subject: [PATCH] trapdoor remote attackby to item_interaction (#91935) ## About The Pull Request title removed to_chats because the balloon alerts are more fitting here and you don't need to look back at your chat for any information on these ## Changelog :cl: refactor: refactored trapdoor remote interaction code /:cl: --- code/datums/components/trapdoor.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/datums/components/trapdoor.dm b/code/datums/components/trapdoor.dm index e4641fa29ea..28b70820015 100644 --- a/code/datums/components/trapdoor.dm +++ b/code/datums/components/trapdoor.dm @@ -334,16 +334,16 @@ internals.forceMove(get_turf(src)) internals = null -/obj/item/trapdoor_remote/attackby(obj/item/assembly/trapdoor/assembly, mob/living/user, list/modifiers, list/attack_modifiers) - . = ..() - if(. || !istype(assembly)) - return +/obj/item/trapdoor_remote/item_interaction(mob/living/user, obj/item/assembly/trapdoor/assembly, list/modifiers) + if(!istype(assembly)) + return NONE if(internals) - to_chat(user, span_warning("[src] already has internals!")) - return - to_chat(user, span_notice("You add [assembly] to [src].")) + balloon_alert(user, "doesn't fit!") + return ITEM_INTERACT_BLOCKING + balloon_alert(user, "added") internals = assembly - assembly.forceMove(src) + user.transferItemToLoc(assembly, src) + return ITEM_INTERACT_SUCCESS /obj/item/trapdoor_remote/attack_self(mob/user, modifiers) . = ..()