TGS Test Merge (#6291)

cmss13-devs · May 18, 2024 · 4c01f75 · 4c01f75
2 parents 27e2814 + 01a8969
commit 4c01f75
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm
@@ -77,6 +77,7 @@
 #define ROUNDSTATUS_FOG_DOWN 1
 #define ROUNDSTATUS_PODDOORS_OPEN 2
 
+#define LATEJOIN_MARINES_PER_LATEJOIN_LARVA_EARLY 4
 #define LATEJOIN_MARINES_PER_LATEJOIN_LARVA 2.5
 
 //=================================================

diff --git a/code/game/gamemodes/cm_initialize.dm b/code/game/gamemodes/cm_initialize.dm
@@ -74,6 +74,7 @@ Additional game mode variables.
 	var/monkey_amount = 0 //How many monkeys do we spawn on this map ?
 	var/list/monkey_types = list() //What type of monkeys do we spawn
 	var/latejoin_tally = 0 //How many people latejoined Marines
+	var/latejoin_larva_drop_early = LATEJOIN_MARINES_PER_LATEJOIN_LARVA_EARLY
 	var/latejoin_larva_drop = LATEJOIN_MARINES_PER_LATEJOIN_LARVA //A larva will spawn in once the tally reaches this level. If set to 0, no latejoin larva drop
 	/// Amount of latejoin_tally already awarded as larvas
 	var/latejoin_larva_used = 0

diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
@@ -267,8 +267,13 @@
 			sq.max_engineers = engi_slot_formula(GLOB.clients.len)
 			sq.max_medics = medic_slot_formula(GLOB.clients.len)
 
-	if(SSticker.mode.latejoin_larva_drop && SSticker.mode.latejoin_tally - SSticker.mode.latejoin_larva_used >= SSticker.mode.latejoin_larva_drop)
-		SSticker.mode.latejoin_larva_used += SSticker.mode.latejoin_larva_drop
+	var/latejoin_larva_drop = SSticker.mode.latejoin_larva_drop
+
+	if (ROUND_TIME < XENO_ROUNDSTART_PROGRESS_TIME_2)
+		latejoin_larva_drop = SSticker.mode.latejoin_larva_drop_early
+
+	if(latejoin_larva_drop && SSticker.mode.latejoin_tally - SSticker.mode.latejoin_larva_used >= latejoin_larva_drop)
+		SSticker.mode.latejoin_larva_used += latejoin_larva_drop
 		var/datum/hive_status/hive
 		for(var/hivenumber in GLOB.hive_datum)
 			hive = GLOB.hive_datum[hivenumber]