This commit is contained in:
silicons
2020-07-20 10:46:52 -07:00
parent 58e26c540c
commit 984796b8c6
17 changed files with 53 additions and 63 deletions
+2 -2
View File
@@ -77,7 +77,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))
W.melee_attack_chain(src, A, params)
. = !(W.melee_attack_chain(src, A, params) & DISCARD_LAST_ACTION)
return
if(!isturf(loc))
@@ -86,7 +86,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
W.melee_attack_chain(src, A, params)
. = !(W.melee_attack_chain(src, A, params) & DISCARD_LAST_ACTION)
return
else
W.afterattack(A, src, 0, params)