From 6e7dfc4ca693b440b60c29dc4fed1ac321a94ee4 Mon Sep 17 00:00:00 2001
From: SkyMarshal <joehe.inemeyer@gmail.com>
Date: Sat, 18 Feb 2012 01:53:26 -0700
Subject: [PATCH] More fixes

---
 code/WorkInProgress/detective_work.dm | 6 ++++--
 code/modules/admin/verbs/adminhelp.dm | 1 -
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/code/WorkInProgress/detective_work.dm b/code/WorkInProgress/detective_work.dm
index 5cd8555124b..402fa2c13dc 100644
--- a/code/WorkInProgress/detective_work.dm
+++ b/code/WorkInProgress/detective_work.dm
@@ -238,7 +238,7 @@ obj/machinery/computer/forensic_scanning
 							temp += "&nbsp;&nbsp;&nbsp;&nbsp;No blood found.<br>"
 				else
 					temp = "ERROR.  Database not found!<br>"
-				temp += "<br><a href='?src=\ref[src];operation=databaseprint;delete=[href_list["identifier"]]'>{delete}</a>"
+				temp += "<br><a href='?src=\ref[src];operation=delete;identifier=[href_list["identifier"]]'>{delete}</a>"
 				temp += "<br><a href='?src=\ref[src];operation=databaseprint;identifier=[href_list["identifier"]]'>{Print}</a>"
 				temp += "<br><a href='?src=\ref[src];operation=database'>{Return}</a>"
 			if("databaseprint")
@@ -305,7 +305,7 @@ obj/machinery/computer/forensic_scanning
 						temp += "&nbsp;&nbsp;&nbsp;&nbsp;No blood found.<br>"
 				else
 					temp = "ERROR.  Database not found!<br>"
-				temp += "<br><a href='?src=\ref[src];operation=delete;identifier=[href_list["identifier"]]'>{Delete This Record}</a>"
+				temp += "<br><a href='?src=\ref[src];operation=delete_aux;identifier=[href_list["identifier"]]'>{Delete This Record}</a>"
 				temp += "<br><a href='?src=\ref[src];operation=auxiliaryprint;identifier=[href_list["identifier"]]'>{Print}</a>"
 				temp += "<br><a href='?src=\ref[src];operation=database'>{Return}</a>"
 			if("auxiliaryprint")
@@ -427,6 +427,8 @@ obj/machinery/computer/forensic_scanning
 					temp = "Print Failed: No Data"
 			if("erase")
 				scan_data = ""
+			if("delete_aux")
+				delete_record(text2num(href_list["identifier"]))
 			if("delete")
 				delete_dossier(text2num(href_list["identifier"]))
 			if("cancel")
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index 860d44cae7c..bf134463e4c 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -21,7 +21,6 @@
 
 	var/list/replacechars = list("'" = "","\"" = "",">" = "","<" = "","(" = "",")" = "")
 	msg = sanitize_simple(msg, replacechars)
-	world << msg
 	send2adminirc("#bs12admin","HELP: \"[src.key]: [msg]\"")
 	if(tension_master)
 		tension_master.new_adminhelp()