GODDAMN WHOEVER MAPPED THAT

Also: Added dossier removal to detective comp
Removed extraneous quotes from radio alerts
Altered command channel.

code/WorkInProgress/detective_work.dm

@@ -238,6 +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=databaseprint;identifier=[href_list["identifier"]]'>{Print}</a>"
 				temp += "<br><a href='?src=\ref[src];operation=database'>{Return}</a>"
 			if("databaseprint")
@@ -304,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=database;delete=[href_list["identifier"]]'>{Delete This Record}</a>"
+				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=auxiliaryprint;identifier=[href_list["identifier"]]'>{Print}</a>"
 				temp += "<br><a href='?src=\ref[src];operation=database'>{Return}</a>"
 			if("auxiliaryprint")
@@ -336,7 +337,11 @@ obj/machinery/computer/forensic_scanning
 				else
 					usr << "ERROR.  Database not found!<br>"
 			if("scan")
-				if(scanning)
+				if(istype(scanning,/obj/item/weapon/f_card))
+					card = scanning
+					scanning = initial(scanning)
+					process_card()
+				else if(scanning)
 					scan_process = 3
 					scan_data = "Scanning [scanning]: 25% complete"
 					updateDialog()
@@ -422,6 +427,8 @@ obj/machinery/computer/forensic_scanning
 					temp = "Print Failed: No Data"
 			if("erase")
 				scan_data = ""
+			if("delete")
+				delete_dossier(text2num(href_list["identifier"]))
 			if("cancel")
 				scan_process = 0
 			if("add")
@@ -644,6 +651,16 @@ obj/machinery/computer/forensic_scanning
 	proc/get_name(var/atom/A)
 		return A.name
 
+	proc/delete_dossier(var/location)
+		if(files && files.len)
+			if(files.len < location)
+				for(var/i = location, i < files.len, i++)
+					files[i] = files[i + 1]
+			if(files.len <= location)
+				files[files.len] = list()
+				files.len--
+		return
+
 	detective
 		icon_state = "old"
 		name = "PowerScan Mk.I"

code/game/machinery/telecomms/broadcaster.dm

@@ -346,7 +346,9 @@ var
 		// --- Filter the message; place it in quotes apply a verb ---
 
 		var/quotedmsg = "\"" + message + "\""
-		if(M)
+		if(job == "Automated Announcement")
+			quotedmsg = message
+		else if(M)
 			quotedmsg = M.say_quote(message)
 
 		// --- This following recording is intended for research and feedback in the use of department radio channels ---

code/game/objects/devices/scanners.dm

@@ -137,6 +137,9 @@ MASS SPECTROMETER
 			return
 		if(src.loc != user)
 			return 0
+		if(istype(A,/obj/item/weapon/f_card))
+			user << "Haha, nice try.  Cheater.  (It would break stuff anyways.)"
+			return
 		src.add_fingerprint(user)
 		if (istype(A, /obj/effect/decal/cleanable/blood) || istype(A, /obj/effect/rune))
 			if(!isnull(A.blood_DNA.len))

code/game/objects/items/weapons/implants/implant.dm

@@ -283,7 +283,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
 		if(M.stat == 2)
 			var/turf/t = get_turf(M)
 			var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset(null)
-			a.autosay("[mobname] has died in [t.loc.name]!", "[mobname]'s Death Alarm")
+			a.autosay("states, \"[mobname] has died in [t.loc.name]!\"", "[mobname]'s Death Alarm")
 			del(a)
 			processing_objects.Remove(src)
 

code/game/specops_shuttle.dm

@@ -26,7 +26,7 @@ var/specops_shuttle_timeleft = 0
 	announcer.config(list("Response Team" = 0))
 
 	var/message_tracker[] = list(0,1,2,3,5,10,30,45)//Create a a list with potential time values.
-	var/message = "THE SPECIAL OPERATIONS SHUTTLE IS PREPARING TO RETURN"//Initial message shown.
+	var/message = "\"THE SPECIAL OPERATIONS SHUTTLE IS PREPARING TO RETURN\""//Initial message shown.
 	if(announcer)
 		announcer.autosay(message, "A.L.I.C.E.", "Response Team")
 
@@ -41,9 +41,9 @@ var/specops_shuttle_timeleft = 0
 		if(announcer)
 			var/rounded_time_left = round(specops_shuttle_timeleft)//Round time so that it will report only once, not in fractions.
 			if(rounded_time_left in message_tracker)//If that time is in the list for message announce.
-				message = "ALERT: [rounded_time_left] SECOND[(rounded_time_left!=1)?"S":""] REMAIN"
+				message = "\"ALERT: [rounded_time_left] SECOND[(rounded_time_left!=1)?"S":""] REMAIN\""
 				if(rounded_time_left==0)
-					message = "ALERT: TAKEOFF"
+					message = "\"ALERT: TAKEOFF\""
 				announcer.autosay(message, "A.L.I.C.E.", "Response Team")
 				message_tracker -= rounded_time_left//Remove the number from the list so it won't be called again next cycle.
 				//Should call all the numbers but lag could mean some issues. Oh well. Not much I can do about that.
@@ -93,11 +93,11 @@ var/specops_shuttle_timeleft = 0
 	announcer.config(list("Response Team" = 0))
 
 	var/message_tracker[] = list(0,1,2,3,5,10,30,45)//Create a a list with potential time values.
-	var/message = "THE SPECIAL OPERATIONS SHUTTLE IS PREPARING FOR LAUNCH"//Initial message shown.
+	var/message = "\"THE SPECIAL OPERATIONS SHUTTLE IS PREPARING FOR LAUNCH\""//Initial message shown.
 	if(announcer)
 		announcer.autosay(message, "A.L.I.C.E.", "Response Team")
-		message = "ARMORED SQUAD TAKE YOUR POSITION ON GRAVITY LAUNCH PAD"
-		announcer.autosay(message, "A.L.I.C.E.", "Response Team")
+//		message = "ARMORED SQUAD TAKE YOUR POSITION ON GRAVITY LAUNCH PAD"
+//		announcer.autosay(message, "A.L.I.C.E.", "Response Team")
 
 	while(specops_shuttle_time - world.timeofday > 0)
 		var/ticksleft = specops_shuttle_time - world.timeofday
@@ -110,9 +110,9 @@ var/specops_shuttle_timeleft = 0
 		if(announcer)
 			var/rounded_time_left = round(specops_shuttle_timeleft)//Round time so that it will report only once, not in fractions.
 			if(rounded_time_left in message_tracker)//If that time is in the list for message announce.
-				message = "ALERT: [rounded_time_left] SECOND[(rounded_time_left!=1)?"S":""] REMAIN"
+				message = "\"ALERT: [rounded_time_left] SECOND[(rounded_time_left!=1)?"S":""] REMAIN\""
 				if(rounded_time_left==0)
-					message = "ALERT: TAKEOFF"
+					message = "\"ALERT: TAKEOFF\""
 				announcer.autosay(message, "A.L.I.C.E.", "Response Team")
 				message_tracker -= rounded_time_left//Remove the number from the list so it won't be called again next cycle.
 				//Should call all the numbers but lag could mean some issues. Oh well. Not much I can do about that.

code/modules/mob/new_player/new_player.dm

@@ -274,7 +274,7 @@
 	proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank)
 		if (ticker.current_state == GAME_STATE_PLAYING)
 			var/obj/item/device/radio/intercom/a = new /obj/item/device/radio/intercom(null)
-			a.autosay("[character.real_name],[character.wear_id.assignment ? " [character.wear_id.assignment]," : "" ] has arrived on the station.", "Arrivals Announcement Computer")
+			a.autosay("\"[character.real_name],[character.wear_id.assignment ? " [character.wear_id.assignment]," : "" ] has arrived on the station.\"", "Arrivals Announcement Computer")
 			del(a)
 
 

code/modules/power/singularity/field_generator.dm

@@ -334,7 +334,7 @@ field_generator power level display
 				containment_fail_announced = 1
 				var/obj/item/device/radio/a = new /obj/item/device/radio(null)
 				a.config(list("Engineering" = 0))
-				a.autosay("DANGER!  Field failure detected!  Immediate response advised!", "Singularity Monitoring Computer", "department")
+				a.autosay("\"DANGER!  Field failure detected!  Immediate response advised!\"", "Singularity Monitoring Computer", "department")
 				del(a)
 				spawn(6000)	//10 minutes.
 					containment_fail_announced = 0

code/stylesheet.dm

@@ -94,8 +94,7 @@ h1, h2, h3, h4, h5, h6
 
 .comradio
 {
-	color:#FF9900;
-	text-decoration: underline;
+	color:#885500;
 }
 
 .syndradio