cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Thrown sharp objects no longer always embed

Browse Source
This commit is contained in:
mwerezak
2014-07-15 02:21:25 -04:00
parent dbf507062e
commit 08f45dc1cf
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/mob/living/carbon/human/human_damage.dm
View File

@@ -307,9 +307,8 @@ This function restores all organs.
var/embed_threshold = sharp? 5*W.w_class : 15*W.w_class var/embed_threshold = sharp? 5*W.w_class : 15*W.w_class
//Sharp objects will always embed if they do enough damage. //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))) //Thrown objects have some momentum already and have a small chance to embed even if the damage is below the threshold
organ.embed(W) if((sharp && damage > (10*W.w_class)) || (sharp && !ismob(W.loc) && prob(damage/(10*W.w_class)*100)) || (damage > embed_threshold && prob(embed_chance)))
else if( (damage > (5*W.w_class)) && ((!ismob(W.loc) && !sharp)) || (prob((damage - 2)/W.w_class) ) )
organ.embed(W) organ.embed(W)
return 1 return 1