Merge branch 'master' into NPCObjectUse

game/engines/default/engine/GameEnergyBased.lua

game/engines/default/engine/Level.lua

game/engines/default/engine/UserChat.lua

game/engines/default/engine/ui/Numberbox.lua

game/modules/tome/class/Game.lua

game/modules/tome/class/GameState.lua

game/modules/tome/class/Object.lua

game/modules/tome/data/birth/classes/corrupted.lua

game/modules/tome/data/birth/descriptors.lua

game/modules/tome/data/chats/last-hope-melinda-father.lua

game/modules/tome/data/damage_types.lua

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

game/modules/tome/data/general/objects/egos/weapon.lua

game/modules/tome/data/general/objects/scrolls.lua

...es/tome/data/general/objects/world-artifacts-far-east.lua

game/modules/tome/data/general/objects/world-artifacts.lua

game/modules/tome/data/general/traps/temporal.lua

...tome/data/gfx/shockbolt/trap/disturbed_pocket_of_time.png

...gfx/shockbolt/trap/extremely_disturbed_pocket_of_time.png

game/modules/tome/data/gfx/talents/infestation.png