make mutual push-resistant unit collisions more like 0.82.x (smoth's issue)