Fixes interaction AI stuff

This commit is contained in:
kevinz000
2018-04-11 12:10:03 -07:00
committed by CitadelStationBot
parent 4063781baf
commit 9da197469b
7 changed files with 152 additions and 29 deletions
+2 -10
View File
@@ -35,11 +35,7 @@
desc = "Used to upload laws to the AI."
circuit = /obj/item/circuitboard/computer/aiupload
/obj/machinery/computer/upload/ai/attack_hand(mob/user)
. = ..()
if(.)
return
/obj/machinery/computer/upload/ai/interact(mob/user)
src.current = select_active_ai(user)
if (!src.current)
@@ -60,11 +56,7 @@
desc = "Used to upload laws to Cyborgs."
circuit = /obj/item/circuitboard/computer/borgupload
/obj/machinery/computer/upload/borg/attack_hand(mob/user)
. = ..()
if(.)
return
/obj/machinery/computer/upload/borg/interact(mob/user)
src.current = select_active_free_borg(user)
if(!src.current)
+4
View File
@@ -14,6 +14,7 @@
flags_1 = ON_BORDER_1
opacity = 0
CanAtmosPass = ATMOS_PASS_PROC
interaction_flags_machine = INTERACT_MACHINE_WIRES_IF_OPEN | INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OPEN_SILICON | INTERACT_MACHINE_REQUIRES_SILICON | INTERACT_MACHINE_OPEN
var/obj/item/electronics/airlock/electronics = null
var/reinf = 0
var/shards = 2
@@ -277,6 +278,9 @@
return
return ..()
/obj/machinery/door/window/interact(mob/user) //for sillycones
try_to_activate_door(user)
/obj/machinery/door/window/try_to_crowbar(obj/item/I, mob/user)
if(!hasPower())
if(density)
@@ -58,10 +58,7 @@
door = I
break
/obj/machinery/doorButtons/access_button/attack_hand(mob/user)
. = ..()
if(.)
return
/obj/machinery/doorButtons/access_button/interact(mob/user)
if(busy)
return
if(!allowed(user))
@@ -260,10 +257,7 @@
else
icon_state = "access_control_standby"
/obj/machinery/doorButtons/airlock_controller/attack_hand(mob/user)
. = ..()
if(.)
return
/obj/machinery/doorButtons/airlock_controller/ui_interact(mob/user)
var/datum/browser/popup = new(user, "computer", name)
popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
popup.set_content(returnText())
+1 -4
View File
@@ -234,10 +234,7 @@
anchored = TRUE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
/obj/machinery/shower/attack_hand(mob/M)
. = ..()
if(.)
return
/obj/machinery/shower/interact(mob/M)
on = !on
update_icon()
add_fingerprint(M)