Merge branch 'demon-fire-fix' into 'master'

Update demonfire damage type to check for fiery_torment

Update demonfire damage type to check for fiery_torment when determining if it should hurt or heal demons.

See merge request !716

@@ -2594,7 +2594,7 @@ newDamageType{
 		state = initState(state)
 		useImplicitCrit(src, state)
 		local target = game.level.map(x, y, Map.ACTOR)
-		if target and target:attr("demon") then
+		if target and (target:attr("demon") and not target:attr("fiery_torment")) then
 			target:heal(dam, src)
 			return -dam
 		elseif target then