Merge pull request #1154 from dorkster/fixes

Prevent items being equipped to wrong slots when no slot is available