shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
[MIRROR] Cleans up some duplicate canusetopic warnings
This commit is contained in:
LetterJay
2018-02-15 22:17:54 -06:00
committed by GitHub
parent 65ee13fdb9 bd647e019a
commit 14d387fa04
14 changed files with 43 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/ai/ai.dm
+2
View File
@@ -798,8 +798,10 @@
/mob/living/silicon/ai/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE)
if(control_disabled || 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 can_see(M) //stop AIs from leaving windows open and using then after they lose vision
code/modules/mob/living/silicon/pai/pai.dm
+1
View File
@@ -186,6 +186,7 @@
/mob/living/silicon/pai/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE)
if(be_close && !in_range(M, src))
to_chat(src, "<span class='warning'>You are too far away!</span>")
return FALSE
return TRUE
code/modules/mob/living/silicon/robot/robot.dm
+2
View File
@@ -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