From 0769bd8a7b033e10450bf3f3bc1a5ca9f754a6c0 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sat, 25 May 2024 14:19:34 +0100 Subject: [PATCH 1/2] wrong way round moron --- code/game/machinery/ARES/ARES_interface.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/ARES/ARES_interface.dm b/code/game/machinery/ARES/ARES_interface.dm index 0f7d4452d2cc..4dc00db7e0ae 100644 --- a/code/game/machinery/ARES/ARES_interface.dm +++ b/code/game/machinery/ARES/ARES_interface.dm @@ -387,9 +387,9 @@ contents += {" [req_order.time] - [req_order.details] - [req_order.title] [req_order.user] + [req_order.title] + [req_order.details] "} From 42b84930608a540a5e8d85c256a9c6cd187214d9 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Thu, 30 May 2024 13:08:51 +0100 Subject: [PATCH 2/2] print cooldown --- code/game/machinery/ARES/ARES_interface.dm | 10 +++++++++- tgui/packages/tgui/interfaces/AresInterface.jsx | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/ARES/ARES_interface.dm b/code/game/machinery/ARES/ARES_interface.dm index 4dc00db7e0ae..a6f96e7f6078 100644 --- a/code/game/machinery/ARES/ARES_interface.dm +++ b/code/game/machinery/ARES/ARES_interface.dm @@ -24,6 +24,8 @@ /// The datacore storing all the information. var/datum/ares_datacore/datacore + COOLDOWN_DECLARE(printer_cooldown) + /obj/structure/machinery/computer/ares_console/proc/link_systems(datum/ares_link/new_link = GLOB.ares_link, override) if(link && !override) return FALSE @@ -94,6 +96,8 @@ data["nuketimelock"] = NUCLEAR_TIME_LOCK data["nuke_available"] = datacore.nuke_available + data["printer_cooldown"] = !COOLDOWN_FINISHED(src, printer_cooldown) + var/list/logged_announcements = list() for(var/datum/ares_record/announcement/broadcast as anything in datacore.records_announcement) var/list/current_broadcast = list() @@ -340,10 +344,14 @@ // -- Print ASRS Audit Log -- // if("print_req") playsound = FALSE + if(!COOLDOWN_FINISHED(src, printer_cooldown)) + playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) + return FALSE if(!datacore.records_asrs.len) to_chat(user, SPAN_WARNING("There are no records to print!")) playsound(src, 'sound/machines/buzz-two.ogg', 15, 1) - return + return FALSE + COOLDOWN_START(src, printer_cooldown, 20 SECONDS) playsound(src, 'sound/machines/fax.ogg', 15, 1) sleep(3.4 SECONDS) var/contents = {" diff --git a/tgui/packages/tgui/interfaces/AresInterface.jsx b/tgui/packages/tgui/interfaces/AresInterface.jsx index d1109c00e23a..e8b565fdafec 100644 --- a/tgui/packages/tgui/interfaces/AresInterface.jsx +++ b/tgui/packages/tgui/interfaces/AresInterface.jsx @@ -1193,6 +1193,7 @@ const Requisitions = (props) => { last_page, current_menu, records_requisition, + printer_cooldown, } = data; return ( @@ -1242,6 +1243,7 @@ const Requisitions = (props) => { textAlign="center" tooltip="Print Audit Log" onClick={() => act('print_req')} + disabled={printer_cooldown} > Print Audit Log