Make combat end before end of turn effects resolve

[B-NUTT]

If I get a kill that ends the dungeon and a dot kills me negating my win I think the keys may be removed from my key board via blunt force.

[seiyria]

Need to test if this is still a problem.