From d96e6a08b090eaef78bf151c3e4c13336dc830ae Mon Sep 17 00:00:00 2001 From: "ericgfwong@hotmail.com" Date: Mon, 16 Jul 2012 20:23:01 +0000 Subject: [PATCH] Merged classified report button with the regular command report button. It now asks if you want to announce it to the crew or not. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4093 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/admin/admin_verbs.dm | 2 - code/modules/admin/verbs/randomverbs.dm | 51 +++++++++---------------- 2 files changed, 19 insertions(+), 34 deletions(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index ca7a4139be0..0ad36834603 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -152,7 +152,6 @@ verbs += /obj/admins/proc/restart //restart verbs += /client/proc/cmd_admin_check_contents verbs += /client/proc/cmd_admin_create_centcom_report - verbs += /client/proc/cmd_admin_classified_centcom_report verbs += /client/proc/toggle_hear_deadcast verbs += /client/proc/toggle_hear_radio verbs += /client/proc/deadmin_self @@ -366,7 +365,6 @@ verbs -= /client/proc/stealth verbs -= /client/proc/cmd_admin_check_contents verbs -= /client/proc/cmd_admin_create_centcom_report - verbs -= /client/proc/cmd_admin_classified_centcom_report verbs -= /client/proc/deadchat //toggles deadchat //verbs -= /client/proc/cmd_admin_mute --was never used (according to stats trackind) - use show player panel --erro verbs -= /client/proc/cmd_admin_pm_context diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index c772ce5ccdf..66d33b5bead 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -556,45 +556,32 @@ Traitors and the like can also be revived with the previous role mostly intact. var/input = input(usr, "Please enter anything you want. Anything. Serious.", "What?", "") as message|null if(!input) return - 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) - command_alert(input); + 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) 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! -/client/proc/cmd_admin_classified_centcom_report() - set category = "Special Verbs" - set name = "Create Classified Report" - if(!holder) - src << "Only administrators may use this command." - return - var/input = input(usr, "What do you want to say to the command staff?", "What?", "") as message|null - if(!input) - return - 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) - - command_alert("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message"); - - world << sound('commandreport.ogg') - log_admin("[key_name(src)] has created a classified command report: [input]") - message_admins("[key_name_admin(src)] has created a classified command report", 1) - feedback_add_details("admin_verb","CCCR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - /client/proc/cmd_admin_delete(atom/O as obj|mob|turf in world) set category = "Admin" set name = "Delete"