Since I am at work, it is hard for me to be of much help. I just went ahead and reverted it since we have dozens of high end events that rely heavily on $combat_state. I might have to start trying to read through the diffs of your merge to see if I can find anything though.
|