Merge branch 'master' into MoreRogueUpdates

game/modules/tome/class/Object.lua

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

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

...les/tome/data/general/objects/boss-artifacts-far-east.lua

...images/tentacles_shader/BlackKnight_tentacles_texture.png

.../tentacles_shader/BlackKnight_tentacles_texture_black.png

...fx/particles_images/tentacles_shader/berserker_aura_1.png

...fx/particles_images/tentacles_shader/berserker_aura_2.png

...fx/particles_images/tentacles_shader/berserker_aura_3.png

...fx/particles_images/tentacles_shader/berserker_aura_4.png

...fx/particles_images/tentacles_shader/berserker_aura_5.png

...x/particles_images/tentacles_shader/lightninhg_aura_1.png

...x/particles_images/tentacles_shader/lightninhg_aura_2.png

...x/particles_images/tentacles_shader/lightninhg_aura_3.png

...x/particles_images/tentacles_shader/metal_tentacles_1.png

...x/particles_images/tentacles_shader/metal_tentacles_2.png

...x/particles_images/tentacles_shader/metal_tentacles_3.png

...articles_images/tentacles_shader/original_tentacles_1.png

...articles_images/tentacles_shader/original_tentacles_2.png

...articles_images/tentacles_shader/original_tentacles_3.png