Merge branch 'annihilator-bugs' into 'master'

Fixes to block callback and archery AI

callbackOnBlock now passes in the blocked parameter, fixes a bug with Annihilator's shield capacitor.
The addition to shoot is so that the mecha knows it can shoot through the player and turrets, makes it a bit less dumb.
Also added archery_pass_friendly to the thoughtform archer so it's less useless.


See merge request !591