Merge remote-tracking branch 'origin/Bleeding-Edge' into adminbus-final

This commit is contained in:
DeityLink
2014-11-21 07:19:53 +01:00
71 changed files with 5485 additions and 4737 deletions

View File

@@ -77,8 +77,7 @@
W.afterattack(A,src,1,params)
return
if(!isturf(loc))
return
// 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))