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

Merge pull request #2652 from Anewbe/dislocate_numbers

Browse Source 
Lowers the dislocate chance and damage from disarm intent hits
This commit is contained in:
Neerti
2016-10-17 22:36:08 -04:00
committed by GitHub
parent e5f23056be 33b00b8762
commit 67330d1df6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mob/living/carbon/human/human_defense.dm
View File

@@ -199,13 +199,13 @@ emp_act
// Handle striking to cripple. // Handle striking to cripple.
if(user.a_intent == I_DISARM) if(user.a_intent == I_DISARM)
effective_force *= 0.66 //reduced effective force... effective_force *= 0.5 //reduced effective force...
if(!..(I, user, effective_force, blocked, hit_zone)) if(!..(I, user, effective_force, blocked, hit_zone))
return 0 return 0
//set the dislocate mult less than the effective force mult so that //set the dislocate mult less than the effective force mult so that
//dislocating limbs on disarm is a bit easier than breaking limbs on harm //dislocating limbs on disarm is a bit easier than breaking limbs on harm
attack_joint(affecting, I, effective_force, 0.5, blocked) //...but can dislocate joints attack_joint(affecting, I, effective_force, 0.75, blocked) //...but can dislocate joints
else if(!..()) else if(!..())
return 0 return 0