cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-20 20:37:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'upstream-master' into upstream-development

Browse Source
This commit is contained in:
Werner
2018-11-04 13:49:40 +01:00
parent c66b7c1941 2447da3d6e
commit 86a9f5cb48
25 changed files with 137 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/spirit_board.dm
+2 -2
View File
@@ -63,8 +63,8 @@
//mobs in range check
var/users_in_range = 0
for(var/mob/living/L in orange(1,src))
if(L.ckey && L.client)
if((world.time - L.client.inactivity) < (world.time - 300) || L.stat != CONSCIOUS || L.restrained())
if(L.ckey)
if(L.stat != CONSCIOUS || L.restrained())
to_chat(M, "<span class='warning'>\The [L] does not seem to be paying attention to the [src].</span>")
else
users_in_range++