This commit is contained in:
silicons
2020-07-23 09:32:28 -07:00
parent 703afec454
commit 99eb77c052
7 changed files with 19 additions and 20 deletions
+4 -4
View File
@@ -111,9 +111,9 @@
if(A in DirectAccess())
if(W)
. = W.melee_attack_chain(src, A, params)
. = !(. & DISCARD_LAST_ACTION)
return = !(. & DISCARD_LAST_ACTION)
else
. = UnarmedAttack(A)? TRUE : FALSE
return UnarmedAttack(A)? TRUE : FALSE
//Can't reach anything else in lockers or other weirdness
if(!loc.AllowClick())
@@ -123,9 +123,9 @@
if(CanReach(A,W))
if(W)
. = W.melee_attack_chain(src, A, params)
. = !(. & DISCARD_LAST_ACTION)
return !(. & DISCARD_LAST_ACTION)
else
. = UnarmedAttack(A, 1)? TRUE : FALSE
return UnarmedAttack(A, 1)? TRUE : FALSE
else
if(W)
W.ranged_attack_chain(src, A, params)