Merge branch 'master' into NPCObjectUse

game/modules/tome/data/factions.lua

game/modules/tome/data/general/npcs/bone-giant.lua

game/modules/tome/data/general/npcs/horror-corrupted.lua

game/modules/tome/data/general/npcs/horror.lua

game/modules/tome/data/general/npcs/horror_aquatic.lua

game/modules/tome/data/general/npcs/skeleton.lua

game/modules/tome/data/general/npcs/vampire.lua

game/modules/tome/data/general/npcs/wight.lua

...dules/tome/data/gfx/achievements/exploration_the_cure.png

.../tome/data/gfx/achievements/insane_adventure_the_cure.png

game/modules/tome/data/gfx/achievements/insane_the_cure.png

...tome/data/gfx/achievements/madness_adventure_the_cure.png

game/modules/tome/data/gfx/achievements/madness_the_cure.png

...me/data/gfx/achievements/nightmare_adventure_the_cure.png

...modules/tome/data/gfx/achievements/nightmare_the_cure.png

.../tome/data/gfx/achievements/normal_roguelike_the_cure.png

game/modules/tome/data/gfx/achievements/the_cure.png

game/modules/tome/data/gfx/particles_images/blood_circle.png

...modules/tome/data/gfx/particles_images/disease_circle.png

...data/gfx/shockbolt/npc/undead_horror_boney_experiment.png