CCIAA - Send_admin_fax() -> create_admin_fax() & Fixes

The proc create_admin_fax() now works fully, under all scenarios tested.
This commit is contained in:
skull132
2016-02-05 18:24:55 +02:00
parent 8569d1c1ab
commit 1f7f3b1751
4 changed files with 28 additions and 51 deletions
+4 -3
View File
@@ -92,8 +92,9 @@ var/list/admin_verbs_admin = list(
/client/proc/change_security_level,
/client/proc/view_chemical_reaction_logs,
/client/proc/makePAI,
/datum/admins/proc/paralyze_mob
// /datum/admins/proc/send_admin_fax
/datum/admins/proc/paralyze_mob,
/datum/admins/proc/create_admin_fax,
/client/proc/check_fax_history
)
var/list/admin_verbs_ban = list(
/client/proc/unban_panel,
@@ -310,7 +311,7 @@ var/list/admin_verbs_cciaa = list(
/client/proc/cmd_cciaa_say,
/client/proc/returntobody,
// /client/proc/view_duty_log,
// /datum/admins/proc/send_admin_fax,
/datum/admins/proc/create_admin_fax,
/client/proc/check_fax_history
)
+2 -31
View File
@@ -1397,39 +1397,10 @@
return
else if(href_list["CentcommFaxReply"])
var/mob/sender = locate(href_list["CentcommFaxReply"])
var/obj/machinery/photocopier/faxmachine/fax = locate(href_list["originfax"])
var/obj/machinery/photocopier/faxmachine/fax = locate(href_list["CentcommFaxReply"])
//todo: sanitize
var/input = input(src.owner, "Please enter a message to reply to [key_name(sender)] via secure connection. NOTE: BBCode does not work, but HTML tags do! Use <br> for line breaks.", "Outgoing message from Centcomm", "") as message|null
if(!input) return
create_admin_fax(fax.department)
var/customname = input(src.owner, "Pick a title for the report", "Title") as text|null
// Create the reply message
var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( null ) //hopefully the null loc won't cause trouble for us
P.name = "[command_name()]- [customname]"
P.info = input
P.update_icon()
// Stamps
var/image/stampoverlay = image('icons/obj/bureaucracy.dmi')
stampoverlay.icon_state = "paper_stamp-cent"
if(!P.stamped)
P.stamped = new
P.stamped += /obj/item/weapon/stamp
P.overlays += stampoverlay
P.stamps += "<HR><i>This paper has been stamped by the Central Command Quantum Relay.</i>"
if(fax.recievefax(P))
src.owner << "\blue Message reply to transmitted successfully."
log_admin("[key_name(src.owner)] replied to a fax message from [key_name(sender)]: [input]")
message_admins("[key_name_admin(src.owner)] replied to a fax message from [key_name_admin(sender)]", 1)
else
src.owner << "\red Message reply failed."
spawn(100)
qdel(P)
return
else if(href_list["SolGovFaxReply"])