Merge pull request #35542 from ShizCalev/free-spam-removal

Cleans up some duplicate canusetopic warnings
This commit is contained in:
oranges
2018-02-16 15:34:37 +13:00
committed by CitadelStationBot
parent 86f27dd5e8
commit 5dc3549801
14 changed files with 43 additions and 51 deletions
@@ -724,11 +724,13 @@
/mob/living/carbon/human/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE)
if(incapacitated() || lying )
to_chat(src, "<span class='warning'>You can't do that right now!</span>")
return FALSE
if(!Adjacent(M) && (M.loc != src))
if((be_close == 0) && (dna.check_mutation(TK)))
if(tkMaxRangeCheck(src, M))
return TRUE
to_chat(src, "<span class='warning'>You are too far away!</span>")
return FALSE
return TRUE