From c5d4dc34f37c1354d33de75fe1cdf3fd188cfdf4 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sun, 3 Mar 2024 14:40:59 +0000 Subject: [PATCH] fixes --- code/game/machinery/ARES/ARES_interface.dm | 2 ++ code/game/machinery/ARES/ARES_interface_admin.dm | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/ARES/ARES_interface.dm b/code/game/machinery/ARES/ARES_interface.dm index 917f037e25cd..cfe3fe2669bc 100644 --- a/code/game/machinery/ARES/ARES_interface.dm +++ b/code/game/machinery/ARES/ARES_interface.dm @@ -321,6 +321,8 @@ // -- Delete Button -- // if("delete_record") var/datum/ares_record/record = locate(params["record"]) + if(!istype(record)) + return FALSE if(record.record_name == ARES_RECORD_DELETED) return FALSE var/datum/ares_record/deletion/new_delete = new diff --git a/code/game/machinery/ARES/ARES_interface_admin.dm b/code/game/machinery/ARES/ARES_interface_admin.dm index c007a8b427da..e388c0eb453d 100644 --- a/code/game/machinery/ARES/ARES_interface_admin.dm +++ b/code/game/machinery/ARES/ARES_interface_admin.dm @@ -66,10 +66,10 @@ data["evac_status"] = SShijack.evac_status data["worldtime"] = world.time - data["access_log"] = list(datacore.interface_access_list) - data["apollo_log"] = list(datacore.apollo_log) + data["access_log"] = datacore.interface_access_list + data["apollo_log"] = datacore.apollo_log - data["deleted_conversation"] = list(admin_interface.deleted_1to1) + data["deleted_conversation"] = admin_interface.deleted_1to1 data["distresstime"] = datacore.ares_distress_cooldown data["distresstimelock"] = DISTRESS_TIME_LOCK