From 7516e0698b8c67d08b4c154f8ea67fa4edfd64bd Mon Sep 17 00:00:00 2001 From: "entrian.tration@gmail.com" Date: Sat, 19 Jan 2013 21:15:11 +0000 Subject: [PATCH] Issue 1231 resolved with http://forums.nanotrasen.com/viewtopic.php?f=16&t=11769 Armor now appropriately reduces damage taken from explosives. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5582 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/mob/living/carbon/human/human.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 7cc8a1b0ff4..03b3ec962f8 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -177,17 +177,19 @@ f_loss += 60 - if (!prob(getarmor(null, "bomb"))) + if (prob(getarmor(null, "bomb"))) b_loss = b_loss/1.5 f_loss = f_loss/1.5 if (!istype(ears, /obj/item/clothing/ears/earmuffs)) ear_damage += 30 ear_deaf += 120 + if (prob(70) && !shielded) + Paralyse(10) if(3.0) b_loss += 30 - if (!prob(getarmor(null, "bomb"))) + if (prob(getarmor(null, "bomb"))) b_loss = b_loss/2 if (!istype(ears, /obj/item/clothing/ears/earmuffs)) ear_damage += 15