From b11a05785a67edc8c4ab7b9486cd63ffa7893501 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Fri, 31 Mar 2017 11:25:21 -0400 Subject: [PATCH] Fixes #25630 (#25639) --- code/_onclick/click.dm | 4 ++-- code/_onclick/cyborg.dm | 4 ++-- code/_onclick/telekinesis.dm | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index f1ebd40c873..9bda2364623 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -117,7 +117,7 @@ if(A.ClickAccessible(src, depth=INVENTORY_DEPTH)) // No adjacency needed if(W) - melee_item_attack_chain(src, W, A) + melee_item_attack_chain(src, W, A, params) else if(ismob(A)) changeNext_move(CLICK_CD_MELEE) @@ -131,7 +131,7 @@ if(isturf(A) || isturf(A.loc) || (A.loc && isturf(A.loc.loc))) if(Adjacent(A) || (W && CheckReach(src, A, W.reach))) //Adjacent or reaching attacks if(W) - melee_item_attack_chain(src, W, A) + melee_item_attack_chain(src, W, A, params) else if(ismob(A)) changeNext_move(CLICK_CD_MELEE) diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm index 303c0877b02..2cd840ca978 100644 --- a/code/_onclick/cyborg.dm +++ b/code/_onclick/cyborg.dm @@ -68,7 +68,7 @@ // cyborgs are prohibited from using storage items so we can I think safely remove (A.loc in contents) if(A == loc || (A in loc) || (A in contents)) - melee_item_attack_chain(src, W, A) + melee_item_attack_chain(src, W, A, params) return if(!isturf(loc)) @@ -77,7 +77,7 @@ // cyborgs are prohibited from using storage items so we can I think safely remove (A.loc && isturf(A.loc.loc)) if(isturf(A) || isturf(A.loc)) if(A.Adjacent(src)) // see adjacent.dm - melee_item_attack_chain(src, W, A) + melee_item_attack_chain(src, W, A, params) return else W.afterattack(A, src, 0, params) diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index d90e1a34653..41318281821 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -125,7 +125,7 @@ var/const/tk_maxrange = 15 if(!isturf(target) && istype(focus,/obj/item) && target.Adjacent(focus)) apply_focus_overlay() - melee_item_attack_chain(tk_user, focus, target) //isn't copying the attack chain fun. we should do it more often. + melee_item_attack_chain(tk_user, focus, target, params) //isn't copying the attack chain fun. we should do it more often. if(check_if_focusable(focus)) focus.do_attack_animation(target, null, focus) else