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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human.dm
+2
View File
@@ -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
code/modules/mob/living/living.dm
+7 -5
View File
@@ -787,13 +787,15 @@
/mob/living/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(no_dextery)
if(be_close && in_range(M, src))
return TRUE
else
if(be_close && !in_range(M, src))
to_chat(src, "<span class='warning'>You are too far away!</span>")
return FALSE
if(!no_dextery)
to_chat(src, "<span class='warning'>You don't have the dexterity to do this!</span>")
return FALSE
return FALSE
return TRUE
/mob/living/proc/can_use_guns(obj/item/G)
if(G.trigger_guard != TRIGGER_GUARD_ALLOW_ALL && !IsAdvancedToolUser())
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
@@ -875,8 +875,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
code/modules/mob/living/simple_animal/simple_animal.dm
+5 -4
View File
@@ -377,11 +377,12 @@
/mob/living/simple_animal/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(no_dextery || dextrous)
if(be_close && !in_range(M, src))
return FALSE
else
if(be_close && !in_range(M, src))
to_chat(src, "<span class='warning'>You are too far away!</span>")
return FALSE
if(!(no_dextery || dextrous))
to_chat(src, "<span class='warning'>You don't have the dexterity to do this!</span>")
return FALSE
return TRUE