Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Antag double rolling fix #1754

Merged
merged 1 commit into from
Apr 30, 2024
Merged

Antag double rolling fix #1754

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions monkestation/code/modules/storytellers/gamemode_subsystem.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,9 +271,14 @@ SUBSYSTEM_DEF(gamemode)
if(!observers)
if(!ready_players && !isliving(candidate))
continue
if(no_antags && candidate.mind.special_role)
log_storyteller("Candidate([candidate]) removed from rolling poll due to special_role([candidate.mind.special_role])")
continue
if(no_antags && !isnull(candidate.mind.antag_datums))
var/real = FALSE
for(var/datum/antagonist/antag_datum as anything in candidate.mind.antag_datums)
if(!(antag_datum.antag_flags & FLAG_FAKE_ANTAG))
real = TRUE
break
if(real)
continue
if(restricted_roles && (candidate.mind.assigned_role.title in restricted_roles))
continue
if(length(required_roles) && !(candidate.mind.assigned_role.title in required_roles))
Expand Down
Loading