Fixes consoles

This commit is contained in:
oranges
2018-03-26 20:29:45 +13:00
committed by CitadelStationBot
parent 3e25c34dbc
commit 3a93b7e75a
2 changed files with 8 additions and 3 deletions
+7 -2
View File
@@ -34,12 +34,17 @@
else
return ..()
<<<<<<< HEAD
/obj/machinery/computer/med_data/attack_hand(mob/user)
if(..())
return
=======
/obj/machinery/computer/med_data/ui_interact(mob/user)
. = ..()
>>>>>>> a27f102... Merge pull request #36695 from kevinz000/fix_9
var/dat
if(src.temp)
dat = text("<TT>[src.temp]</TT><BR><BR><A href='?src=[REF(src)];temp=1'>Clear Screen</A>")
if(temp)
dat = text("<TT>[temp]</TT><BR><BR><A href='?src=[REF(src)];temp=1'>Clear Screen</A>")
else
dat = text("Confirm Identity: <A href='?src=[REF(src)];scan=1'>[]</A><HR>", (src.scan ? text("[]", src.scan.name) : "----------"))
if(src.authenticated)
@@ -50,7 +50,7 @@
/obj/machinery/rnd/production/attack_hand(mob/user)
interact(user) //remove this snowflake shit when the refactor of storage components or some other pr that unsnowflakes attack_hand on machinery is in
/obj/machinery/rnd/production/interact(mob/user)
/obj/machinery/rnd/production/ui_interact(mob/user)
if(!consoleless_interface)
return ..()
user.set_machine(src)