Fix shops to use Gamestate.stack

Fix #1840