From 278e6a7c25460491626e1e95853be2bcc035b35f Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Sun, 29 Apr 2018 01:12:57 -0400 Subject: [PATCH] the last of the TIMER_STOPPABLE --- code/modules/mob/living/silicon/ai/ai.dm | 3 +++ code/modules/mob/living/silicon/ai/life.dm | 6 ++++-- code/modules/mob/living/simple_animal/bot/bot.dm | 3 +++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index c84c7bdbbed..09b62f1c89c 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -268,6 +268,9 @@ var/list/ai_verbs_default = list( shuttle_caller_list -= src shuttle_master.autoEvac() QDEL_NULL(eyeobj) // No AI, no Eye + if(malfhacking) + deltimer(malfhacking) + malfhacking = null malfhack = null return ..() diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm index 13b5308bc86..a6a043a8945 100644 --- a/code/modules/mob/living/silicon/ai/life.dm +++ b/code/modules/mob/living/silicon/ai/life.dm @@ -29,8 +29,10 @@ if(malfhack && malfhack.aidisabled) to_chat(src, "ERROR: APC access disabled, hack attempt canceled.") - malfhacking = 0 - malfhack = null + deltimer(malfhacking) + // This proc handles cleanup of screen notifications and + // messenging the client + malfhacked(malfhack) if(aiRestorePowerRoutine) adjustOxyLoss(1) diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index 786314d1ed6..986795ccd1e 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -193,6 +193,9 @@ bots_list -= src QDEL_NULL(Radio) QDEL_NULL(access_card) + if(reset_access_timer_id) + deltimer(reset_access_timer_id) + reset_access_timer_id = null if(radio_controller && bot_filter) radio_controller.remove_object(bot_core, control_freq) QDEL_NULL(bot_core)