Skip to content

Commit

Permalink
[MIRROR] fix roleless poll ignores not working (#2223)
Browse files Browse the repository at this point in the history
* fix roleless poll ignores not working (#82911)

Fixes tgstation/tgstation#82890

In some cases an alert poll had no role, like the monkey helmet, and
because of that it skipped the eligibility check
## Changelog
:cl:
fix: All alert polls ignore option works
/:cl:

* fix roleless poll ignores not working

---------

Co-authored-by: 13spacemen <[email protected]>
  • Loading branch information
2 people authored and StealsThePRs committed Apr 28, 2024
1 parent ef82542 commit fae52ba
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions code/controllers/subsystem/polling.dm
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,13 @@ SUBSYSTEM_DEF(polling)
for(var/mob/candidate_mob as anything in group)
if(!candidate_mob.client)
continue
// Universal opt-out for all players if it's for a role.
if(role && (!candidate_mob.client.prefs.read_preference(/datum/preference/toggle/ghost_roles)))
// Universal opt-out for all players.
if(!candidate_mob.client.prefs.read_preference(/datum/preference/toggle/ghost_roles))
continue
// Opt-out for admins whom are currently adminned.
if(role && (!candidate_mob.client.prefs.read_preference(/datum/preference/toggle/ghost_roles_as_admin)) && candidate_mob.client.holder)
if((!candidate_mob.client.prefs.read_preference(/datum/preference/toggle/ghost_roles_as_admin)) && candidate_mob.client.holder)
continue
if(role && !is_eligible(candidate_mob, role, check_jobban, ignore_category))
if(!is_eligible(candidate_mob, role, check_jobban, ignore_category))
continue

if(start_signed_up)
Expand Down

0 comments on commit fae52ba

Please sign in to comment.