From 16c18df2d1f1921971da7be6b1446a16d72fe4cd Mon Sep 17 00:00:00 2001
From: Erthilo <erthilo@gmail.com>
Date: Mon, 3 Sep 2012 01:30:20 +0100
Subject: [PATCH] Merged rag smothering, increased cyborg slots, command report
 titles.

---
 code/game/jobs/job/silicon.dm                 |  2 +-
 .../DetectiveWork/footprints_and_rag.dm       |  2 +-
 code/modules/admin/verbs/randomverbs.dm       | 37 +++++++++----------
 .../detectivework/footprints_and_rag.dm       |  2 +-
 4 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/code/game/jobs/job/silicon.dm b/code/game/jobs/job/silicon.dm
index 1b608e200dc..9cec53ba201 100644
--- a/code/game/jobs/job/silicon.dm
+++ b/code/game/jobs/job/silicon.dm
@@ -21,7 +21,7 @@
 	department_flag = ENGSEC
 	faction = "Station"
 	total_positions = 0
-	spawn_positions = 1
+	spawn_positions = 2
 	supervisors = "your laws and the AI"	//Nodrak
 	selection_color = "#ddffdd"
 
diff --git a/code/modules/DetectiveWork/footprints_and_rag.dm b/code/modules/DetectiveWork/footprints_and_rag.dm
index 9b3fa77c556..4aceed22ec0 100644
--- a/code/modules/DetectiveWork/footprints_and_rag.dm
+++ b/code/modules/DetectiveWork/footprints_and_rag.dm
@@ -178,7 +178,7 @@ proc/blood_incompatible(donor,receiver)
 	attack(atom/target as obj|turf|area, mob/user as mob , flag)
 		if(ismob(target) && target.reagents && reagents.total_volume)
 			user.visible_message("\red \The [target] has been smothered with \the [src] by \the [user]!", "\red You smother \the [target] with \the [src]!", "You hear some struggling and muffled cries of surprise")
-			src.reagents.reaction(target, TOUCH)
+			src.reagents.reaction(target, INGEST)
 			spawn(5) src.reagents.clear_reagents()
 			return
 		else
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 733e6728faf..44b8cfa543d 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -506,30 +506,27 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		src << "Only administrators may use this command."
 		return
 	var/input = input(usr, "Please enter anything you want. Anything. Serious.", "What?", "") as message|null
+	var/customname = input(usr, "Pick a title for the report.", "Title") as text|null
 	if(!input)
 		return
+	if(!customname)
+		customname = "NanoTrasen Update"
+	for (var/obj/machinery/computer/communications/C in machines)
+		if(! (C.stat & (BROKEN|NOPOWER) ) )
+			var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( C.loc )
+			P.name = "'[command_name()] Update.'"
+			P.info = input
+			P.update_icon()
+			C.messagetitle.Add("[command_name()] Update")
+			C.messagetext.Add(P.info)
 
-	var/confirm = alert(src, "Do you want to announce the contents of the report to the crew?", "Announce", "Yes", "No")
-	if(confirm == "Yes")
-		command_alert(input);
-		for (var/obj/machinery/computer/communications/C in machines)
-			if(! (C.stat & (BROKEN|NOPOWER) ) )
-				var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( C.loc )
-				P.name = "paper- '[command_name()] Update.'"
-				P.info = input
-				C.messagetitle.Add("[command_name()] Update")
-				C.messagetext.Add(P.info)
-	else
-		command_alert("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message");
-		for (var/obj/machinery/computer/communications/C in machines)
-			if(! (C.stat & (BROKEN|NOPOWER) ) )
-				var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( C.loc )
-				P.name = "paper- 'Classified [command_name()] Update.'"
-				P.info = input
-				C.messagetitle.Add("Classified [command_name()] Update")
-				C.messagetext.Add(P.info)
+	switch(alert("Should this be announced to the general population?",,"Yes","No"))
+		if("Yes")
+			command_alert(input, maintitle=customname);
+		if("No")
+			world << "\red New NanoTrasen Update available at all communication consoles."
 
-	world << sound('sound/AI/commandreport.ogg')
+	world << sound('commandreport.ogg')
 	log_admin("[key_name(src)] has created a command report: [input]")
 	message_admins("[key_name_admin(src)] has created a command report", 1)
 	feedback_add_details("admin_verb","CCR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/detectivework/footprints_and_rag.dm b/code/modules/detectivework/footprints_and_rag.dm
index b26480f2e1d..f39aca8750c 100644
--- a/code/modules/detectivework/footprints_and_rag.dm
+++ b/code/modules/detectivework/footprints_and_rag.dm
@@ -178,7 +178,7 @@ proc/blood_incompatible(donor,receiver)
 	attack(atom/target as obj|turf|area, mob/user as mob , flag)
 		if(ismob(target) && target.reagents && reagents.total_volume)
 			user.visible_message("\red \The [target] has been smothered with \the [src] by \the [user]!", "\red You smother \the [target] with \the [src]!", "You hear some struggling and muffled cries of surprise")
-			src.reagents.reaction(target, TOUCH)
+			src.reagents.reaction(target, INGEST)
 			spawn(5) src.reagents.clear_reagents()
 			return
 		else