From 42403558b931a44ba369da02c23f178f96eb2d9a Mon Sep 17 00:00:00 2001 From: Pierre-Louis <44984704+PIerreLouisH@users.noreply.github.com> Date: Tue, 9 Jan 2024 13:48:37 +0100 Subject: [PATCH] Cluwn spell target no longer get blocked and locked within their incomplete modsuit forever. (#23598) * Updated makeCluwne method to instantly deactivate modsuit before applying the Cluwne spell Updated the makeCluwne method to instantly deactivate the modsuit control unit before applying the Cluwne spell. This ensures that the target is immediately affected by the spell without them being forever locked in the modsuit. Therefore fixes #22502 * Small fix for deployed (but unactivated) modsuit --------- Co-authored-by: Pierre-Louis --- code/datums/spells/cluwne.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/datums/spells/cluwne.dm b/code/datums/spells/cluwne.dm index 34d2a86aeaf..eeaed56ac11 100644 --- a/code/datums/spells/cluwne.dm +++ b/code/datums/spells/cluwne.dm @@ -12,6 +12,11 @@ action_icon_state = "cluwne" /mob/living/carbon/human/proc/makeCluwne() + if(istype(back, /obj/item/mod/control)) // Check if the target is wearing a modsuit + var/obj/item/mod/control/modsuit_control = back + if(istype(wear_suit, /obj/item/clothing/suit/mod)) // Check if the modsuit is deployed + modsuit_control.active = FALSE // Instantly deactivate the modsuit - if it was activated + modsuit_control.quick_deploy(src) // The modsuit is no longer deployed to_chat(src, "You feel funny.") if(!get_int_organ(/obj/item/organ/internal/brain/cluwne)) var/obj/item/organ/internal/brain/cluwne/idiot_brain = new