Merge pull request #158 from Knoxon/master

Fixes Devil Packet Cigarettes
When did that table disappear?
Merge branch 'master' of https://github.com/UristMcStation/UristMcStation
fixes a bug with bookshelves
Merge branch 'master' of https://github.com/UristMcStation/UristMcStation