diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 07959ceac2f..fae4a7177ac 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -111,7 +111,7 @@ /obj/item/weapon/twohanded/equipped(mob/user, slot) ..() - if(!user.is_holding(src) && wielded) + if(!user.is_holding(src) && wielded && !istype(src, /obj/item/weapon/twohanded/required)) unwield(user) ///////////OFFHAND/////////////// @@ -165,6 +165,9 @@ /obj/item/weapon/twohanded/required/equipped(mob/user, slot) ..() + var/slotbit = slotdefine2slotbit(slot) + if(slot_flags & slotbit) + return if(slot == slot_hands) wield(user) else