Fix Hedonistic shops more

svornostrequested to merge
svornost/fc-pregmod:pregmod-master into pregmod-master

Enable typechecking for shop types and fix the things it finds.

Fixes #2706 (closed)

Merge request reports