diff --git a/code/_helpers/logging.dm b/code/_helpers/logging.dm index abde26b220..56f2882957 100644 --- a/code/_helpers/logging.dm +++ b/code/_helpers/logging.dm @@ -34,7 +34,6 @@ admin_log.Add(text) if (config.log_admin) WRITE_LOG(diary, "ADMINPM: [key_name(source)]->[key_name(dest)]: [html_decode(text)]") - world.TgsTargetedChatBroadcast("ADMINPM: [key_name(source)]->[key_name(dest)]: [html_decode(text)]", TRUE) //CHOMPEdit, bot shows all adminpms now /proc/log_debug(text) if (config.log_debug) diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index c9aabc4749..fb08501bea 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -190,9 +190,9 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) var/list/activemins = adm["present"] var activeMins = activemins.len if(is_bwoink) - world.TgsTargetedChatBroadcast("ADMINHELP: FROM: [key_name_admin(usr)] TO [initiator_ckey]/[initiator_key_name] - MSG: **[msg]** - Heard by [activeMins] NON-AFK staff members.", TRUE) + world.TgsChatBroadcast("ADMINHELP: FROM: [key_name_admin(usr)] TO [initiator_ckey]/[initiator_key_name] - MSG: **[msg]** - Heard by [activeMins] NON-AFK staff members.", list("814243638800416799")) //CHOMPEdit else - world.TgsTargetedChatBroadcast("ADMINHELP: FROM: [initiator_ckey]/[initiator_key_name] - MSG: **[msg]** - Heard by [activeMins] NON-AFK staff members.", TRUE) + world.TgsChatBroadcast("ADMINHELP: FROM: [initiator_ckey]/[initiator_key_name] - MSG: **[msg]** - Heard by [activeMins] NON-AFK staff members.", list("814243638800416799")) //CHOMPEdit //YW EDIT END GLOB.ahelp_tickets.active_tickets += src @@ -203,7 +203,9 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) return ..() /datum/admin_help/proc/AddInteraction(formatted_message) - _interactions += "[gameTimestamp()]: [formatted_message]" + var/curinteraction = "[gameTimestamp()]: [formatted_message]" + world.TgsChatBroadcast("ADMINHELP: TICKETID:[id] [strip_html_properly(curinteraction)]", list("814243638800416799")) //CHOMPEdit + _interactions += curinteraction //private /datum/admin_help/proc/FullMonty(ref_src) diff --git a/code/modules/paperwork/faxmachine_vr.dm b/code/modules/paperwork/faxmachine_vr.dm index dbca4ca8d2..07f1c34f9e 100644 --- a/code/modules/paperwork/faxmachine_vr.dm +++ b/code/modules/paperwork/faxmachine_vr.dm @@ -6,12 +6,12 @@ * If the fax is a paper_bundle, do so recursively for each page. * returns a random unique faxid. */ -/obj/machinery/photocopier/faxmachine/proc/export_fax(fax) - var faxid = "[num2text(world.realtime,12)]_[rand(10000)]" +/obj/machinery/photocopier/faxmachine/proc/export_fax(fax) //CHOMPEdit Begin + var faxid = "[num2text(world.realtime,12)]_[rand(9999)+1]" if (istype(fax, /obj/item/weapon/paper)) var/obj/item/weapon/paper/P = fax var/text = "[P.name][P.info][P.stamps]"; - file("[config.fax_export_dir]/fax_[faxid].html") << text; + rustg_file_write(text, "[config.fax_export_dir]/fax_[faxid].html") else if (istype(fax, /obj/item/weapon/photo)) var/obj/item/weapon/photo/H = fax fcopy(H.img, "[config.fax_export_dir]/photo_[faxid].png") @@ -20,18 +20,36 @@ + "" \ + "[H.scribble ? "
Written on the back:
[H.scribble]" : ""]"\ + "" - file("[config.fax_export_dir]/fax_[faxid].html") << text + rustg_file_write(text, "[config.fax_export_dir]/fax_[faxid].html") else if (istype(fax, /obj/item/weapon/paper_bundle)) + var/def_faxid = faxid + faxid += "_0" var/obj/item/weapon/paper_bundle/B = fax var/data = "" for (var/page = 1, page <= B.pages.len, page++) var/obj/pageobj = B.pages[page] - var/page_faxid = export_fax(pageobj) + var/page_faxid = export_fax_id(pageobj,def_faxid + "_[page]") data += "Page [page] - [pageobj.name]
" var/text = "[B.name][data]" - file("[config.fax_export_dir]/fax_[faxid].html") << text + rustg_file_write(text, "[config.fax_export_dir]/fax_[faxid].html") return faxid +/obj/machinery/photocopier/faxmachine/proc/export_fax_id(fax,faxid) + if (istype(fax, /obj/item/weapon/paper)) + var/obj/item/weapon/paper/P = fax + var/text = "[P.name][P.info][P.stamps]"; + rustg_file_write(text, "[config.fax_export_dir]/fax_[faxid].html") + else if (istype(fax, /obj/item/weapon/photo)) + var/obj/item/weapon/photo/H = fax + fcopy(H.img, "[config.fax_export_dir]/photo_[faxid].png") + var/text = "[H.name]" \ + + "" \ + + "" \ + + "[H.scribble ? "
Written on the back:
[H.scribble]" : ""]"\ + + "" + rustg_file_write(text, "[config.fax_export_dir]/fax_[faxid].html") + return faxid +//CHOMPEdit End /** * Call the chat webhook to transmit a notification of an admin fax to the admin chat. */ @@ -47,8 +65,17 @@ query_string += "&sentname=[url_encode(sent.name)]" world.Export("[config.chat_webhook_url]?[query_string]") //YW EDIT //CHOMPEdit also - var/faxmsg = return_file_text("[config.fax_export_dir]/fax_[faxid].html") - world.TgsTargetedChatBroadcast("FAX: [sanitize(faxname)] / [sanitize(sent.name)] - SENT BY: [sanitize(sender.name)] - FAXID: **[sanitize(faxid)]** \n FAX: ```[strip_html_properly(faxmsg)]```", TRUE) + var/idlen = length(faxid) + 1 + if (istype(sent, /obj/item/weapon/paper_bundle)) + var/obj/item/weapon/paper_bundle/B = sent + faxid = copytext(faxid,1,idlen-2) + var/faxids = "FAXMULTIID: [faxid]_0" + for(var/page = 1, page <= B.pages.len, page++) + faxids+= "|[faxid]_[page]" + world.TgsTargetedChatBroadcast("MULTIFAX: [sanitize(faxname)] / [sanitize(sent.name)] - SENT BY: [sanitize(sender.name)] - [faxids]", TRUE) + + + world.TgsTargetedChatBroadcast("FAX: [sanitize(faxname)] / [sanitize(sent.name)] - SENT BY: [sanitize(sender.name)] - FAXID: **[sanitize(faxid)]**", TRUE) //YW EDIT END //