From bdc325f54332d59fdb9aa61d0a78ba2fb3628fe6 Mon Sep 17 00:00:00 2001 From: Tim Date: Sun, 24 Nov 2024 13:48:45 -0600 Subject: [PATCH] Fix coffee maker items teleporting to AI/Cyborg locations (#88140) ## About The Pull Request - Fixes #88136 Both AIs and cyborgs would have coffee maker interactions that result in an item (sugar packets, coffee cups, coffee pots, etc.) teleporting to their location. This was due to the `ALLOW_SILICON_REACH` being used which doesn't enforce a radius distance check for silicons. ## Why It's Good For The Game Those pesky silicons can no longer steal coffee from humans. ## Changelog :cl: fix: Fix coffee maker items teleporting to AI/Cyborg locations /:cl: --- code/modules/food_and_drinks/machinery/coffeemaker.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/food_and_drinks/machinery/coffeemaker.dm b/code/modules/food_and_drinks/machinery/coffeemaker.dm index c6f8ba92f2a..51280fd87d6 100644 --- a/code/modules/food_and_drinks/machinery/coffeemaker.dm +++ b/code/modules/food_and_drinks/machinery/coffeemaker.dm @@ -128,7 +128,7 @@ . = ..() if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN) return - if(!can_interact(user) || !user.can_perform_action(src, ALLOW_SILICON_REACH|FORBID_TELEKINESIS_REACH)) + if(!can_interact(user) || !user.can_perform_action(src, FORBID_TELEKINESIS_REACH|SILENT_ADJACENCY)) return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN if(brewing) return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN @@ -285,7 +285,7 @@ /obj/machinery/coffeemaker/ui_interact(mob/user) // The microwave Menu //I am reasonably certain that this is not a microwave //I am positively certain that this is not a microwave . = ..() - if(brewing || !user.can_perform_action(src, ALLOW_SILICON_REACH)) + if(brewing || !user.can_perform_action(src, SILENT_ADJACENCY)) return var/list/options = list() @@ -325,7 +325,7 @@ choice = show_radial_menu(user, src, options, require_near = !HAS_SILICON_ACCESS(user)) // post choice verification - if(brewing || (isAI(user) && machine_stat & NOPOWER) || !user.can_perform_action(src, ALLOW_SILICON_REACH)) + if(brewing || (isAI(user) && machine_stat & NOPOWER) || !user.can_perform_action(src, SILENT_ADJACENCY)) return switch(choice)