Updated armor script.
Merge remote-tracking branch 'origin/master'

Conflicts:
	scripts/commands/armor.lua