cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-29 23:17:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes jointlock not accounting for species with less health or NO_PAIN

Browse Source
This commit is contained in:
HarpyEagle
2016-06-20 00:08:51 +01:00
committed by Yoshax
parent fd3a3175ae
commit 0ba2aef187
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/mob_grab_specials.dm
+7 -1
View File
@@ -51,10 +51,16 @@
return
attacker.visible_message("<span class='danger'>[attacker] [pick("bent", "twisted")] [target]'s [organ.name] into a jointlock!</span>")
if(target.species.flags & NO_PAIN)
return
var/armor = target.run_armor_check(target, "melee")
if(armor < 60)
target << "<span class='danger'>You feel extreme pain!</span>"
affecting.adjustHalLoss(Clamp(0, 60-affecting.halloss, 30)) //up to 60 halloss
var/max_halloss = round(target.species.total_health * 0.8) //up to 80% of passing out
affecting.adjustHalLoss(Clamp(0, max_halloss - affecting.halloss, 30))
/obj/item/weapon/grab/proc/attack_eye(mob/living/carbon/human/target, mob/living/carbon/human/attacker)
if(!istype(attacker))