Merge pull request #261 from ping19/master

Weapon text colour