Sound fixes

Conflicts:
	code/game/sound.dm