Merge branch 'master' into upstream-merge-30079

This commit is contained in:
LetterJay
2017-09-06 09:24:23 -05:00
committed by GitHub
550 changed files with 13328 additions and 156749 deletions
+1 -1
View File
@@ -76,7 +76,7 @@
if(emagged)
return
emagged = TRUE
req_access = null
req_access = list()
say("DB error \[Code 0x00F1\]")
sleep(10)
say("Attempting auto-repair...")
+1 -1
View File
@@ -421,7 +421,7 @@
target = safepick(view(3,target))
if(!target)
return
if(!target.Adjacent(src))
if(!Adjacent(target))
if(selected && selected.is_ranged())
if(selected.action(target,params))
selected.start_cooldown()