Barter mechanic fix
Merge remote-tracking branch 'scrawl/tradefix'