Fix energy gun messaging
Merge pull request #362 from mikeclemson/update-energy-gun-special-messages

Fix energy gun messaging