Atk hit shoves avatars.
Avatars don't walk when shoved + minor tweaks
Merge branch 'hitshove'