Wrong item in armory

[niknourse]

Client Version:

irrelevant

Issue Summary:

In metastation brig armory, in place where there should be riot helmets, there is riot armor. So now we have one set of bulletproof armor and helmet and two sets of riot armor. Yikes!

Round ID:

irrelevant

Test Merge Information:

irrelevant(?)

Reproduction Steps:

play on metastation; see issue summary.