Fix shops to use Gamestate.stack
Merge pull request #1841 from bucketh3ad/fix_shops

Fix shops to use Gamestate.stack