cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 08:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix coffee maker items teleporting to AI/Cyborg locations (#88140)

Browse Source 
## 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
🆑
fix: Fix coffee maker items teleporting to AI/Cyborg locations
/🆑
This commit is contained in:
Tim
2024-11-24 20:48:45 +01:00
committed by GitHub
parent 112ca30d51
commit bdc325f543
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/machinery/coffeemaker.dm
+3 -3
View File
@@ -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)