Improvements to weapon cycling

-Weapon cycling no longer cycles through no weapon unless you literally
have no weapon
-Weapon cycling no longer gives error messages about not having ammo for
any/all weapons in inventory
Comment tweak