diff --git a/code/WorkInProgress/kilakk/fax.dm b/code/WorkInProgress/kilakk/fax.dm index 85a40eeb..a9fd533d 100644 --- a/code/WorkInProgress/kilakk/fax.dm +++ b/code/WorkInProgress/kilakk/fax.dm @@ -28,21 +28,6 @@ var/list/alldepartments = list("Central Command") if (0) return sent_faxes[id] -/datum/fax_repository/proc/get_subjects(var/received = 1) - var/list/target_list = null - switch (received) - if (1) - target_list = received_faxes - if (0) - target_list = sent_faxes - - var/list/return_list = list() - for (var/i = 1, i <= target_list.len, i++) - return_list.Add(target_list[i]["subject"]) - return_list[target_list[i]["subject"]] = i - - return return_list - /obj/machinery/faxmachine name = "fax machine" icon = 'icons/obj/library.dmi' @@ -226,6 +211,8 @@ var/list/alldepartments = list("Central Command") var/fax_id = ticker.fax_repository.add_fax(sent, sentname, Sender.name) + send_to_discord("cciaa_channel", "Received fax from [Sender], with ID [fax_id]. Subject: [sentname].") + for(var/client/C in admins) var/msg = "\blue CENTCOMM FAX: " if(C.holder.rights & (R_ADMIN|R_FUN|R_MOD)) @@ -238,8 +225,6 @@ var/list/alldepartments = list("Central Command") if(C.holder.rights & (R_ADMIN|R_DUTYOFF|R_FUN)) C << msg - send_to_discord("cciaa_channel", "@everyone Received fax from [Sender]. Subject: [sentname].") - /proc/SendFax(var/sent, var/sentname, var/mob/Sender, var/dpt) for(var/obj/machinery/faxmachine/F in allfaxes) diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index c0893f6f..e4803b1a 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -53,7 +53,7 @@ else C << "[msg_start][key_name(Sender, 0, 1, 0)][msg_end]" - send_to_discord("cciaa_channel", "@everyone **Emergency Message** from [Sender]: [text]!") + send_to_discord("cciaa_channel", "@everyone **Emergency Message** received from [Sender]: '[text]' !!!") /proc/Syndicate_announce(var/text , var/mob/Sender) var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN) diff --git a/code/modules/aurora/duty_officer/duty officer.dm b/code/modules/aurora/duty_officer/duty officer.dm index 37211207..49e998aa 100644 --- a/code/modules/aurora/duty_officer/duty officer.dm +++ b/code/modules/aurora/duty_officer/duty officer.dm @@ -330,15 +330,17 @@ var/data = "
Send New Fax
" data += "
" data += "
Received Faxes:

" - var/list/faxes = ticker.fax_repository.get_subjects(1) + var/list/faxes = ticker.fax_repository.received_faxes - for (var/i in faxes) - data += "[i]
" + for (var/i = 1, i <= faxes.len, i++) + var/list/a = faxes[i] + data += "#[i] - '[a["subject"]]' from [a["sender"]]
" - faxes = ticker.fax_repository.get_subjects(0) + faxes = ticker.fax_repository.sent_faxes data += "
Sent Faxes:

" - for (var/i in faxes) - data += "[i]
" + for (var/i = 1, i <= faxes.len, i++) + var/list/a = faxes[i] + data += "#[i] - '[a["subject"]]' from [a["sender"]]
" usr << browse("Centcomm Fax History[data]", "window=Centcomm Fax History")