From b80fe7013e03041ad5475cea67562fccc6051ae9 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Fri, 7 Aug 2020 00:17:12 -0700 Subject: [PATCH 1/3] Update twohanded.dm --- code/datums/components/twohanded.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/datums/components/twohanded.dm b/code/datums/components/twohanded.dm index 77a9a79bf4..df39db4931 100644 --- a/code/datums/components/twohanded.dm +++ b/code/datums/components/twohanded.dm @@ -105,6 +105,8 @@ /// Triggered on attack self of the item containing the component /datum/component/two_handed/proc/on_attack_self(datum/source, mob/user) + if(!user.is_holding(src)) + return //give no quarter to telekinesis powergaemrs if(wielded) unwield(user) else From 95607274e32f85b4c54321f3d17d7aa5826741ae Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Fri, 7 Aug 2020 00:19:02 -0700 Subject: [PATCH 2/3] Update twohanded.dm --- code/datums/components/twohanded.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/components/twohanded.dm b/code/datums/components/twohanded.dm index df39db4931..061cddb9c1 100644 --- a/code/datums/components/twohanded.dm +++ b/code/datums/components/twohanded.dm @@ -106,7 +106,7 @@ /// Triggered on attack self of the item containing the component /datum/component/two_handed/proc/on_attack_self(datum/source, mob/user) if(!user.is_holding(src)) - return //give no quarter to telekinesis powergaemrs + return //give no quarter to telekinesis powergaemrs (telekinetic wielding will desync the offhand and result in all sorts of bugs so no until someone codes it properly) if(wielded) unwield(user) else From 36bdb9e482036d3f627a4057589ed71f2a50850e Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Fri, 7 Aug 2020 01:31:29 -0700 Subject: [PATCH 3/3] Update twohanded.dm --- code/datums/components/twohanded.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/components/twohanded.dm b/code/datums/components/twohanded.dm index 061cddb9c1..bcbf979101 100644 --- a/code/datums/components/twohanded.dm +++ b/code/datums/components/twohanded.dm @@ -105,7 +105,7 @@ /// Triggered on attack self of the item containing the component /datum/component/two_handed/proc/on_attack_self(datum/source, mob/user) - if(!user.is_holding(src)) + if(!user.is_holding(parent)) return //give no quarter to telekinesis powergaemrs (telekinetic wielding will desync the offhand and result in all sorts of bugs so no until someone codes it properly) if(wielded) unwield(user)