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

[5726] Makes this PR Compile

Browse Source
This commit is contained in:
Unknown
2019-02-17 18:22:43 -05:00
parent bf86b408fa
commit 20f257e20e
2 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/controllers/subsystems/inactivity.dm
View File

@@ -5,15 +5,9 @@ SUBSYSTEM_DEF(inactivity)
/datum/controller/subsystem/inactivity/fire()
if(config.kick_inactive)
<<<<<<< HEAD:code/controllers/Processes/inactivity.dm
for(last_object in clients)
var/client/C = last_object
if(C.is_afk(config.kick_inactive MINUTES) && !C.holder) // VOREStation Edit - Allow admins to idle
=======
for(var/i in clients)
var/client/C = i
if(C.is_afk(config.kick_inactive MINUTES))
>>>>>>> 414cf71... Merge pull request #5726 from kevinz000/ss_refactor_3:code/controllers/subsystems/inactivity.dm
if(C.is_afk(config.kick_inactive MINUTES) && !C.holder) // VOREStation Edit - Allow admins to idle
to_chat(C,"<span class='warning'>You have been inactive for more than [config.kick_inactive] minute\s and have been disconnected.</span>")
var/information