cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-21 04:48:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8135 from Baystation12/master

Browse Source 
Master into dev.
This commit is contained in:
Zuhayr
2015-02-15 22:03:43 +10:30
parent 7fb7c917ed f1e36d5c06
commit be2b0aa6f4
4 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/shards.dm
+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)
..()