From f876aed2943257325cbb5a0e0ebdeec3c985613a Mon Sep 17 00:00:00 2001 From: Adrer Date: Mon, 16 Jan 2023 20:42:43 +0100 Subject: [PATCH] Makes it impossible to deploy an arm implant while wielding a twohanded item. (#20199) * Arm implant no longer overrides offhand wield * Sirryan2002 suggestion Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> Co-authored-by: adrermail@gmail.com Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> --- code/modules/surgery/organs/augments_arms.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm index f76b47a6c8f..9eb981b981f 100644 --- a/code/modules/surgery/organs/augments_arms.dm +++ b/code/modules/surgery/organs/augments_arms.dm @@ -117,7 +117,11 @@ var/obj/item/arm_item = owner.get_item_by_slot(arm_slot) if(arm_item) - if(!owner.unEquip(arm_item)) + if(istype(arm_item, /obj/item/twohanded/offhand)) + var/obj/item/offhand_arm_item = owner.get_active_hand() + to_chat(owner, "Your hands are too encumbered wielding [offhand_arm_item] to deploy [src]!") + return + else if(!owner.unEquip(arm_item)) to_chat(owner, "Your [arm_item] interferes with [src]!") return else