mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-24 12:37:26 +01:00
Merge pull request #14646 from farie82/toggles2-fix
AFK cryoing and window flashing preferences are respected again
This commit is contained in:
@@ -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")
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user