From 08f45dc1cf982a553bf0433fb9318fd442ed798f Mon Sep 17 00:00:00 2001 From: mwerezak Date: Tue, 15 Jul 2014 02:21:25 -0400 Subject: [PATCH] Thrown sharp objects no longer always embed --- code/modules/mob/living/carbon/human/human_damage.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 62ac94e2f79..570e141c651 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -307,9 +307,8 @@ This function restores all organs. var/embed_threshold = sharp? 5*W.w_class : 15*W.w_class //Sharp objects will always embed if they do enough damage. - if((sharp && damage > (10*W.w_class)) || (sharp && !ismob(W.loc)) || (damage > embed_threshold && prob(embed_chance))) - organ.embed(W) - else if( (damage > (5*W.w_class)) && ((!ismob(W.loc) && !sharp)) || (prob((damage - 2)/W.w_class) ) ) + //Thrown objects have some momentum already and have a small chance to embed even if the damage is below the threshold + if((sharp && damage > (10*W.w_class)) || (sharp && !ismob(W.loc) && prob(damage/(10*W.w_class)*100)) || (damage > embed_threshold && prob(embed_chance))) organ.embed(W) return 1