From 3ae2397d9fc6d71450201775f3e409802b2f0c95 Mon Sep 17 00:00:00 2001
From: Bjorn Neergaard <bjorn@neersighted.com>
Date: Tue, 19 Jan 2016 17:02:59 -0600
Subject: [PATCH] Fix interacting with intercoms as AI

---
 code/game/objects/items.dm                        |  4 +---
 code/game/objects/items/devices/radio/intercom.dm |  5 ++++-
 code/game/objects/items/devices/radio/radio.dm    | 10 ----------
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 62c9550db52..2bd4df13dec 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -223,15 +223,13 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s
 
 
 /obj/item/attack_self(mob/user)
-	if(!user)
-		return
-	add_fingerprint(user)
 	interact(user)
 
 /obj/item/interact(mob/user)
 	if(hidden_uplink && hidden_uplink.active)
 		hidden_uplink.interact(user)
 		return 1
+	add_fingerprint(user)
 	ui_interact(user)
 
 /obj/item/attack_hand(mob/user)
diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm
index cb2c7001513..5f5fe78ef4e 100644
--- a/code/game/objects/items/devices/radio/intercom.dm
+++ b/code/game/objects/items/devices/radio/intercom.dm
@@ -18,8 +18,11 @@
 	SSobj.processing -= src
 	return ..()
 
+/obj/item/device/radio/intercom/attack_ai(mob/user)
+	interact(user)
+
 /obj/item/device/radio/intercom/attack_hand(mob/user)
-	attack_self(user)
+	interact(user)
 
 /obj/item/device/radio/intercom/interact(mob/user)
 	..()
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index ef57814725e..94a64505989 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -99,12 +99,6 @@
 	keyslot = null
 	return ..()
 
-/obj/item/device/radio/MouseDrop(obj/over_object, src_location, over_location)
-	var/mob/M = usr
-	if((!istype(over_object, /obj/screen)) && src.loc == M)
-		return attack_self(M)
-	return
-
 /obj/item/device/radio/initialize()
 	frequency = sanitize_frequency(frequency, freerange)
 	set_frequency(frequency)
@@ -545,15 +539,11 @@
 	set_frequency(SYND_FREQ)
 
 /obj/item/device/radio/borg/attackby(obj/item/weapon/W, mob/user, params)
-//	..()
-	user.set_machine(src)
 	if (!( istype(W, /obj/item/weapon/screwdriver) || (istype(W, /obj/item/device/encryptionkey/ ))))
 		return
 
 	if(istype(W, /obj/item/weapon/screwdriver))
 		if(keyslot)
-
-
 			for(var/ch_name in channels)
 				SSradio.remove_object(src, radiochannels[ch_name])
 				secure_radio_connections[ch_name] = null