From 6d79e47d96c81c0859a0fbad134c2d5245bdfbcf Mon Sep 17 00:00:00 2001 From: cib Date: Thu, 29 Dec 2011 00:11:49 -0800 Subject: [PATCH] Some balance fixes to the traumatic shock stuff. --- code/modules/mob/living/carbon/human/life.dm | 5 ++--- code/modules/mob/living/carbon/shock.dm | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index affa676e2c2..59127f887c5 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1078,9 +1078,8 @@ lying = 1 disease_symptoms |= DISEASE_WHISPER - if (shock_stage > 100) - if(prob(5)) - Paralyse(50) + if (shock_stage > 70) if(shock_stage % 30 == 0) + Paralyse(rand(15,28)) if(shock_stage >= 30) if(shock_stage == 30) emote("me",1,"is having trouble keeping their eyes open.") eye_blurry = max(2, eye_blurry) diff --git a/code/modules/mob/living/carbon/shock.dm b/code/modules/mob/living/carbon/shock.dm index 1a846fc1c49..c3539233692 100644 --- a/code/modules/mob/living/carbon/shock.dm +++ b/code/modules/mob/living/carbon/shock.dm @@ -3,7 +3,7 @@ // proc to find out in how much pain the mob is at the moment /mob/living/carbon/proc/updateshock() - src.traumatic_shock = src.getOxyLoss() + src.getToxLoss() + src.getFireLoss() + 1.5*src.getBruteLoss() + 2*src.getCloneLoss() + src.traumatic_shock = src.getOxyLoss() + src.getToxLoss() + src.getFireLoss() + 1.2*src.getBruteLoss() + 2*src.getCloneLoss() if(reagents.has_reagent("alkysine")) src.traumatic_shock -= 10 if(reagents.has_reagent("inaprovaline")) @@ -15,4 +15,4 @@ /mob/living/carbon/proc/handle_shock() - updateshock() \ No newline at end of file + updateshock()