finishing improved combat roll pull request

Yeah github do your shit, mess it up!