Merge bomb inbound.

Incomplete items are about to merge with complete sound.
Oh boy.
The worst is to come soon.
Merging
Merge branch 'master' of https://qmpzaltb@github.com/qmpzaltb/cptgame.git
More merging.