cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 21:48:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15030 from neersighted/tkui

Browse Source 
Fix tgui tk checks
This commit is contained in:
tkdrg
2016-01-30 08:02:33 -03:00
parent 0c9217a9a5 175d78d989
commit ae1d3ca202
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/tgui/states.dm
+6 -8
View File
@@ -55,13 +55,6 @@
return UI_UPDATE
return UI_INTERACTIVE
/mob/living/carbon/human/shared_ui_interaction(src_object)
// If we have telekinesis and remain close enough, allow interaction.
if(dna.check_mutation(TK))
if(tkMaxRangeCheck(src, src_object))
return UI_INTERACTIVE
return ..()
/mob/living/silicon/ai/shared_ui_interaction(src_object)
if(lacks_power()) // Close UIs if the AI is unpowered.
return UI_CLOSE
@@ -109,4 +102,9 @@
return UI_UPDATE
else if(dist <= 5) // Disable if 5 tiles away.
return UI_DISABLED
return UI_CLOSE // Otherwise, we got nothing.
return UI_CLOSE // Otherwise, we got nothing.
/mob/living/carbon/human/shared_living_ui_distance(atom/movable/src_object)
if(dna.check_mutation(TK) && tkMaxRangeCheck(src, src_object))
return UI_INTERACTIVE
return ..()