Skip to content
Browse files

Merge branch 'master' of https://github.com/Meridian59/Meridian59

Conflicts:
	kod/object/active/holder/nomoveon/battler/player.kod
  • Loading branch information...
2 parents 2b0dda4 + ff3718a commit f0ef113fa2ed8eeb443766a4e3a0ac79193077b7 @Meridian59 committed
Showing with 1 addition and 1 deletion.
  1. +1 −1 kod/object/passive/spell/persench/denial.kod
View
2 kod/object/passive/spell/persench/denial.kod
@@ -122,7 +122,7 @@ messages:
if send(who,@GetHealth) < 1
{
- send(who,@Killed,#what=who);
+ send(who,@GainHealthNormal,#amount=1);
}
}

0 comments on commit f0ef113

Please sign in to comment.
Something went wrong with that request. Please try again.