Potion fix
This PR fixes an issue where potions could not stack, so buying more than one potion was useless.
Please note, this cleans up a little bit of VERY ugly code broken that appeared half-complete. There may be a regression because I cannot find what that code was intended to do.