Merge pull request #8135 from Baystation12/master

Master into dev.
This commit is contained in:
Zuhayr
2015-02-15 22:03:43 +10:30
4 changed files with 29 additions and 25 deletions
+1 -1
View File
@@ -86,7 +86,7 @@
if(affecting.take_damage(5, 0))
H.UpdateDamageIcon()
H.updatehealth()
if(!(H.species & NO_PAIN))
if(!(H.species && (H.species.flags & NO_PAIN)))
H.Weaken(3)
..()