Resync of catacombs and textures
Merge branch 'master' of https://github.com/Vinessa/TrickyMissile