Actually fixed the rollmat crash this time. Ctrl-Z is a fickle friend.
Merge branch 'master' of https://github.com/TheDarklingWolf/Cataclysm-DDA
Merge branch 'master' of https://github.com/TheDarklingWolf/Cataclysm-DDA