Weapons and Armor Fixes Remade