From 3adcab175683502691fe0fd244670caf7f2f0eed Mon Sep 17 00:00:00 2001
From: Darius <5933805+LeDrascol@users.noreply.github.com>
Date: Wed, 4 Jan 2023 19:15:09 -0500
Subject: [PATCH] Display job slots out of total during late-join
Changes late join text from "Job (current)" to "Job (current/limit)" to prevent confusion. Infinite-slot jobs display an infinity symbol.
---
code/modules/mob/dead/new_player/new_player.dm | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm
index 428cda6e81..3e3a7c2c51 100644
--- a/code/modules/mob/dead/new_player/new_player.dm
+++ b/code/modules/mob/dead/new_player/new_player.dm
@@ -577,13 +577,23 @@
for(var/job in category)
var/datum/job/job_datum = SSjob.name_occupations[job]
if(job_datum && IsJobUnavailable(job_datum.title, TRUE) == JOB_AVAILABLE)
+ // Get currently occupied slots
+ var/num_positions_current = job_datum.current_positions
+
+ // Get total slots that can be occupied
+ var/num_positions_total = job_datum.total_positions
+
+ // Change to lemniscate for infinite-slot jobs
+ // This variable should only used to display text!
+ num_positions_total = (num_positions_total == -1 ? "∞" : num_positions_total)
+
var/command_bold = ""
if(job in GLOB.command_positions)
command_bold = " command"
if(job_datum in SSjob.prioritized_jobs)
- dept_dat += "[job_datum.title] ([job_datum.current_positions])"
+ dept_dat += "[job_datum.title] ([num_positions_current]/[num_positions_total])"
else
- dept_dat += "[job_datum.title] ([job_datum.current_positions])"
+ dept_dat += "[job_datum.title] ([num_positions_current]/[num_positions_total])"
if(!dept_dat.len)
dept_dat += "No positions open."
dat += jointext(dept_dat, "")