Merge branch 'master' into detailed-weapon

game/engines/default/engine/Entity.lua

game/engines/default/engine/Object.lua

game/engines/default/engine/Store.lua

game/engines/default/engine/interface/ActorInventory.lua

game/engines/default/modules/boot/dialogs/Credits.lua

game/modules/tome/class/Actor.lua

game/modules/tome/class/Object.lua

game/modules/tome/class/Player.lua

game/modules/tome/class/Store.lua

game/modules/tome/data/damage_types.lua

...les/tome/data/general/objects/boss-artifacts-maj-eyal.lua

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

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

...es/tome/data/general/objects/world-artifacts-maj-eyal.lua

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

.../gfx/shockbolt/player/dwarf_female/special/left_acera.png

...x/shockbolt/player/dwarf_female/special/left_anmalice.png

...yer/dwarf_female/special/left_blade_of_distorted_time.png

...fx/shockbolt/player/dwarf_female/special/left_butcher.png

...gfx/shockbolt/player/dwarf_female/special/left_corpus.png