Fix broken hud ammo display
Weapon slots
Merge branch 'weaponslots'