Merge pull request #1127 from dorkster/disable_equipslots

Update disabled slots when returning an equipped item