Hide Unnecessary Roles

Content.IntegrationTests/Tests/Round/JobTest.cs

@@ -50,9 +50,14 @@ private void AssertJob(TestPair pair, ProtoId<JobPrototype> job, NetUserId? user
         var mindSys = pair.Server.System<MindSystem>();
         var roleSys = pair.Server.System<RoleSystem>();
         var ticker = pair.Server.System<GameTicker>();
+        var prototypeManager = pair.Server.ProtoMan;
 
         user ??= pair.Client.User!.Value;
 
+        // If it shouldn't exist in preferences, it shouldn't be tested.
+        if (prototypeManager.TryIndex(job, out var jobPrototype) && !jobPrototype.SetPreference)
+            return;
+
         Assert.That(ticker.RunLevel, Is.EqualTo(GameRunLevel.InRound));
         Assert.That(ticker.PlayerGameStatuses[user.Value], Is.EqualTo(PlayerGameStatus.JoinedGame));
 

Content.IntegrationTests/Tests/Station/StationJobsTest.cs

@@ -203,50 +203,6 @@ await server.WaitAssertion(() =>
         });
         await pair.CleanReturnAsync();
     }
-
-    [Test]
-    public async Task InvalidRoundstartJobsTest()
-    {
-        await using var pair = await PoolManager.GetServerClient();
-        var server = pair.Server;
-
-        var prototypeManager = server.ResolveDependency<IPrototypeManager>();
-        var compFact = server.ResolveDependency<IComponentFactory>();
-        var name = compFact.GetComponentName<StationJobsComponent>();
-
-        await server.WaitAssertion(() =>
-        {
-            // invalidJobs contains all the jobs which can't be set for preference:
-            // i.e. all the jobs that shouldn't be available round-start.
-            var invalidJobs = new HashSet<string>();
-            foreach (var job in prototypeManager.EnumeratePrototypes<JobPrototype>())
-            {
-                if (!job.SetPreference)
-                    invalidJobs.Add(job.ID);
-            }
-
-            Assert.Multiple(() =>
-            {
-                foreach (var gameMap in prototypeManager.EnumeratePrototypes<GameMapPrototype>())
-                {
-                    foreach (var (stationId, station) in gameMap.Stations)
-                    {
-                        if (!station.StationComponentOverrides.TryGetComponent(name, out var comp))
-                            continue;
-
-                        foreach (var (job, array) in ((StationJobsComponent) comp).SetupAvailableJobs)
-                        {
-                            Assert.That(array.Length, Is.EqualTo(2));
-                            Assert.That(array[0] is -1 or >= 0);
-                            Assert.That(array[1] is -1 or >= 0);
-                            Assert.That(invalidJobs, Does.Not.Contain(job), $"Station {stationId} contains job prototype {job} which cannot be present roundstart.");
-                        }
-                    }
-                }
-            });
-        });
-        await pair.CleanReturnAsync();
-    }
 }
 
 internal static class JobExtensions

Content.Shared/Roles/DepartmentPrototype.cs

@@ -46,7 +46,7 @@ public sealed partial class DepartmentPrototype : IPrototype
     /// Toggles the display of the department in the priority setting menu in the character editor.
     /// </summary>
     [DataField]
-    public bool EditorHidden;
+    public bool EditorHidden { get; private set; } = true;
 }
 
 /// <summary>

Content.Shared/Roles/JobPrototype.cs

@@ -66,7 +66,7 @@ public sealed partial class JobPrototype : IPrototype
         ///     Should this job appear in preferences menu?
         /// </summary>
         [DataField("setPreference")]
-        public bool SetPreference { get; private set; } = true;
+        public bool SetPreference { get; private set; }
 
         /// <summary>
         ///     Should the selected traits be applied for this job?

Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml

@@ -6,6 +6,7 @@
   startingGear: PassengerGear
   icon: "JobIconPassenger"
   supervisors: job-supervisors-everyone
+  setPreference: true
   access:
   - Maintenance
 

Resources/Prototypes/Roles/Jobs/departments.yml

@@ -12,6 +12,7 @@
   id: Civilian
   name: department-Civilian
   description: department-Civilian-description
+  editorHidden: false
   color: "#9FED58"
   weight: -10
   roles: