Merge pull request #12656 from Ghommie/Ghommie-cit826

Fixing two handed items and etcetera.
This commit is contained in:
Lin
2020-07-01 14:30:16 -05:00
committed by GitHub
5 changed files with 13 additions and 7 deletions
+1 -1
View File
@@ -89,7 +89,7 @@
/// Triggered on equip of the item containing the component
/datum/component/two_handed/proc/on_equip(datum/source, mob/user, slot)
if(require_twohands && slot == ITEM_SLOT_HANDS) // force equip the item
if(require_twohands && slot == SLOT_HANDS) // force equip the item
wield(user)
if(!user.is_holding(parent) && wielded && !require_twohands)
unwield(user)