shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes consoles

Browse Source
This commit is contained in:
oranges
2018-03-26 02:30:18 -05:00
committed by CitadelStationBot
parent 3e25c34dbc
commit 3a93b7e75a
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/medical.dm
+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)