From 0edf9a80f74eb643ddd634bf8f68c6a774a93c27 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Mon, 4 Sep 2023 12:22:31 +0100 Subject: [PATCH] auto-revoke ticket fix --- code/game/machinery/ARES/ARES_procs.dm | 5 ++++- code/game/machinery/ARES/ARES_step_triggers.dm | 13 ++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/ARES/ARES_procs.dm b/code/game/machinery/ARES/ARES_procs.dm index 99c2a3b4b829..2ac662a91b15 100644 --- a/code/game/machinery/ARES/ARES_procs.dm +++ b/code/game/machinery/ARES/ARES_procs.dm @@ -987,7 +987,10 @@ GLOBAL_LIST_INIT(maintenance_categories, list( var/operator = key_name(user) var/datum/ares_link/link = GLOB.ares_link if(logged_in == MAIN_AI_SYSTEM) - operator = "[user.ckey]/([MAIN_AI_SYSTEM])" + if(!user) + operator = "[MAIN_AI_SYSTEM] (Sensor Trip)" + else + operator = "[user.ckey]/([MAIN_AI_SYSTEM])" if(ACCESS_MARINE_AI_TEMP in access) access -= ACCESS_MARINE_AI_TEMP link.active_ids -= src diff --git a/code/game/machinery/ARES/ARES_step_triggers.dm b/code/game/machinery/ARES/ARES_step_triggers.dm index a50aa40abd90..335a877f9f25 100644 --- a/code/game/machinery/ARES/ARES_step_triggers.dm +++ b/code/game/machinery/ARES/ARES_step_triggers.dm @@ -163,7 +163,18 @@ to_chat(passer, SPAN_BOLDWARNING("You hear a harsh buzzing sound as you cross the threshold!")) ares_apollo_talk(broadcast_message) if(idcard) - idcard.access -= ACCESS_MARINE_AI_TEMP + /// Removes the access from the ID and updates the ID's modification log. + for(var/obj/item/card/id/identification in link.active_ids) + if(identification != idcard) + continue + idcard.access -= ACCESS_MARINE_AI_TEMP + link.active_ids -= idcard + idcard.modification_log += "Temporary AI access revoked by [MAIN_AI_SYSTEM]" + /// Updates the related access ticket. + for(var/datum/ares_ticket/access/access_ticket in link.tickets_access) + if(access_ticket.user_id_num != idcard.registered_gid) + continue + access_ticket.ticket_status = TICKET_REVOKED COOLDOWN_START(src, sensor_cooldown, COOLDOWN_ARES_ACCESS_CONTROL) if(alert_id && link) for(var/obj/effect/step_trigger/ares_alert/sensor in link.linked_alerts)