From c15c335d5b56b7842d8b9f6ffa1c77ee870357bc Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Thu, 29 Dec 2022 23:37:14 -0500 Subject: [PATCH] Fixes some vortex arm bugs that were not caught (#20030) --- code/modules/surgery/organs/augments_arms.dm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm index a6b4fbfcf37..5e3efb4c7a2 100644 --- a/code/modules/surgery/organs/augments_arms.dm +++ b/code/modules/surgery/organs/augments_arms.dm @@ -529,11 +529,16 @@ owner.visible_message("[owner] parries [attack_text] with [src]!") playsound(src, 'sound/weapons/v1_parry.ogg', 100, TRUE) - if(isitem(hitby)) //Thrown items + if(attack_type == THROWN_PROJECTILE_ATTACK) + if(!isitem(hitby)) + return TRUE var/obj/item/TT = hitby - addtimer(CALLBACK(TT, TYPE_PROC_REF(/atom/movable, throw_at), locateUID(TT.thrownby), 15, 15, owner), 0.1 SECONDS) //yeet that shit right back + addtimer(CALLBACK(TT, TYPE_PROC_REF(/atom/movable, throw_at), locateUID(TT.thrownby), 10, 4, owner), 0.2 SECONDS) //Timer set to 0.2 seconds to ensure item finshes the throwing to prevent double embeds return TRUE - melee_attack_chain(owner, hitby) + if(isitem(hitby)) + melee_attack_chain(owner, hitby.loc) + else + melee_attack_chain(owner, hitby) return TRUE /obj/item/v1_arm_shell