From f0600cbc8ad44f61bec7e64d263200f2c96db859 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Sun, 18 Oct 2020 12:39:38 +0200 Subject: [PATCH] AFK cryoing and window flashing prefs are respected --- code/__HELPERS/game.dm | 2 +- code/controllers/subsystem/afk.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index 150de317bb1..98620e27255 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -469,7 +469,7 @@ var/mob/M = C if(M.client) C = M.client - if(!C || !C.prefs.toggles2 & PREFTOGGLE_2_WINDOWFLASHING) + if(!C || !(C.prefs.toggles2 & PREFTOGGLE_2_WINDOWFLASHING)) return winset(C, "mainwindow", "flash=5") diff --git a/code/controllers/subsystem/afk.dm b/code/controllers/subsystem/afk.dm index 3d82762cc42..ee3d70814b4 100644 --- a/code/controllers/subsystem/afk.dm +++ b/code/controllers/subsystem/afk.dm @@ -29,7 +29,7 @@ SUBSYSTEM_DEF(afk) var/turf/T // Only players and players with the AFK watch enabled // No dead, unconcious, restrained, people without jobs or people on other Z levels than the station - if(!H.client || !H.client.prefs.toggles2 & PREFTOGGLE_2_AFKWATCH || !H.mind || \ + if(!H.client || !(H.client.prefs.toggles2 & PREFTOGGLE_2_AFKWATCH) || !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