From 3a93b7e75ad513481075f93a6b0361773166e6f6 Mon Sep 17 00:00:00 2001
From: oranges <email@oranges.net.nz>
Date: Mon, 26 Mar 2018 20:29:45 +1300
Subject: [PATCH] Fixes consoles

---
 code/game/machinery/computer/medical.dm        | 9 +++++++--
 code/modules/research/machinery/_production.dm | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm
index f2a6353d8a..11138a8ee2 100644
--- a/code/game/machinery/computer/medical.dm
+++ b/code/game/machinery/computer/medical.dm
@@ -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)
diff --git a/code/modules/research/machinery/_production.dm b/code/modules/research/machinery/_production.dm
index 3c5f09a978..6810b3a821 100644
--- a/code/modules/research/machinery/_production.dm
+++ b/code/modules/research/machinery/_production.dm
@@ -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)