When there's only 1 mouse left (+ shaman) or when shaman dies the timer should jump to 0:20, instead it jumps to 0:00 but it still waits the 20 seconds.

I suppose this can be combined with Topic-242919 ?

It's similar, yes.