Merge branch 'master' into ID/Scaling

game/engines/default/engine/Entity.lua

game/engines/default/engine/generator/map/Static.lua

game/modules/tome/class/NPC.lua

.../gfx/shockbolt/npc/spiderkin_shiaak_shiaak_venomblade.png

...tome/data/gfx/shockbolt/object/artifact/charged_focus.png

...tome/data/gfx/shockbolt/object/artifact/earthen_beads.png

...shockbolt/object/artifact/eye_of_the_dreaming_one_new.png

game/modules/tome/data/gfx/shockbolt/object/artifact/fez.png

...tome/data/gfx/shockbolt/object/artifact/kinetic_focus.png

...ata/gfx/shockbolt/object/artifact/lightning_collector.png

...ta/gfx/shockbolt/object/artifact/ring_of_the_archlich.png

...es/tome/data/gfx/shockbolt/object/artifact/stormfront.png

.../tome/data/gfx/shockbolt/object/artifact/swordbreaker.png

...tome/data/gfx/shockbolt/object/artifact/temporal_rift.png

...ules/tome/data/gfx/shockbolt/object/artifact/the_jolt.png

...tome/data/gfx/shockbolt/object/artifact/thermal_focus.png

...s/tome/data/gfx/shockbolt/object/artifact/thunderfall.png

...tome/data/gfx/shockbolt/object/artifact/tirakais_maul.png

game/modules/tome/data/talents/cunning/artifice.lua

game/modules/tome/data/timed_effects/physical.lua