Merge remote-tracking branch 'deltav/master' into upstream-ops

# Conflicts: # Resources/ConfigPresets/DeltaV/deltav.toml # Resources/ConfigPresets/DeltaV/periapsis.toml
A-Love-Letter-to-Infinity · Oct 4, 2024 · d79cd0f · d79cd0f
2 parents 11a9bec + b32635b
commit d79cd0f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Content.Client/DeltaV/Administration/UI/DepartmentWhitelistPanel.xaml.cs b/Content.Client/DeltaV/Administration/UI/DepartmentWhitelistPanel.xaml.cs
@@ -18,11 +18,14 @@ public DepartmentWhitelistPanel(DepartmentPrototype department, IPrototypeManage
         RobustXamlLoader.Load(this);
 
         var allWhitelisted = true;
+        var grey = Color.FromHex("#ccc");
         foreach (var id in department.Roles)
         {
             var thisJob = id; // closure capturing funny
             var button = new CheckBox();
             button.Text = proto.Index(id).LocalizedName;
+            if (!proto.Index(id).Whitelisted)
+                button.Modulate = grey; // Let admins know whitelisting this job is only for futureproofing.
             button.Pressed = whitelists.Contains(id);
             button.OnPressed += _ => OnSetJob?.Invoke(thisJob, button.Pressed);
             JobsContainer.AddChild(button);

diff --git a/RobustToolbox b/RobustToolbox