Fixe shotgun trap not returning ammo
Merge branch '6463-fix' of https://github.com/werty1124/Cataclysm-DDA into werty1124-6463-fix