Merge branch 'master' into reagentToDefines

code/modules/admin/admin_verb_lists_vr.dm

@@ -196,7 +196,8 @@ var/list/admin_verbs_spawn = list(
 	/client/proc/create_gm_message,
 	/client/proc/remove_gm_message,
 	/client/proc/AdminCreateVirus,
-	/client/proc/ReleaseVirus
+	/client/proc/ReleaseVirus,
+	/client/proc/spawn_reagent
 	)
 
 var/list/admin_verbs_server = list(
@@ -283,7 +284,8 @@ var/list/admin_verbs_debug = list(
 	/client/proc/admin_give_modifier,
 	/client/proc/simple_DPS,
 	/datum/admins/proc/view_feedback,
-	/client/proc/stop_sounds
+	/client/proc/stop_sounds,
+	/client/proc/spawn_reagent
 	)
 
 var/list/admin_verbs_paranoid_debug = list(

code/modules/admin/admin_verbs.dm

@@ -535,3 +535,18 @@
 	set category = "Debug.Misc"
 
 	src.stat_panel.send_message("create_debug")
+
+/client/proc/spawn_reagent()
+	set name = "Spawn Reagent"
+	set category = "Debug.Game"
+
+	if(!check_rights(R_ADMIN|R_EVENT))	return
+	var/datum/reagent/R = tgui_input_list(usr, "Select a reagent to spawn", "Reagent Spawner", subtypesof(/datum/reagent))
+	if(!R)
+		return
+
+	var/obj/item/reagent_containers/glass/bottle/B = new(usr.loc)
+
+	B.icon_state = "bottle-1"
+	B.reagents.add_reagent(R.id, 60)
+	B.name = "[B.name] of [R.name]"

code/modules/admin/verbs/randomverbs.dm

@@ -662,12 +662,14 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	//New message handling
 	post_comm_message(customname, replacetext(input, "\n", "<br/>"))
 
-	switch(tgui_alert(usr, "Should this be announced to the general population?","Show world?",list("Yes","No")))
-		if("Yes")
-			command_announcement.Announce(input, customname, new_sound = 'sound/AI/commandreport.ogg', msg_sanitized = 1);
-		if("No")
-			to_world(span_red("New [using_map.company_name] Update available at all communication consoles."))
-			world << sound('sound/AI/commandreport.ogg')
+	var/confirm = tgui_alert(usr, "Should this be announced to the general population?","Show world?",list("Yes","No"))
+	if(!confirm)
+		return
+	if(confirm == "Yes")
+		command_announcement.Announce(input, customname, new_sound = 'sound/AI/commandreport.ogg', msg_sanitized = 1);
+	else
+		to_world(span_red("New [using_map.company_name] Update available at all communication consoles."))
+		world << sound('sound/AI/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)