From 221c059435eaaf372021ed8f836e72d21327633a Mon Sep 17 00:00:00 2001 From: SandPoot Date: Wed, 10 Mar 2021 01:34:25 -0300 Subject: [PATCH] there's gonna be so many commit logs. hopefully this is the last. --- code/game/machinery/telecomms/machine_interactions.dm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index ce18fcc28e..9876206724 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -244,9 +244,7 @@ // Check if the user can use it. /obj/machinery/telecomms/proc/canInteract(mob/user) var/obj/item/I = user.get_active_held_item() - if(!I) - return FALSE - if(!issiliconoradminghost(user)) + if(!issilicon(user) && I) if(I.tool_behaviour == TOOL_MULTITOOL) return TRUE if(hasSiliconAccessInArea(user)) @@ -265,13 +263,13 @@ return null var/obj/item/P = user.get_active_held_item() // Is the ref not a null? and is it the actual type? - if(!P) - return null if(isAI(user)) var/mob/living/silicon/ai/U = user P = U.aiMulti else if(iscyborg(user) && !in_range(user, src)) return null + if(!P) + return null else if(P.tool_behaviour == TOOL_MULTITOOL) return P return P