Merge branch 'FixesForFixes' into 'master'

FixesForFixes

Fixing Fixes.

See merge request !386

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

@@ -914,7 +914,7 @@ newTalent{
 				resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/humanoid_yeek_yeek_mindslayer.png", display_h=2, display_y=-1}}},
 				desc = "A wayist that came to help.",
 
-				body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
+				body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, PSIONIC_FOCUS=1 },
 
 				rank = 3,
 				life_rating = 8,
@@ -947,7 +947,8 @@ newTalent{
 					[Talents.T_KINETIC_AURA]={base=1, every=5, max=5},
 					[Talents.T_CHARGED_AURA]={base=1, every=5, max=5},
 				},
-
+				resolvers.sustains_at_birth(),
+				
 				faction = self.faction,
 				summoner = self, summoner_gain_exp=true,
 				summon_time = 6,

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

@@ -3136,9 +3136,9 @@ newEffect{
 	on_timeout = function(self, eff)
 		if self:attr("purify_poison") then 
 			self:heal(eff.power, eff.src)
-		else
+		elseif self.x and self.y then
 			local dam = DamageType:get(DamageType.NATURE).projector(eff.src, self.x, self.y, DamageType.NATURE, eff.power)
-			if eff.volatile > 0 and self.x and self.y then
+			if eff.volatile > 0 then
 				local tg = {type="ball", radius=1, friendlyfire=false, x=self.x, y=self.y, act_exclude={[self.uid]=true}}
 				eff.src:project(tg, self.x, self.y, DamageType.NATURE, eff.power)
 			end