enables sisi to continually attack
Merge remote-tracking branch 'origin/master'