From c24a8a072a9e305306f80ebc6ccb52bd26380ddb Mon Sep 17 00:00:00 2001
From: Martin Petkovski <63034378+martin69420@users.noreply.github.com>
Date: Mon, 22 Aug 2022 05:14:24 +1000
Subject: [PATCH] Fixed playtime requirement tooltip (#10756)

---
 Content.Client/LateJoin/LateJoinGui.cs     |  6 +++++-
 Resources/Locale/en-US/job/role-timers.ftl | 12 ++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Content.Client/LateJoin/LateJoinGui.cs b/Content.Client/LateJoin/LateJoinGui.cs
index de02f29d02..f38a983355 100644
--- a/Content.Client/LateJoin/LateJoinGui.cs
+++ b/Content.Client/LateJoin/LateJoinGui.cs
@@ -247,7 +247,7 @@ namespace Content.Client.LateJoin
 
                         string? reason = null;
 
-                        if (value == 0 || !tracker.IsAllowed(prototype, out reason))
+                        if (!tracker.IsAllowed(prototype, out reason))
                         {
                             jobButton.Disabled = true;
 
@@ -256,6 +256,10 @@ namespace Content.Client.LateJoin
                                 jobButton.ToolTip = reason;
                             }
                         }
+                        else if (value == 0)
+                        {
+                            jobButton.Disabled = true;
+                        }
 
                         _jobButtons[id][prototype.ID] = jobButton;
                     }
diff --git a/Resources/Locale/en-US/job/role-timers.ftl b/Resources/Locale/en-US/job/role-timers.ftl
index f897ec369c..c9ebb75ed6 100644
--- a/Resources/Locale/en-US/job/role-timers.ftl
+++ b/Resources/Locale/en-US/job/role-timers.ftl
@@ -1,8 +1,8 @@
-role-timer-department-insufficient = Require {TOSTRING($time, "0")} more minutes in {$department} department.
-role-timer-department-too-high = Requires {TOSTRING($time, "0")} fewer minutes in {$department} department. (Are you trying to play a trainee role?)
-role-timer-overall-insufficient = Require {TOSTRING($time, "0")} more minutes of playtime.
-role-timer-overall-too-high = Require {TOSTRING($time, "0")} fewer minutes of playtime. (Are you trying to play a trainee role?)
-role-timer-role-insufficient = Require {TOSTRING($time, "0")} more minutes with {$job} for this role.
-role-timer-role-too-high = Require {TOSTRING($time, "0")} fewer minutes with {$job} for this role. (Are you trying to play a trainee role?)
+role-timer-department-insufficient = You require {TOSTRING($time, "0")} more minutes in {$department} department to play this role.
+role-timer-department-too-high = You require {TOSTRING($time, "0")} fewer minutes in {$department} department to play this role. (Are you trying to play a trainee role?)
+role-timer-overall-insufficient = You require {TOSTRING($time, "0")} more minutes of playtime to play this role.
+role-timer-overall-too-high = You require {TOSTRING($time, "0")} fewer minutes of playtime to play this role. (Are you trying to play a trainee role?)
+role-timer-role-insufficient = You require {TOSTRING($time, "0")} more minutes with {$job} to play this role.
+role-timer-role-too-high = You require {TOSTRING($time, "0")} fewer minutes with {$job} to play this role. (Are you trying to play a trainee role?)
 
 role-timer-locked = Locked (hover for details)