Port of smart armoury from Tremfusion
Some fixes to the armoury menu
Merge branch 'gameplay/armoury'