From 3b0ebc0b809294ab067d2fb00438109ed9cb4d12 Mon Sep 17 00:00:00 2001
From: SandPoot <enric_gabirel@hotmail.com>
Date: Wed, 10 Mar 2021 01:03:31 -0300
Subject: [PATCH] cyborgs were messed up too

---
 code/game/machinery/telecomms/machine_interactions.dm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm
index 1a07696998..54e6e83bc9 100644
--- a/code/game/machinery/telecomms/machine_interactions.dm
+++ b/code/game/machinery/telecomms/machine_interactions.dm
@@ -245,7 +245,7 @@
 /obj/machinery/telecomms/proc/canInteract(mob/user)
 	var/get = user.get_active_held_item()
 	var/obj/item/I = get
-	if(!isAI(user))
+	if(!issilicon(user))
 		if(I.tool_behaviour == TOOL_MULTITOOL)
 			return TRUE
 	if(hasSiliconAccessInArea(user))
@@ -264,14 +264,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
 	else if(P.tool_behaviour == TOOL_MULTITOOL)
 		return P
-	else if(iscyborg(user) && in_range(user, src))
-		var/get = user.get_active_held_item()
-		var/obj/item/I = get
-		if(I.tool_behaviour == TOOL_MULTITOOL)
-			I = user.get_active_held_item()
 	return P