From fabee2fdf8e5f1a1ca4a3fa346a1e7c557ca7cce Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sun, 28 Dec 2014 17:32:55 +1030 Subject: [PATCH] Stopped glass shards from proning mobs with NO_PAIN. --- code/game/objects/items/weapons/shards.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/shards.dm b/code/game/objects/items/weapons/shards.dm index 8bd126584cf..2aea6b050ec 100644 --- a/code/game/objects/items/weapons/shards.dm +++ b/code/game/objects/items/weapons/shards.dm @@ -83,10 +83,11 @@ var/datum/organ/external/affecting = H.get_organ(pick("l_foot", "r_foot")) if(affecting.status & ORGAN_ROBOT) return - H.Weaken(3) if(affecting.take_damage(5, 0)) H.UpdateDamageIcon() H.updatehealth() + if(!(H.species & NO_PAIN)) + H.Weaken(3) ..() // Shrapnel