cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 13:37:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge conflicts begone

Browse Source
This commit is contained in:
Crazylemon64
2016-08-01 18:28:47 -07:00
parent c48d216ebc
commit bc93078da5
169 changed files with 1524 additions and 745 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/nano/interaction/base.dm
+2 -2
View File
@@ -12,9 +12,9 @@
return STATUS_CLOSE
/mob/proc/shared_nano_interaction()
if(src.stat || !client)
if(stat || !client)
return STATUS_CLOSE // no updates, close the interface
else if(restrained() || lying || stat || stunned || weakened)
else if(restrained() || lying || stunned || weakened)
return STATUS_UPDATE // update only (orange visibility)
return STATUS_INTERACTIVE