Merge branch 'cib' of github.com:CIB/tgstation13 into cib

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4730 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
CIB123
2012-09-19 18:54:55 +00:00
parent fad4dcbada
commit d6206e172d

View File

@@ -59,7 +59,7 @@
if(!(status & ORGAN_ROBOT))
owner << "You feel something wet on your [display_name]"
else if(brute_dam > 15)
else if(brute > 20)
if(config.limbs_can_break && brute_dam >= max_damage * config.organ_health_multiplier)
if(prob(5 * brute))
status |= ORGAN_DESTROYED