Some creatures can now also carry weapons. This needs to be merged with master and then the isNpc lines changed to hasInventoryStore.