More armor.json pricing work

Gas mask, for now.
Filter mask too
Merge pull request #7912 from KA101/pricing

More armor.json pricing work