From 1c08d16dbf4590fa5495bcf1d835338f1e715354 Mon Sep 17 00:00:00 2001 From: Qwertytoforty Date: Fri, 9 Oct 2020 21:03:17 -0400 Subject: [PATCH 1/3] Prevents clings from mindswaping with mindshielded people --- code/game/gamemodes/changeling/powers/swap_form.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/gamemodes/changeling/powers/swap_form.dm b/code/game/gamemodes/changeling/powers/swap_form.dm index 97192c86a0f..342037967f8 100644 --- a/code/game/gamemodes/changeling/powers/swap_form.dm +++ b/code/game/gamemodes/changeling/powers/swap_form.dm @@ -27,6 +27,9 @@ if(target.has_brain_worms() || user.has_brain_worms()) to_chat(user, "A foreign presence repels us from this body!") return + if(ismindshielded(target)) + to_chat(user, "We are unable to bypass the implant protecting their mind!") + return return 1 /datum/action/changeling/swap_form/sting_action(var/mob/living/carbon/user) From 5f89eb887c96174763e9b7dc41c7b4e7e3effe3e Mon Sep 17 00:00:00 2001 From: Qwertytoforty Date: Sat, 10 Oct 2020 10:17:26 -0400 Subject: [PATCH 2/3] Allows mindshield bypass, now takes 10 seconds to switch --- code/game/gamemodes/changeling/powers/swap_form.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/game/gamemodes/changeling/powers/swap_form.dm b/code/game/gamemodes/changeling/powers/swap_form.dm index 342037967f8..c191e562f95 100644 --- a/code/game/gamemodes/changeling/powers/swap_form.dm +++ b/code/game/gamemodes/changeling/powers/swap_form.dm @@ -27,9 +27,6 @@ if(target.has_brain_worms() || user.has_brain_worms()) to_chat(user, "A foreign presence repels us from this body!") return - if(ismindshielded(target)) - to_chat(user, "We are unable to bypass the implant protecting their mind!") - return return 1 /datum/action/changeling/swap_form/sting_action(var/mob/living/carbon/user) @@ -41,7 +38,7 @@ target.do_jitter_animation(500) user.do_jitter_animation(500) - if(!do_mob(user,target,20)) + if(!do_mob(user,target,100)) to_chat(user, "The body swap has been interrupted!") return From f58cdea1c39190a8690ca16d878ceefdbec9777f Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Sat, 10 Oct 2020 11:10:21 -0400 Subject: [PATCH 3/3] Update code/game/gamemodes/changeling/powers/swap_form.dm Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> --- code/game/gamemodes/changeling/powers/swap_form.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/changeling/powers/swap_form.dm b/code/game/gamemodes/changeling/powers/swap_form.dm index c191e562f95..e392974648c 100644 --- a/code/game/gamemodes/changeling/powers/swap_form.dm +++ b/code/game/gamemodes/changeling/powers/swap_form.dm @@ -38,7 +38,7 @@ target.do_jitter_animation(500) user.do_jitter_animation(500) - if(!do_mob(user,target,100)) + if(!do_mob(user, target, 10 SECONDS)) to_chat(user, "The body swap has been interrupted!") return