Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Revert "Oops, All Captains! (#14943)" (#14994)

Browse Source 
This reverts commit 8128759ea8.
This commit is contained in:
Moony
2023-03-30 18:55:09 -05:00
committed by GitHub
parent 8128759ea8
commit 5cc78c2c75
8 changed files with 8 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
View File

@@ -36,7 +36,6 @@ public sealed class TraitorRuleSystem : GameRuleSystem
[Dependency] private readonly MobStateSystem _mobStateSystem = default!;
[Dependency] private readonly UplinkSystem _uplink = default!;
[Dependency] private readonly SharedAudioSystem _audioSystem = default!;
[Dependency] private readonly AllCaptainsRuleSystem _allCaptainsRule = default!;
private ISawmill _sawmill = default!;
@@ -179,8 +178,7 @@ public sealed class TraitorRuleSystem : GameRuleSystem
foreach (var player in candidates.Keys)
{
// Role prevents antag.
if (!(_allCaptainsRule != null && _allCaptainsRule.RuleStarted) && // all captains mode lets some of the captains be traitors :3
!(player.Data.ContentData()?.Mind?.AllRoles.All(role => role is not Job { CanBeAntag: false }) ?? false))
if (!(player.Data.ContentData()?.Mind?.AllRoles.All(role => role is not Job { CanBeAntag: false }) ?? false))
{
continue;
}
@@ -298,8 +296,7 @@ public sealed class TraitorRuleSystem : GameRuleSystem
if (ev.JobId == null || !_prototypeManager.TryIndex<JobPrototype>(ev.JobId, out var job))
return;
if (!job.CanBeAntag &&
!(_allCaptainsRule != null && _allCaptainsRule.RuleStarted)) // all captains mode lets some of the captains be traitors :3
if (!job.CanBeAntag)
return;
// Before the announcement is made, late-joiners are considered the same as players who readied.