From 794e3504f2a9af1b7d486ccceb8b499746291272 Mon Sep 17 00:00:00 2001
From: theashtronaut <112137107+theashtronaut@users.noreply.github.com>
Date: Fri, 4 Nov 2022 00:51:25 +0000
Subject: [PATCH] Make lobby ready button clear what state you are in (#12152)

---
 Content.Client/Lobby/LobbyState.cs    | 2 +-
 Content.Client/Lobby/UI/LobbyGui.xaml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Content.Client/Lobby/LobbyState.cs b/Content.Client/Lobby/LobbyState.cs
index 3b6e118bc9..b4e8971f71 100644
--- a/Content.Client/Lobby/LobbyState.cs
+++ b/Content.Client/Lobby/LobbyState.cs
@@ -180,7 +180,7 @@ namespace Content.Client.Lobby
             else
             {
                 _lobby!.StartTime.Text = string.Empty;
-                _lobby!.ReadyButton.Text = Loc.GetString("lobby-state-ready-button-ready-up-state");
+                _lobby!.ReadyButton.Text = Loc.GetString(_lobby!.ReadyButton.Pressed ? "lobby-state-player-status-ready": "lobby-state-player-status-not-ready");
                 _lobby!.ReadyButton.ToggleMode = true;
                 _lobby!.ReadyButton.Disabled = false;
                 _lobby!.ReadyButton.Pressed = _gameTicker.AreWeReady;
diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml b/Content.Client/Lobby/UI/LobbyGui.xaml
index a4f540bcb2..5cd7e1132e 100644
--- a/Content.Client/Lobby/UI/LobbyGui.xaml
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml
@@ -24,11 +24,11 @@
                                     <cc:UICommandButton Command="observe" Name="ObserveButton" Access="Public" Text="{Loc 'ui-lobby-observe-button'}" StyleClasses="ButtonBig"  WindowType="{x:Type lobbyUi:ObserveWarningWindow}"/>
                                     <Label Name="StartTime"
                                            Access="Public"
-                                           Align="Right"
+                                           Align="Left"
                                            FontColorOverride="{x:Static maths:Color.DarkGray}"
                                            StyleClasses="LabelBig" HorizontalExpand="True" />
                                     <Button Name="ReadyButton" Access="Public" ToggleMode="True" Text="{Loc 'ui-lobby-ready-up-button'}"
-                                            StyleClasses="ButtonBig" />
+                                            StyleClasses="ButtonBig" MinWidth="137"/>
                                 </BoxContainer>
                             </controls:StripeBack>
                         </BoxContainer>