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
This commit is contained in:
Haevacht
2017-01-06 09:54:50 +13:00
committed by oranges
parent 373b61c741
commit 044adf9446
+4 -1
View File
@@ -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