Can discard goods
Merge branch 'master' into resources