cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 22:47:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rework AFK system after discussing with head

Browse Source
This commit is contained in:
joep van der velden
2019-12-24 11:39:53 +01:00
parent 377ae7671b
commit 14242045ec
8 changed files with 62 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/configuration.dm
+8 -2
View File
@@ -72,7 +72,9 @@
var/assistantlimit = 0 //enables assistant limiting
var/assistantratio = 2 //how many assistants to security members
// The AFK subsystem will not be activated if the below config value is equal or less than 0
// The AFK subsystem will not be activated if any of the below config values are equal or less than 0
var/warn_afk_minimum = 0 // How long till you get a warning while being AFK
var/auto_cryo_afk = 0 // How long till you get put into cryo when you're AFK
var/auto_despawn_afk = 0 // How long till you actually despawn in cryo when you're AFK (Not ssd so not automatic)
var/auto_cryo_ssd_mins = 0
@@ -315,7 +317,11 @@
if("shadowling_max_age")
config.shadowling_max_age = text2num(value)
if("warn_afk_minimum")
config.warn_afk_minimum = text2num(value)
if("auto_cryo_afk")
config.auto_cryo_afk = text2num(value)
if("auto_despawn_afk")
config.auto_despawn_afk = text2num(value)
code/controllers/subsystem/afk.dm
+36 -19
View File
@@ -1,15 +1,22 @@
#define AFK_WARNED 1
#define AFK_CRYOD 2
#define AFK_WARNED 1
#define AFK_CRYOD 2
#define AFK_ADMINS_WARNED 2
#define AFK_FAST_CRYO_WARN 3
#define AFK_FAST_CRYO_CRYO 5
SUBSYSTEM_DEF(afk)
name = "AFK Watcher"
wait = 300
flags = SS_BACKGROUND
var/list/afk_players = list() // Associative list. ckey as key and AFK state as value
var/list/non_cryo_antags = list( \
SPECIAL_ROLE_ABDUCTOR_AGENT, SPECIAL_ROLE_ABDUCTOR_SCIENTIST, \
SPECIAL_ROLE_SHADOWLING, SPECIAL_ROLE_WIZARD, SPECIAL_ROLE_WIZARD_APPRENTICE, SPECIAL_ROLE_NUKEOPS)
/datum/controller/subsystem/afk/Initialize()
if(config.auto_despawn_afk <= 0)
if(config.warn_afk_minimum <= 0 || config.auto_cryo_afk <= 0 || config.auto_despawn_afk <= 0)
flags |= SS_NO_FIRE
/datum/controller/subsystem/afk/fire()
@@ -19,22 +26,22 @@ SUBSYSTEM_DEF(afk)
continue
var/turf/T
var/afk_warn_min
// Only players and players with the AFK watch enabled
// No dead, unconcious, restrained, people without jobs, people on other Z levels than the station or antags (if they have the preference option off)
if(!H.client || !(afk_warn_min = H.client.prefs.AFK_WATCH_warn_minutes) || !H.mind || \
H.stat || H.restrained() || !H.job || (H.mind.special_role && !H.client.prefs.AFK_WATCH_antag) || \
!is_station_level((T = get_turf(H)).z)) // Assign the turf as last. Small optimization
// Only players who have a mind
// No dead, unconcious, restrained, people without jobs, people on other Z levels than the station
if(!H.client || !H.mind || H.stat || H.restrained() || \
!H.job || !is_station_level((T = get_turf(H)).z)) // Assign the turf as last. Small optimization
if(afk_players[H.ckey])
toRemove += H.ckey
continue
var/mins_afk = round(H.client.inactivity / 600)
var/afk_warn_min = H.client.prefs.afk_fast_cryo ? AFK_FAST_CRYO_WARN : config.warn_afk_minimum
if(mins_afk < afk_warn_min)
if(afk_players[H.ckey])
toRemove += H.ckey
continue
var/afk_cryo_min = H.client.prefs.AFK_WATCH_cryo_minutes + afk_warn_min
var/afk_cryo_min = H.client.prefs.afk_fast_cryo ? AFK_FAST_CRYO_CRYO : config.auto_cryo_afk
if(!afk_players[H.ckey])
afk_players[H.ckey] = AFK_WARNED
warn(H, "<span class='danger'>You are AFK for [mins_afk] minutes. You will be cryod after [afk_cryo_min] total minutes and fully despawned after another [config.auto_despawn_afk] minutes. Please move or click in game if you want to avoid being despawned.</span>")
@@ -45,16 +52,21 @@ SUBSYSTEM_DEF(afk)
if(A.fast_despawn)
toRemove += H.ckey
warn(H, "<span class='danger'>You are have been despawned after being AFK for [mins_afk] minutes. You have been despawned instantly due to you being in a secure area.</span>")
msg_admins(H, mins_afk, T, "forcefully despawned", "AFK in a fast despawn area")
log_admins(H, mins_afk, T, "despawned", "AFK in a fast despawn area")
force_cryo_human(H)
else if(cryo_ssd(H))
afk_players[H.ckey] = AFK_CRYOD
msg_admins(H, mins_afk, T, "put into cryostorage")
warn(H, "<span class='danger'>You are AFK for [mins_afk] minutes and have been moved to cryostorage. After being AFK for another [config.auto_despawn_afk] minutes you will be fully despawned. Please eject yourself (right click, eject) out of the cryostorage if you want to avoid being despawned.</span>")
else
if(can_cryo_antag(H))
if(cryo_ssd(H))
afk_players[H.ckey] = AFK_CRYOD
log_admins(H, mins_afk, T, "put into cryostorage")
warn(H, "<span class='danger'>You are AFK for [mins_afk] minutes and have been moved to cryostorage. After being AFK for another [config.auto_despawn_afk] minutes you will be fully despawned. Please eject yourself (right click, eject) out of the cryostorage if you want to avoid being despawned.</span>")
else
message_admins("[key_name_admin(H)] at ([get_area(T).name] [ADMIN_JMP(T)]) is AFK for [mins_afk] and can't be cryod due to it's antag status: ([H.mind.special_role]).")
afk_players[H.ckey] = AFK_ADMINS_WARNED
else if(mins_afk >= config.auto_despawn_afk + afk_cryo_min)
var/obj/machinery/cryopod/P = H.loc
msg_admins(H, mins_afk, T, "forcefully despawned")
log_admins(H, mins_afk, T, "despawned")
warn(H, "<span class='danger'>You are have been despawned after being AFK for [mins_afk] minutes.</span>")
toRemove += H.ckey
P.despawn_occupant()
@@ -67,9 +79,11 @@ SUBSYSTEM_DEF(afk)
if(H.client)
window_flash(H.client)
/datum/controller/subsystem/afk/proc/msg_admins(mob/living/carbon/human/H, mins_afk, turf/location, action, info)
/datum/controller/subsystem/afk/proc/can_cryo_antag(mob/living/carbon/human/H)
return !(H.mind.special_role in non_cryo_antags)
/datum/controller/subsystem/afk/proc/log_admins(mob/living/carbon/human/H, mins_afk, turf/location, action, info)
log_admin("[key_name(H)] has been [action] by the AFK Watcher subsystem after being AFK for [mins_afk] minutes.[info ? " Extra info:" + info : ""]")
message_admins("[key_name_admin(H)] at ([get_area(location).name] [ADMIN_JMP(location)]) has been [action] by the AFK Watcher subsystem after being AFK for [mins_afk] minutes.[info ? " Extra info:" + info : ""]")
/datum/controller/subsystem/afk/proc/removeFromWatchList(list/toRemove)
for(var/C in toRemove)
@@ -79,4 +93,7 @@ SUBSYSTEM_DEF(afk)
break
#undef AFK_WARNED
#undef AFK_CRYOD
#undef AFK_CRYOD
#undef AFK_ADMINS_WARNED
#undef AFK_FAST_CRYO_WARN
#undef AFK_FAST_CRYO_CRYO