Conquest 13 [MERGE]

Get ready for the disk list to be massively different in the next conquest though. I don't expect to see any of the stacking for gaining buffs, or stacking/recovery for out of turn attacks, as the crit hit ones that were supposed to be in look like they replace all of those.

It almost looks like we got the inverted list, like the coder put the activate flag on the disks they were supposed to deactivate. Hopefully it won't be that bad though.

I won't be surprised if conquest 14 is quite a different experience.