cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source 
Conflicts:
	code/modules/clothing/spacesuits/rig/suits/light.dm
This commit is contained in:
PsiOmega
2015-03-01 21:15:47 +01:00
parent 677ad254bb 413b085994
commit 02a1e1d129
51 changed files with 330 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/nano/nanointeraction.dm
View File

@@ -28,8 +28,10 @@
return STATUS_CLOSE
if(lockcharge || stunned || weakened)
return STATUS_DISABLED
if(custom_state.flags & NANO_IGNORE_DISTANCE)
return STATUS_INTERACTIVE
// robots can interact with things they can see within their view range
if(!(custom_state.flags & NANO_IGNORE_DISTANCE) && (src_object in view(src)))
if((src_object in view(src)) && get_dist(src_object, src) <= src.client.view)
return STATUS_INTERACTIVE // interactive (green visibility)
return STATUS_DISABLED // no updates, completely disabled (red visibility)