From 0ada097dc42579e59dd9e5e8269fa4040d67e487 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 9 Dec 2021 22:37:00 +0100 Subject: [PATCH] [MIRROR] Fixes AI shells being instantly converted with the Twisted Construction spell [MDB IGNORE] (#9976) * Fixes AI shells being instantly converted with the Twisted Construction spell (#63231) * fixes that shit * should work Co-authored-by: SuperNovaa41 * Fixes AI shells being instantly converted with the Twisted Construction spell Co-authored-by: Seth Scherer Co-authored-by: SuperNovaa41 --- code/modules/antagonists/cult/blood_magic.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm index 609ee45e6d9..c9491477e2f 100644 --- a/code/modules/antagonists/cult/blood_magic.dm +++ b/code/modules/antagonists/cult/blood_magic.dm @@ -597,13 +597,14 @@ SEND_SOUND(user, sound('sound/effects/magic.ogg',0,1,25)) else if(istype(target,/mob/living/silicon/robot)) var/mob/living/silicon/robot/candidate = target - if(candidate.mmi) + if(candidate.mmi || candidate.shell) channeling = TRUE user.visible_message(span_danger("A dark cloud emanates from [user]'s hand and swirls around [candidate]!")) playsound(T, 'sound/machines/airlock_alien_prying.ogg', 80, TRUE) var/prev_color = candidate.color candidate.color = "black" if(do_after(user, 90, target = candidate)) + candidate.undeploy() candidate.emp_act(EMP_HEAVY) var/construct_class = show_radial_menu(user, src, GLOB.construct_radial_images, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) if(!check_menu(user)) @@ -624,7 +625,6 @@ return else uses-- - candidate.undeploy() to_chat(user, span_warning("A dark cloud emanates from you hand and swirls around [candidate] - twisting it into a construct shell!")) new /obj/structure/constructshell(T) SEND_SOUND(user, sound('sound/effects/magic.ogg',0,1,25))