Conversion commit 2

Inventory now properly displays and calculates weights
Tools and weapons now properly calculate the weight of contained ammo