Fixed shift-click and stacking problems with armor/tool

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>