Admin interaction update

This commit is contained in:
Markolie
2017-02-08 23:27:08 +01:00
parent 9127d07b4e
commit 4a155bfb50
20 changed files with 701 additions and 643 deletions
+4 -1
View File
@@ -207,6 +207,9 @@
/obj/machinery/biogenerator/attack_hand(mob/user)
interact(user)
/obj/machinery/biogenerator/attack_ghost(mob/user)
interact(user)
/obj/machinery/biogenerator/proc/activate()
if(usr.stat != 0)
@@ -302,7 +305,7 @@
/obj/machinery/biogenerator/Topic(href, href_list)
if(..() || panel_open)
return
return 1
usr.set_machine(src)
+4 -4
View File
@@ -90,6 +90,9 @@
if(..())
return
interact(user)
/obj/machinery/plantgenes/attack_ghost(mob/user)
interact(user)
/obj/machinery/plantgenes/interact(mob/user)
user.set_machine(src)
@@ -97,9 +100,6 @@
return
var/datum/browser/popup = new(user, "plantdna", "Plant DNA Manipulator", 450, 600)
if(!(in_range(src, user) || issilicon(user)))
popup.close()
return
var/dat = ""
@@ -216,7 +216,7 @@
/obj/machinery/plantgenes/Topic(var/href, var/list/href_list)
if(..())
return
return 1
usr.set_machine(src)
if(href_list["eject_seed"] && !operation)
+7 -3
View File
@@ -124,12 +124,16 @@
src.amount = am
/obj/machinery/seed_extractor/attack_hand(mob/user)
user.set_machine(src)
interact(user)
/obj/machinery/seed_extractor/attack_ghost(mob/user)
interact(user)
/obj/machinery/seed_extractor/interact(mob/user)
if (stat)
if(stat)
return 0
user.set_machine(src)
var/dat = "<b>Stored seeds:</b><br>"
@@ -149,7 +153,7 @@
/obj/machinery/seed_extractor/Topic(var/href, var/list/href_list)
if(..())
return
return 1
usr.set_machine(src)
href_list["li"] = text2num(href_list["li"])