From 0d2c2009f86559f737daf0c6e3fffaeacd3e5e62 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 12 Aug 2020 12:27:53 +0200 Subject: [PATCH] [MIRROR] Intercoms can now be interacted with via the telekinesis mutation (#297) * Intercoms now have appropriate attack_tk_grab response (#52835) Due to issues with item interaction code, this PR means the intercom is now viewable with telekinesis but is not interactable unless adjacent. * Intercoms can now be interacted with via the telekinesis mutation Co-authored-by: Timberpoes --- code/game/objects/items/devices/radio/intercom.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 65e0b06cad5..b4d9bfa5083 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -55,6 +55,14 @@ return return ..() +/** + * Override attack_tk_grab instead of attack_tk because we actually want attack_tk's + * functionality. What we DON'T want is attack_tk_grab attempting to pick up the + * intercom as if it was an ordinary item. + */ +/obj/item/radio/intercom/attack_tk_grab(mob/user) + interact(user) + /obj/item/radio/intercom/attack_ai(mob/user) interact(user)