Fixes cigarette pricing.
Merge pull request #7518 from Rivet-the-Zombie/more-price-fixes

Fixes cigarette pricing.