Fix interacting with intercoms as AI

This commit is contained in:
Bjorn Neergaard
2016-01-19 17:02:59 -06:00
parent 1c34479376
commit 3ae2397d9f
3 changed files with 5 additions and 14 deletions
+1 -3
View File
@@ -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)
@@ -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)
..()
@@ -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