Fix atomic ammo weight (and ammo type)
Merge branch 'Atomic-ammo' of https://github.com/i2amroy/Cataclysm-DDA into i2amroy-Atomic-ammo