Merge branch Mario/weapons_new (XL merge request)
The massive weapon updates (including arc, which will not appear on maps yet), I believe they are ready for review.
The massive weapon updates (including arc, which will not appear on maps yet), I believe they are ready for review.