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

[MIRROR] Cleans up some duplicate canusetopic warnings
2018-02-15 22:17:54 -06:00
parent 65ee13fdb9 bd647e019a
commit 14d387fa04
14 changed files with 43 additions and 51 deletions
@@ -94,8 +94,10 @@

 /mob/living/carbon/true_devil/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE)
 	if(incapacitated())
+		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