Merge branch 'Mario/weapon_fields'
authorMario <mario@smbclan.net>
Fri, 16 Feb 2018 06:41:32 +0000 (16:41 +1000)
committerMario <mario@smbclan.net>
Fri, 16 Feb 2018 06:41:32 +0000 (16:41 +1000)

Trivial merge