Small Airlock Sound Refactor

Fixes #2263 and helps dylan not have an aneurysm