From f3658fe87feaba9cdd078e1dd2f5d4b205e20367 Mon Sep 17 00:00:00 2001 From: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Mon, 2 May 2022 13:33:01 -0400 Subject: [PATCH] Attempt to fix microwave circuit This bug angers me. Also added a timer for removing a pAI from a bot. --- code/modules/food/kitchen/microwave.dm | 6 ++++-- code/modules/mob/living/bot/bot.dm | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/code/modules/food/kitchen/microwave.dm b/code/modules/food/kitchen/microwave.dm index 1c9d1460853..80164dacbec 100644 --- a/code/modules/food/kitchen/microwave.dm +++ b/code/modules/food/kitchen/microwave.dm @@ -633,5 +633,7 @@ workingList -= circuit if(paicard) workingList -= paicard - return workingList - + for(var/M in workingList) + if(istype(M, circuit)) // I know not why we need this check, all I know is if we don't circuits will be added to microwave components after construction. + workingList -= M + return workingList \ No newline at end of file diff --git a/code/modules/mob/living/bot/bot.dm b/code/modules/mob/living/bot/bot.dm index caad7112250..e96f855670f 100644 --- a/code/modules/mob/living/bot/bot.dm +++ b/code/modules/mob/living/bot/bot.dm @@ -162,8 +162,10 @@ else to_chat(user, span_notice("You must open the panel first!")) else if(O.is_crowbar()) - if(open) - ejectpai(user) + if(open && paicard) + to_chat(user, span_notice("You are attempting to remove the pAI..")) + if(do_after(user,10 * O.toolspeed)) + ejectpai(user) else ..()