Merge branch 'misc174' into 'master'

game/engines/default/engine/Trap.lua

game/modules/tome/class/interface/Archery.lua

game/modules/tome/data/damage_types.lua

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

...les/tome/data/maps/vaults/auto/greater/living-weapons.lua

game/modules/tome/data/talents/celestial/hymns.lua

game/modules/tome/data/talents/celestial/sun.lua

game/modules/tome/data/talents/corruptions/shadowflame.lua

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

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

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

game/modules/tome/data/talents/gifts/summon-melee.lua

game/modules/tome/data/talents/misc/objects.lua

game/modules/tome/data/talents/spells/wildfire.lua

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

game/modules/tome/data/zones/temporal-rift/zone.lua

game/modules/tome/dialogs/CharacterSheet.lua