Ammo fixs

Fixes issue #2896

Replaces all usages of the "NULL" ammo type on real items with either the "components" or "UPS" ammo type.
Replaces the "THREAD" ammo type with "thread" to conform with the other ammo types.