Fix broken merge; separate animations

As well as fixing the broken merge, make it so you can toggle the
BRICS-only button without interfering with the main animation.