diff --git a/Content.Client/Access/AccessOverlay.cs b/Content.Client/Access/AccessOverlay.cs index 10025705a2..3cb90158f3 100644 --- a/Content.Client/Access/AccessOverlay.cs +++ b/Content.Client/Access/AccessOverlay.cs @@ -22,7 +22,7 @@ public AccessOverlay(IEntityManager entManager, IResourceCache cache, EntityLook _lookup = lookup; _xform = xform; - _font = cache.GetFont("/Fonts/B612_Mono/B612_Mono-Regular.ttf", 12); + _font = cache.GetFont("/Fonts/IBMPlexMono/IBMPlexMono-Regular.ttf", 12); } protected override void Draw(in OverlayDrawArgs args) diff --git a/Content.Client/Administration/AdminNameOverlay.cs b/Content.Client/Administration/AdminNameOverlay.cs index 31484ce245..2f17a49fed 100644 --- a/Content.Client/Administration/AdminNameOverlay.cs +++ b/Content.Client/Administration/AdminNameOverlay.cs @@ -24,7 +24,7 @@ public AdminNameOverlay(AdminSystem system, IEntityManager entityManager, IEyeMa _eyeManager = eyeManager; _entityLookup = entityLookup; ZIndex = 200; - _font = new VectorFont(resourceCache.GetResource("/Fonts/B612_Mono/B612_Mono-Regular.ttf"), 10); + _font = new VectorFont(resourceCache.GetResource("/Fonts/IBMPlexMono/IBMPlexMono-Regular.ttf"), 10); } public override OverlaySpace Space => OverlaySpace.ScreenSpace; diff --git a/Content.Client/Administration/UI/SpawnExplosion/ExplosionDebugOverlay.cs b/Content.Client/Administration/UI/SpawnExplosion/ExplosionDebugOverlay.cs index 1e09253eff..f6ecbfaeca 100644 --- a/Content.Client/Administration/UI/SpawnExplosion/ExplosionDebugOverlay.cs +++ b/Content.Client/Administration/UI/SpawnExplosion/ExplosionDebugOverlay.cs @@ -35,7 +35,7 @@ public ExplosionDebugOverlay() IoCManager.InjectDependencies(this); var cache = IoCManager.Resolve(); - _font = new VectorFont(cache.GetResource("/Fonts/B612_Mono/B612_Mono-Regular.ttf"), 8); + _font = new VectorFont(cache.GetResource("/Fonts/IBMPlexMono/IBMPlexMono-Regular.ttf"), 8); } protected override void Draw(in OverlayDrawArgs args) diff --git a/Content.Client/Fluids/PuddleOverlay.cs b/Content.Client/Fluids/PuddleOverlay.cs index 9ca38d9744..2fbf11675e 100644 --- a/Content.Client/Fluids/PuddleOverlay.cs +++ b/Content.Client/Fluids/PuddleOverlay.cs @@ -28,7 +28,7 @@ public PuddleOverlay() IoCManager.InjectDependencies(this); _debugOverlaySystem = _entitySystemManager.GetEntitySystem(); var cache = IoCManager.Resolve(); - _font = new VectorFont(cache.GetResource("/Fonts/B612_Mono/B612_Mono-Regular.ttf"), 8); + _font = new VectorFont(cache.GetResource("/Fonts/IBMPlexMono/IBMPlexMono-Regular.ttf"), 8); } protected override void Draw(in OverlayDrawArgs args) diff --git a/Content.Client/Lobby/LobbyState.cs b/Content.Client/Lobby/LobbyState.cs index 4df3ff46ac..457163a5b5 100644 --- a/Content.Client/Lobby/LobbyState.cs +++ b/Content.Client/Lobby/LobbyState.cs @@ -8,7 +8,6 @@ using Content.Client.Voting; using Robust.Client; using Robust.Client.Console; -using Robust.Client.Graphics; using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; @@ -67,17 +66,16 @@ protected override void Startup() _characterSetup.SaveButton.OnPressed += _ => { _characterSetup.Save(); - // _lobby.CharacterPreview.UpdateUI(); + _lobby.CharacterPreview.UpdateUI(); }; LayoutContainer.SetAnchorPreset(_lobby, LayoutContainer.LayoutPreset.Wide); _lobby.ServerName.Text = _baseClient.GameInfo?.ServerName; //The eye of refactor gazes upon you... UpdateLobbyUi(); - _lobby!.SetupCharacterButton.OnPressed += OnSetupPressed; + _lobby.CharacterPreview.CharacterSetupButton.OnPressed += OnSetupPressed; _lobby.ReadyButton.OnPressed += OnReadyPressed; _lobby.ReadyButton.OnToggled += OnReadyToggled; - _lobby.ToggleMenu.OnPressed += OnMenuPressed; _gameTicker.InfoBlobUpdated += UpdateLobbyUi; _gameTicker.LobbyStatusUpdated += LobbyStatusUpdated; @@ -85,7 +83,7 @@ protected override void Startup() _preferencesManager.OnServerDataLoaded += PreferencesDataLoaded; - // _lobby.CharacterPreview.UpdateUI(); + _lobby.CharacterPreview.UpdateUI(); } protected override void Shutdown() @@ -98,11 +96,9 @@ protected override void Shutdown() _voteManager.ClearPopupContainer(); - // _lobby!.CharacterPreview.CharacterSetupButton.OnPressed -= OnSetupPressed; - _lobby!.SetupCharacterButton.OnPressed -= OnSetupPressed; + _lobby!.CharacterPreview.CharacterSetupButton.OnPressed -= OnSetupPressed; _lobby!.ReadyButton.OnPressed -= OnReadyPressed; _lobby!.ReadyButton.OnToggled -= OnReadyToggled; - _lobby.ToggleMenu.OnPressed -= OnMenuPressed; _lobby = null; @@ -114,7 +110,7 @@ protected override void Shutdown() private void PreferencesDataLoaded() { - // _lobby?.CharacterPreview.UpdateUI(); + _lobby?.CharacterPreview.UpdateUI(); } private void OnSetupPressed(BaseButton.ButtonEventArgs args) @@ -133,11 +129,6 @@ private void OnReadyPressed(BaseButton.ButtonEventArgs args) new LateJoinGui().OpenCentered(); } - private void OnMenuPressed(BaseButton.ButtonEventArgs args) - { - _lobby!.CenterPanel.Visible = !_lobby.CenterPanel.Visible; - } - private void OnReadyToggled(BaseButton.ButtonToggledEventArgs args) { SetReady(args.Pressed); diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml b/Content.Client/Lobby/UI/LobbyGui.xaml index 5fe261a7c9..c3bd0da642 100644 --- a/Content.Client/Lobby/UI/LobbyGui.xaml +++ b/Content.Client/Lobby/UI/LobbyGui.xaml @@ -8,8 +8,7 @@ xmlns:style="clr-namespace:Content.Client.Stylesheets" xmlns:lobbyUi="clr-namespace:Content.Client.Lobby.UI" xmlns:info="clr-namespace:Content.Client.Info" - xmlns:widgets="clr-namespace:Content.Client.UserInterface.Systems.Chat.Widgets" - xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"> + xmlns:widgets="clr-namespace:Content.Client.UserInterface.Systems.Chat.Widgets"> @@ -18,96 +17,40 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + +