popukai

Simple-Station · Oct 24, 2024 · 791c309 · 791c309
1 parent b8fddba
commit 791c309
Show file tree

Hide file tree

Showing 44,306 changed files with 4,476,682 additions and 73,041 deletions.
diff --git a/Content.Client/Administration/UI/DepartmentWhitelistPanel.xaml b/Content.Client/Administration/UI/DepartmentWhitelistPanel.xaml
diff --git a/Content.Client/Administration/UI/DepartmentWhitelistPanel.xaml.cs b/Content.Client/Administration/UI/DepartmentWhitelistPanel.xaml.cs
diff --git a/Content.Client/Administration/UI/JobWhitelistsEui.cs b/Content.Client/Administration/UI/JobWhitelistsEui.cs
diff --git a/Content.Client/Administration/UI/JobWhitelistsWindow.xaml b/Content.Client/Administration/UI/JobWhitelistsWindow.xaml
diff --git a/Content.Client/Administration/UI/JobWhitelistsWindow.xaml.cs b/Content.Client/Administration/UI/JobWhitelistsWindow.xaml.cs
diff --git a/Content.Client/Chapel/SacrificialAltarSystem.cs b/Content.Client/Chapel/SacrificialAltarSystem.cs
diff --git a/Content.Client/Cocoon/CocoonSystem.cs b/Content.Client/Cocoon/CocoonSystem.cs
diff --git a/Content.Client/FlavorText/FlavorText.xaml.cs b/Content.Client/FlavorText/FlavorText.xaml.cs
@@ -17,7 +17,7 @@ public FlavorText()
 
             var loc = IoCManager.Resolve<ILocalizationManager>();
             CFlavorTextInput.Placeholder = new Rope.Leaf(loc.GetString("flavor-text-placeholder"));
-            CFlavorTextInput.OnTextChanged  += _ => FlavorTextChanged();
+            CFlavorTextInput.OnKeyBindDown  += _ => FlavorTextChanged();
         }
 
         public void FlavorTextChanged()

diff --git a/Content.Client/LateJoin/LateJoinGui.cs b/Content.Client/LateJoin/LateJoinGui.cs
@@ -261,24 +261,7 @@ private void RebuildUI()
 
                         jobButton.OnPressed += _ => SelectedId.Invoke((id, jobButton.JobId));
 
-                        if (!_jobRequirements.CheckJobWhitelist(prototype, out var reason))
-                        {
-                            jobButton.Disabled = true;
-
-                            var tooltip = new Tooltip();
-                            tooltip.SetMessage(reason);
-                            jobButton.TooltipSupplier = _ => tooltip;
-
-                            jobSelector.AddChild(new TextureRect
-                            {
-                                TextureScale = new Vector2(0.4f, 0.4f),
-                                Stretch = TextureRect.StretchMode.KeepCentered,
-                                Texture = _sprites.Frame0(new SpriteSpecifier.Texture(new ("/Textures/Interface/Nano/lock.svg.192dpi.png"))),
-                                HorizontalExpand = true,
-                                HorizontalAlignment = HAlignment.Right,
-                            });
-                        }
-                        else if (!_characterRequirements.CheckRequirementsValid(
+                        if (!_characterRequirements.CheckRequirementsValid(
                                 prototype.Requirements ?? new(),
                                 prototype,
                                 (HumanoidCharacterProfile) (_prefs.Preferences?.SelectedCharacter

diff --git a/Content.Client/Lobby/LobbyUIController.cs b/Content.Client/Lobby/LobbyUIController.cs
@@ -63,8 +63,12 @@ public override void Initialize()
         _requirements.Updated += OnRequirementsUpdated;
 
         _configurationManager.OnValueChanged(CCVars.FlavorText, _ => _profileEditor?.RefreshFlavorText());
-        _configurationManager.OnValueChanged(CCVars.GameRoleTimers, _ => RefreshProfileEditor());
-        _configurationManager.OnValueChanged(CCVars.GameRoleWhitelist, _ => RefreshProfileEditor());
+        _configurationManager.OnValueChanged(CCVars.GameRoleTimers,
+            _ =>
+            {
+                _profileEditor?.RefreshAntags();
+                _profileEditor?.RefreshJobs();
+            });
 
         _preferencesManager.OnServerDataLoaded += PreferencesDataLoaded;
     }
@@ -164,12 +168,6 @@ private void RefreshLobbyPreview()
         PreviewPanel.SetSummaryText(humanoid.Summary);
     }
 
-    private void RefreshProfileEditor()
-    {
-        _profileEditor?.RefreshAntags();
-        _profileEditor?.RefreshJobs();
-    }
-
     private void SaveProfile()
     {
         DebugTools.Assert(EditedProfile != null);