From 044adf9446aa9491103d74abf2fa230ca1c0c528 Mon Sep 17 00:00:00 2001 From: Haevacht Date: Fri, 6 Jan 2017 07:54:50 +1100 Subject: [PATCH] Fixes the crusher, and future twohands required items, equipping to slots (#22712) * If plants have slotflags they can now be equipped * now you can have more than one slot_flag --- code/game/objects/items/weapons/twohanded.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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