diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index 0d8ffccc871..6894565f1eb 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -170,28 +170,25 @@
if(!linked_console)
dat += "Scan for R&D Console
"
if(loaded_item)
- if(recentlyExperimented)
- return
- else
- dat += "Loaded Item: [loaded_item]
"
- dat += "Technology:
"
- var/list/D = ConvertReqString2List(loaded_item.origin_tech)
- for(var/T in D)
- dat += "[T]
"
- dat += "
Available tests:"
- dat += "
Poke"
- dat += "
Irradiate"
- dat += "
Gas"
- dat += "
Burn"
- dat += "
Freeze"
- dat += "
Destroy
"
- if(istype(loaded_item,/obj/item/weapon/relic))
- dat += "
Discover
"
- dat += "
Eject"
+ dat += "Loaded Item: [loaded_item]
"
+ dat += "Technology:
"
+ var/list/D = ConvertReqString2List(loaded_item.origin_tech)
+ for(var/T in D)
+ dat += "[T]
"
+ dat += "
Available tests:"
+ dat += "
Poke"
+ dat += "
Irradiate"
+ dat += "
Gas"
+ dat += "
Burn"
+ dat += "
Freeze"
+ dat += "
Destroy
"
+ if(istype(loaded_item,/obj/item/weapon/relic))
+ dat += "
Discover
"
+ dat += "
Eject"
else
dat += "Nothing loaded."
dat += "
Refresh
"
- dat += "
Close
"
+ dat += "
Close
"
var/datum/browser/popup = new(user, "experimentor","Experimentor", 700, 400, src)
popup.set_content(dat)
popup.open()
@@ -544,8 +541,9 @@
var/scantype = href_list["function"]
var/obj/item/process = locate(href_list["item"]) in src
- if(scantype == "close")
+ if(href_list["close"])
usr << browse(null, "window=experimentor")
+ return
else if(scantype == "search")
var/obj/machinery/computer/rdconsole/D = locate(/obj/machinery/computer/rdconsole) in oview(3,src)
if(D)
@@ -571,8 +569,7 @@
for(var/T in temp_tech)
linked_console.files.UpdateTech(T, temp_tech[T])
linked_console.files.UpdateDesigns(process,process.type)
- if(scantype != "close")
- src.updateUsrDialog()
+ src.updateUsrDialog()
return
//~~~~~~~~Admin logging proc, aka the Powergamer Alarm~~~~~~~~