Consolidated armor & weapon objects into master item object