revert capitan

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;
 /// <summary>
 /// Stores information about a station's job selection.
 /// </summary>
-[RegisterComponent, Access(typeof(StationJobsSystem), typeof(AllCaptainsRuleSystem)), PublicAPI]
+[RegisterComponent, Access(typeof(StationJobsSystem)), PublicAPI]
 public sealed partial class StationJobsComponent : Component
 {
     /// <summary>

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!;
 
     /// <inheritdoc/>
     public override void Initialize()
@@ -38,8 +36,6 @@ public override void Initialize()
         SubscribeLocalEvent<StationJobsComponent, StationRenamedEvent>(OnStationRenamed);
         SubscribeLocalEvent<StationJobsComponent, ComponentShutdown>(OnStationDeletion);
         SubscribeLocalEvent<PlayerJoinedLobbyEvent>(OnPlayerJoinedLobby);
-        SubscribeLocalEvent<GameRuleStartedEvent>(OnGameRuleStarted);
-        SubscribeLocalEvent<GameRuleEndedEvent>(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:

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

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
-