From 0a2d7266dd6ac8449fbbb1db5705e5cf54f5aaea Mon Sep 17 00:00:00 2001 From: forest2001 Date: Mon, 27 May 2024 18:10:12 +0100 Subject: [PATCH 1/3] fix --- code/modules/defenses/sentry.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/defenses/sentry.dm b/code/modules/defenses/sentry.dm index 15bb63be2f15..2d5733ae2049 100644 --- a/code/modules/defenses/sentry.dm +++ b/code/modules/defenses/sentry.dm @@ -551,12 +551,12 @@ faction_group = FACTION_LIST_ARES_MARINE /obj/structure/machinery/defenses/sentry/premade/deployable/almayer/mini/ares/Initialize() + . = ..() link_sentry() - ..() /obj/structure/machinery/defenses/sentry/premade/deployable/almayer/mini/ares/Destroy() + . = ..() delink_sentry() - ..() /obj/structure/machinery/defenses/sentry/premade/deployable/almayer/mini/ares/start_processing() sync_iff() From 4c4293d2221514108de981f9992a3f1ea9a4f1a0 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Mon, 27 May 2024 19:05:11 +0100 Subject: [PATCH 2/3] logging --- code/game/machinery/ARES/ARES_interface.dm | 1 + code/game/machinery/ARES/ARES_interface_admin.dm | 1 + code/game/machinery/ARES/ARES_interface_apollo.dm | 1 + code/game/machinery/ARES/apollo_pda.dm | 1 + code/game/machinery/ARES/debug_pda.dm | 1 + 5 files changed, 5 insertions(+) diff --git a/code/game/machinery/ARES/ARES_interface.dm b/code/game/machinery/ARES/ARES_interface.dm index b7a2333f36db..85cc543add84 100644 --- a/code/game/machinery/ARES/ARES_interface.dm +++ b/code/game/machinery/ARES/ARES_interface.dm @@ -562,6 +562,7 @@ return FALSE link.change_iff(new_iff) playsound(src, 'sound/machines/chime.ogg', 15, 1) + message_admins("ARES: [key_name(user)] updated ARES Sentry IFF to [new_iff].") to_chat(user, SPAN_WARNING("Sentry IFF settings updated!")) return TRUE diff --git a/code/game/machinery/ARES/ARES_interface_admin.dm b/code/game/machinery/ARES/ARES_interface_admin.dm index 0756c8b01db9..d97798f1d086 100644 --- a/code/game/machinery/ARES/ARES_interface_admin.dm +++ b/code/game/machinery/ARES/ARES_interface_admin.dm @@ -534,5 +534,6 @@ if(new_iff == faction_label) return FALSE change_iff(new_iff) + message_admins("ARES: [key_name(user)] updated ARES Sentry IFF to [new_iff].") to_chat(user, SPAN_WARNING("Sentry IFF settings updated!")) return TRUE diff --git a/code/game/machinery/ARES/ARES_interface_apollo.dm b/code/game/machinery/ARES/ARES_interface_apollo.dm index fe0f26880a16..27f6f0f231fd 100644 --- a/code/game/machinery/ARES/ARES_interface_apollo.dm +++ b/code/game/machinery/ARES/ARES_interface_apollo.dm @@ -457,6 +457,7 @@ return FALSE link.change_iff(new_iff) playsound(src, 'sound/machines/chime.ogg', 15, 1) + message_admins("ARES: [key_name(user)] updated ARES Sentry IFF to [new_iff].") to_chat(user, SPAN_WARNING("Sentry IFF settings updated!")) return TRUE diff --git a/code/game/machinery/ARES/apollo_pda.dm b/code/game/machinery/ARES/apollo_pda.dm index cd5de02a1ddb..79520e39c682 100644 --- a/code/game/machinery/ARES/apollo_pda.dm +++ b/code/game/machinery/ARES/apollo_pda.dm @@ -482,6 +482,7 @@ if(new_iff == link.faction_label) return FALSE link.change_iff(new_iff) + message_admins("ARES: [key_name(user)] updated ARES Sentry IFF to [new_iff].") playsound(src, 'sound/machines/chime.ogg', 15, 1) to_chat(user, SPAN_WARNING("Sentry IFF settings updated!")) return TRUE diff --git a/code/game/machinery/ARES/debug_pda.dm b/code/game/machinery/ARES/debug_pda.dm index 72f52c412909..2577acddc56b 100644 --- a/code/game/machinery/ARES/debug_pda.dm +++ b/code/game/machinery/ARES/debug_pda.dm @@ -748,6 +748,7 @@ return FALSE link.change_iff(new_iff) playsound(src, 'sound/machines/chime.ogg', 15, 1) + message_admins("ARES: [key_name(user)] updated ARES Sentry IFF to [new_iff].") to_chat(user, SPAN_WARNING("Sentry IFF settings updated!")) return TRUE From ca3f2d0974363be2b440a1f58c19cc46ee88af10 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Thu, 30 May 2024 16:00:38 +0100 Subject: [PATCH 3/3] oops --- code/game/machinery/ARES/debug_pda.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/game/machinery/ARES/debug_pda.dm b/code/game/machinery/ARES/debug_pda.dm index 2577acddc56b..3298af5732e9 100644 --- a/code/game/machinery/ARES/debug_pda.dm +++ b/code/game/machinery/ARES/debug_pda.dm @@ -737,6 +737,13 @@ sec_vent.create_gas(VENT_GAS_CN20_XENO, 6, 5 SECONDS) log_admin("[key_name(user)] released nerve gas from Vent '[sec_vent.vent_tag]' via ARES.") + if("security_lockdown") + if(!COOLDOWN_FINISHED(datacore, aicore_lockdown)) + to_chat(user, SPAN_BOLDWARNING("AI Core Lockdown procedures are on cooldown! They will be ready in [COOLDOWN_SECONDSLEFT(datacore, aicore_lockdown)] seconds!")) + return FALSE + aicore_lockdown(user) + return TRUE + if("update_sentries") playsound = FALSE var/new_iff = params["chosen_iff"]