Revert "Revert "Adapt more of the shooter camera hack to pyramid/holiday""

This reverts commit 4e737b7649637d33e4e981d72a54e85328463de6.