shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sigh

Browse Source
This commit is contained in:
silicons
2020-07-24 23:34:47 -07:00
parent 849919d76c
commit 0e1574bf77
7 changed files with 45 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/mutations/hulk.dm
+5 -1
View File
@@ -21,7 +21,11 @@
/datum/mutation/human/hulk/on_attack_hand(atom/target, proximity, act_intent, unarmed_attack_flags)
if(proximity && (act_intent == INTENT_HARM)) //no telekinetic hulk attack
return target.attack_hulk(owner)
if(!owner.CheckActionCooldown(CLICK_CD_MELEE))
return INTERRUPT_UNARMED_ATTACK | NO_AUTO_CLICKDELAY_HANDLING
owner.DelayNextAction()
target.attack_hulk(owner)
return INTERRUPT_UNARMED_ATTACK | NO_AUTO_CLICKDELAY_HANDLING
/datum/mutation/human/hulk/on_life()
if(owner.health < 0)