Merge pull request #5513 from Citadel-Station-13/upstream-merge-35542

[MIRROR] Cleans up some duplicate canusetopic warnings
This commit is contained in:
LetterJay
2018-02-15 22:17:54 -06:00
committed by GitHub
14 changed files with 43 additions and 51 deletions
@@ -863,8 +863,10 @@
/mob/living/silicon/robot/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE)
if(stat || lockcharge || low_power_mode)
to_chat(src, "<span class='warning'>You can't do that right now!</span>")
return FALSE
if(be_close && !in_range(M, src))
to_chat(src, "<span class='warning'>You are too far away!</span>")
return FALSE
return TRUE