Merge branch 'master' into upstream-merge-30079
This commit is contained in:
@@ -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...")
|
||||
|
||||
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user