cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #241 from Fox-McCloud/Dismemberment-Fixes

Browse Source 
Dismemberment Fixes
This commit is contained in:
Fox-McCloud
2015-01-31 03:29:35 -05:00
parent 516264107e 74bbb57a41
commit c3b0df0ef4
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_defense.dm
+2 -2
View File
@@ -314,8 +314,8 @@ emp_act
forcesay(hit_appends) //forcesay checks stat already
if (I.damtype == BRUTE)
if((I.edge && prob(2 * I.force)) || (I.force > 20 && prob(I.force)))
if(affecting.brute_dam >= affecting.max_damage * config.organ_health_multiplier)
if((affecting.brute_dam + I.force) >= affecting.max_damage * config.organ_health_multiplier)
if(I.edge && prob(I.force))
affecting.dismember_limb()
/* //Melee weapon embedded object code. Commented out, as most people on the forums seem to find this annoying and think it does not contribute to general gameplay. - Dave