fix arrow colour
don't recover ammo from weapons that use themselves as ammo
adjust selection arrow
Merge remote-tracking branch 'upstream/master' into experimental