diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index b76b4704dd..17ae3872b0 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -109,7 +109,7 @@ else . = UnarmedAttack(A) if(!(. & NO_AUTO_CLICKDELAY_HANDLING) && ismob(A)) - DelayNextAction(CLICK_CD_MELEE)) + DelayNextAction(CLICK_CD_MELEE) return .? TRUE : FALSE //Can't reach anything else in lockers or other weirdness @@ -124,7 +124,7 @@ else . = UnarmedAttack(A) if(!(. & NO_AUTO_CLICKDELAY_HANDLING) && ismob(A)) - DelayNextAction(CLICK_CD_MELEE)) + DelayNextAction(CLICK_CD_MELEE) return .? TRUE : FALSE else if(W) diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm index 9c94a19707..e72d42cb14 100644 --- a/code/_onclick/cyborg.dm +++ b/code/_onclick/cyborg.dm @@ -80,7 +80,7 @@ if(A == loc || (A in loc) || (A in contents)) . = W.melee_attack_chain(src, A, params) if(!(. & NO_AUTO_CLICKDELAY_HANDLING) && ismob(A)) - DelayNextAction(CLICK_CD_MELEE)) + DelayNextAction(CLICK_CD_MELEE) return !(. & DISCARD_LAST_ACTION) if(!isturf(loc)) @@ -91,7 +91,7 @@ if(A.Adjacent(src)) // see adjacent.dm . = W.melee_attack_chain(src, A, params) if(!(. & NO_AUTO_CLICKDELAY_HANDLING) && ismob(A)) - DelayNextAction(CLICK_CD_MELEE)) + DelayNextAction(CLICK_CD_MELEE) return !(. & DISCARD_LAST_ACTION) else return W.afterattack(A, src, 0, params) diff --git a/code/_onclick/right_click.dm b/code/_onclick/right_click.dm index 33bcd1e0fa..0f5a9022b3 100644 --- a/code/_onclick/right_click.dm +++ b/code/_onclick/right_click.dm @@ -42,7 +42,7 @@ if(!AltUnarmedAttack(A)) . = UnarmedAttack(A) if(!(. & NO_AUTO_CLICKDELAY_HANDLING) && ismob(A)) - DelayNextAction(CLICK_CD_MELEE)) + DelayNextAction(CLICK_CD_MELEE) return .? TRUE : FALSE return TRUE @@ -59,7 +59,7 @@ if(!AltUnarmedAttack(A,1)) . = UnarmedAttack(A) if(!(. & NO_AUTO_CLICKDELAY_HANDLING) && ismob(A)) - DelayNextAction(CLICK_CD_MELEE)) + DelayNextAction(CLICK_CD_MELEE) return .? TRUE : FALSE return TRUE else