Fixes merge conflicts and removes excess message
Merge pull request #2628 from Tenebrosity/nullsoundfix

Fixes #2622: Getting shot by a laser tag laser stops all sounds