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

fix

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
code/_onclick/right_click.dm
+6 -7
View File
@@ -36,12 +36,11 @@
//User itself, current loc, and user inventory
if(A in DirectAccess())
if(W)
. = W.rightclick_melee_attack_chain(src, A, params)
. = !(. & DISCARD_LAST_ACTION)
. = W.melee_attack_chain(src, A, params)
return !(. & DISCARD_LAST_ACTION)
else
if(!AltUnarmedAttack(A))
. = UnarmedAttack(A, 1)? TRUE : FALSE
return
return UnarmedAttack(A, 1)? TRUE : FALSE
//Can't reach anything else in lockers or other weirdness
if(!loc.AllowClick())
@@ -50,11 +49,11 @@
//Standard reach turf to turf or reaching inside storage
if(CanReach(A,W))
if(W)
. = W.rightclick_melee_attack_chain(src, A, params)
. = !(. & DISCARD_LAST_ACTION)
. = W.melee_attack_chain(src, A, params)
return !(. & DISCARD_LAST_ACTION)
else
if(!AltUnarmedAttack(A,1))
. = UnarmedAttack(A, 1)? TRUE : FALSE
return UnarmedAttack(A, 1)? TRUE : FALSE
else
if(W)
if(!W.altafterattack(A, src, FALSE, params))