From 75865745c5aec8df0d5dedfd0de881b554c72b64 Mon Sep 17 00:00:00 2001
From: Morrow <darthbane97@gmail.com>
Date: Sun, 6 Aug 2023 14:10:20 -0400
Subject: [PATCH] Initial

---
 code/__DEFINES/job.dm                         | 11 ++++++-----
 .../living/carbon/xenomorph/XenoUpgrade.dm    |  6 ++++++
 .../living/carbon/xenomorph/castes/Queen.dm   | 19 +++++++++++++------
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm
index d598a8ff6f67..c413eb843e93 100644
--- a/code/__DEFINES/job.dm
+++ b/code/__DEFINES/job.dm
@@ -344,11 +344,12 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
 #define JOB_PLAYTIME_TIER_4  (175 HOURS)
 
 #define XENO_NO_AGE  -1
-#define XENO_NORMAL 0
-#define XENO_MATURE 1
-#define XENO_ELDER 2
-#define XENO_ANCIENT 3
-#define XENO_PRIME 4
+#define XENO_YOUNG 0
+#define XENO_NORMAL 1
+#define XENO_MATURE 2
+#define XENO_ELDER 3
+#define XENO_ANCIENT 4
+#define XENO_PRIME 5
 
 /// For monthly time tracking
 #define JOB_OBSERVER "Observer"
diff --git a/code/modules/mob/living/carbon/xenomorph/XenoUpgrade.dm b/code/modules/mob/living/carbon/xenomorph/XenoUpgrade.dm
index a89a3ad32e85..ae03d0646657 100644
--- a/code/modules/mob/living/carbon/xenomorph/XenoUpgrade.dm
+++ b/code/modules/mob/living/carbon/xenomorph/XenoUpgrade.dm
@@ -3,6 +3,7 @@
 		return
 
 	age = XENO_NORMAL
+	var/hours_as_xeno = client.get_total_xeno_playtime()
 	var/hours_as_caste = get_job_playtime(client, caste.caste_type)
 
 	switch(hours_as_caste)
@@ -15,11 +16,16 @@
 		if(JOB_PLAYTIME_TIER_4 to INFINITY)
 			age = XENO_PRIME
 
+	if(hours_as_xeno < JOB_PLAYTIME_TIER_1)
+		age = XENO_YOUNG
+
 	// For people who wish to remain anonymous
 	if(!client.prefs.playtime_perks)
 		age = XENO_NORMAL
 
 	switch(age)
+		if(XENO_YOUNG)
+			age_prefix = "Young "
 		if(XENO_NORMAL)
 			age_prefix = ""
 		if(XENO_MATURE)
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm
index 53e30d374b2c..632c7a978261 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm
@@ -413,17 +413,24 @@
 	if(queen_aged)
 		age_xeno()
 		switch(age)
-			if(XENO_NORMAL) name = "[name_prefix]Queen"  //Young
-			if(XENO_MATURE) name = "[name_prefix]Elder Queen"  //Mature
-			if(XENO_ELDER) name = "[name_prefix]Elder Empress"  //Elite
-			if(XENO_ANCIENT) name = "[name_prefix]Ancient Empress" //Ancient
-			if(XENO_PRIME) name = "[name_prefix]Prime Empress" //Primordial
+			if(XENO_YOUNG)
+				name = "[name_prefix]Young Queen" //Young
+			if(XENO_NORMAL)
+				name = "[name_prefix]Queen"  //Regular
+			if(XENO_MATURE)
+				name = "[name_prefix]Elder Queen"  //Mature
+			if(XENO_ELDER)
+				name = "[name_prefix]Elder Empress"  //Elite
+			if(XENO_ANCIENT)
+				name = "[name_prefix]Ancient Empress" //Ancient
+			if(XENO_PRIME)
+				name = "[name_prefix]Prime Empress" //Primordial
 	else
 		age = XENO_NORMAL
 		if(client)
 			hud_update()
 
-		name = "[name_prefix]Young Queen"
+		name = "[name_prefix]Growing Queen"
 
 	var/name_client_prefix = ""
 	var/name_client_postfix = ""