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

Update inactivity.dm

Browse Source
This commit is contained in:
Aronai Sieyes
2020-03-29 18:18:44 -04:00
committed by GitHub
parent 255809524d
commit cbc513314a
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,12 +15,7 @@ SUBSYSTEM_DEF(inactivity)
while(client_list.len) while(client_list.len)
var/client/C = client_list[client_list.len] var/client/C = client_list[client_list.len]
client_list.len-- client_list.len--
<<<<<<< HEAD
if(!C.holder && C.is_afk(config.kick_inactive MINUTES) && !isobserver(C.mob))
=======
if(C.is_afk(config.kick_inactive MINUTES) && can_kick(C)) if(C.is_afk(config.kick_inactive MINUTES) && can_kick(C))
>>>>>>> 253e371... Inactivity subsystem kicks ghosts and admins again (#6886)
to_chat(C, "<span class='warning'>You have been inactive for more than [config.kick_inactive] minute\s and have been disconnected.</span>") 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 var/information
@@ -63,9 +58,7 @@ SUBSYSTEM_DEF(inactivity)
/datum/controller/subsystem/inactivity/stat_entry() /datum/controller/subsystem/inactivity/stat_entry()
..("Kicked: [number_kicked]") ..("Kicked: [number_kicked]")
<<<<<<< HEAD
=======
/datum/controller/subsystem/inactivity/proc/can_kick(var/client/C) /datum/controller/subsystem/inactivity/proc/can_kick(var/client/C)
if(C.holder) return FALSE //VOREStation Add - Don't kick admins.
return TRUE return TRUE
>>>>>>> 253e371... Inactivity subsystem kicks ghosts and admins again (#6886)