diff --git a/Content.Server/Station/Components/StationJobsComponent.cs b/Content.Server/Station/Components/StationJobsComponent.cs index 463550044adeb9..3681ec9674f5ae 100644 --- a/Content.Server/Station/Components/StationJobsComponent.cs +++ b/Content.Server/Station/Components/StationJobsComponent.cs @@ -1,5 +1,4 @@ using System.Linq; -using Content.Server.GameTicking.Rules; using Content.Server.Station.Systems; using Content.Shared.Roles; using JetBrains.Annotations; @@ -13,7 +12,7 @@ namespace Content.Server.Station.Components; /// /// Stores information about a station's job selection. /// -[RegisterComponent, Access(typeof(StationJobsSystem), typeof(AllCaptainsRuleSystem)), PublicAPI] +[RegisterComponent, Access(typeof(StationJobsSystem)), PublicAPI] public sealed partial class StationJobsComponent : Component { /// diff --git a/Content.Server/Station/Systems/StationJobsSystem.cs b/Content.Server/Station/Systems/StationJobsSystem.cs index 226de83e373f7c..307610d136fe3e 100644 --- a/Content.Server/Station/Systems/StationJobsSystem.cs +++ b/Content.Server/Station/Systems/StationJobsSystem.cs @@ -5,7 +5,6 @@ using Content.Shared.CCVar; using Content.Shared.FixedPoint; using Content.Shared.GameTicking; -using Content.Server.GameTicking.Rules; using Content.Shared.Preferences; using Content.Shared.Roles; using JetBrains.Annotations; @@ -28,7 +27,6 @@ public sealed partial class StationJobsSystem : EntitySystem [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly GameTicker _gameTicker = default!; [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly AllCaptainsRuleSystem _allCaptainsRule = default!; /// public override void Initialize() @@ -38,8 +36,6 @@ public override void Initialize() SubscribeLocalEvent(OnStationRenamed); SubscribeLocalEvent(OnStationDeletion); SubscribeLocalEvent(OnPlayerJoinedLobby); - SubscribeLocalEvent(OnGameRuleStarted); - SubscribeLocalEvent(OnGameRuleEnded); Subs.CVar(_configurationManager, CCVars.GameDisallowLateJoins, _ => UpdateJobsAvailable(), true); } @@ -154,9 +150,6 @@ public bool TryAdjustJobSlot(EntityUid station, var jobList = stationJobs.JobList; - if (_allCaptainsRule != null && _allCaptainsRule.RuleStarted) - jobList = _allCaptainsRule.GetJobs(station).JobList; - // This should: // - Return true when zero slots are added/removed. // - Return true when you add. @@ -253,11 +246,6 @@ public bool TrySetJobSlot(EntityUid station, var jobList = stationJobs.JobList; - // If all captains mode, override job list with the allcaptains job list -- prevents modifying the "real" job list - // in case mode changes later. - if (_allCaptainsRule != null && _allCaptainsRule.RuleStarted) - jobList = _allCaptainsRule.GetJobs(station).JobList; - switch (jobList.ContainsKey(jobPrototypeId)) { case false: diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml index 3e5bec1b9c2d10..da198a25d09872 100644 --- a/Resources/Prototypes/GameRules/roundstart.yml +++ b/Resources/Prototypes/GameRules/roundstart.yml @@ -23,12 +23,6 @@ - id: Thief prob: 0.5 -- type: gameRule - id: AllCaptains - config: - !type:GenericGameRuleConfiguration - id: AllCaptains - - type: entity id: DeathMatch31 parent: BaseGameRule @@ -256,8 +250,6 @@ - type: InitialInfectedRole prototype: InitialInfected - - # event schedulers - type: entity id: BasicStationEventScheduler diff --git a/Resources/Prototypes/game_presets.yml b/Resources/Prototypes/game_presets.yml index b22b9383cf17cc..7c7c7e3cab41a2 100644 --- a/Resources/Prototypes/game_presets.yml +++ b/Resources/Prototypes/game_presets.yml @@ -85,8 +85,7 @@ - sandbox name: sandbox-title description: sandbox-description - showInVote: true - maxPlayers: 2 + showInVote: false rules: - Sandbox @@ -163,22 +162,3 @@ - GameRuleMeteorScheduler - BasicRoundstartVariation -- type: gamePreset - id: OopsAllCaptains - alias: - - captains - - captain - - onlycaptains - - OnlyCaptains - - oopsonlycaptains - - oopsallcaptains - - allcaptains - - AllCaptains - name: "Oops! All Captains." - description: "Look at you. You're the captain now." - showInVote: true - rules: - - AllCaptains - - Traitor - - BasicStationEventScheduler -