Deal with situational states messing with explicit states

[brittyazel]

Situational states, i.e. combat/swimming/indoor/outdoor, currently mess with the functionality of explicit states, i.e. vehicle/alt/shift/stance/etc. Meaning right now always the most recent state is the one that is shown, thus if you are in bear form and have a bear form bar state shown, if you have the "combat" state enabled, entering combat will take away your bear form state and enter the combat state, as it is more recent.

I need to think of a clever way to work around this.