cmss13-devs · ori-disillusion-mirnov · Sep 9, 2025 · Sep 9, 2025 · Sep 9, 2025 · Sep 9, 2025
diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm
@@ -20,7 +20,7 @@ most of them are tied into map-placed objects. This should be reworked in the fu
 
 #define ACCESS_MARINE_ALPHA 15
 #define ACCESS_MARINE_BRAVO 16
-#define ACCESS_MARINE_CHARLIE 17
+#define ACCESS_MARINE_SUPPORT 17
 #define ACCESS_MARINE_DELTA 18
 
 #define ACCESS_MARINE_COMMAND 19

diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm
@@ -8,6 +8,8 @@
 #define SQUAD_MARINE_3 "Charlie"
 #define SQUAD_MARINE_4 "Delta"
 #define SQUAD_MARINE_5 "Echo"
+#define SQUAD_MARINE_6 "Kilo"
+#define SQUAD_MARINE_7 "Oscar"
 #define SQUAD_MARINE_CRYO "Foxtrot"
 #define SQUAD_MARINE_INTEL "Intel"
 #define SQUAD_SOF "SOF"
@@ -16,6 +18,11 @@
 #define SQUAD_SOLAR "Solar Devils"
 #define SQUAD_ARMY "US Army"
 
+// Squad Roles
+#define SQUAD_ROLE_ASSAULT "Assault"
+#define SQUAD_ROLE_SUPPORT "Support"
+#define SQUAD_ROLE_SECURITY "Security"
+
 // Job name defines
 #define JOB_SQUAD_MARINE "Rifleman"
 #define JOB_SQUAD_LEADER "Squad Leader"

diff --git a/code/__DEFINES/minimap.dm b/code/__DEFINES/minimap.dm
@@ -41,6 +41,8 @@ GLOBAL_LIST_INIT(all_minimap_flags, bitfield2list(MINIMAP_FLAG_ALL))
 #define MINIMAP_DRAWING_YELLOW "#FFFF00"
 #define MINIMAP_DRAWING_PURPLE "#A020F0"
 #define MINIMAP_DRAWING_BLUE "#0000FF"
+#define MINIMAP_DRAWING_TEAL "#059e96"
+#define MINIMAP_DRAWING_LIME "#d6ffb2"
 
 //Turf colors
 #define MINIMAP_BLACK "#111111d0"
@@ -81,6 +83,8 @@ GLOBAL_LIST_INIT(all_minimap_flags, bitfield2list(MINIMAP_FLAG_ALL))
 #define MINIMAP_SQUAD_CHARLIE "#76418a"
 #define MINIMAP_SQUAD_DELTA "#0c0cae"
 #define MINIMAP_SQUAD_ECHO "#00b043"
+#define MINIMAP_SQUAD_KILO "#059e96"
+#define MINIMAP_SQUAD_OSCAR  "#d6ffb2"
 #define MINIMAP_SQUAD_FOXTROT "#fe7b2e"
 #define MINIMAP_SQUAD_SOF "#400000"
 #define MINIMAP_SQUAD_ARMY "#349c30"

diff --git a/code/__DEFINES/mob_hud.dm b/code/__DEFINES/mob_hud.dm
@@ -89,6 +89,8 @@
 #define TRACKER_CSL "_csl" // Charlie Squad Leader
 #define TRACKER_DSL "_dsl" // Delta Squad Leader
 #define TRACKER_ESL "_esl" // Echo Squad Leader
+#define TRACKER_KSL "_ksl" // Kilo Squad Leader
+#define TRACKER_OSL "_osl" // Oscar Squad Leader
 #define TRACKER_FSL "_fsl" // Cryo Squad Leader
 #define TRACKER_ISL "_isl" // Intel Squad Leader
 

diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm
@@ -121,7 +121,7 @@ GLOBAL_LIST_INIT(ROLES_MEDICAL, list(JOB_CMO, JOB_RESEARCHER, JOB_DOCTOR, JOB_FI
 GLOBAL_LIST_INIT(ROLES_MEDICAL_ANTAG, list(JOB_UPP_LT_DOKTOR))
 GLOBAL_LIST_INIT(ROLES_MARINES,  list(JOB_SQUAD_LEADER, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SPECIALIST, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MEDIC, JOB_SQUAD_ENGI, JOB_SQUAD_MARINE))
 GLOBAL_LIST_INIT(ROLES_MARINES_ANTAG, list(JOB_UPP, JOB_UPP_ENGI, JOB_UPP_MEDIC, JOB_UPP_SPECIALIST, JOB_UPP_LEADER))
-GLOBAL_LIST_INIT(ROLES_SQUAD_ALL, list(SQUAD_MARINE_1, SQUAD_MARINE_2, SQUAD_MARINE_3, SQUAD_MARINE_4, SQUAD_MARINE_5, SQUAD_MARINE_CRYO, SQUAD_MARINE_INTEL))
+GLOBAL_LIST_INIT(ROLES_SQUAD_ALL, list())
 GLOBAL_LIST_INIT(ROLES_WO, list(JOB_WO_CO, JOB_WO_XO, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_WARDEN, JOB_WO_POLICE, JOB_WO_PILOT, JOB_WO_CHIEF_ENGINEER, JOB_WO_ORDNANCE_TECH, JOB_WO_CHIEF_REQUISITION, JOB_WO_REQUISITION, JOB_WO_CMO, JOB_WO_DOCTOR, JOB_WO_RESEARCHER, JOB_WO_SQUAD_MARINE, JOB_WO_SQUAD_MEDIC, JOB_WO_SQUAD_ENGINEER, JOB_WO_SQUAD_SMARTGUNNER, JOB_WO_SQUAD_SPECIALIST, JOB_WO_SQUAD_LEADER, JOB_XENOMORPH_QUEEN))
 /// Roles not intended to be spawned.
 GLOBAL_LIST_INIT(ROLES_NOSPAWN, list(JOB_POLICE_HG))

diff --git a/code/controllers/subsystem/communications.dm b/code/controllers/subsystem/communications.dm
@@ -156,7 +156,9 @@ Radiochat range: 1441 to 1489 (most devices refuse to be tune to other frequency
 #define CHARLIE_FREQ 1493
 #define DELTA_FREQ 1494
 #define ECHO_FREQ 1495
-#define CRYO_FREQ 1496
+#define KILO_FREQ 1496
+#define OSCAR_FREQ 1497
+#define CRYO_FREQ 1498
 
 //Civilian channels
 #define COLONY_FREQ 1469
@@ -189,18 +191,6 @@ GLOBAL_LIST_INIT(radiochannels, list(
 	RADIO_CHANNEL_JTAC = JTAC_FREQ,
 	RADIO_CHANNEL_INTEL = INTEL_FREQ,
 
-	SQUAD_MARINE_1 = ALPHA_FREQ,
-	SQUAD_MARINE_2 = BRAVO_FREQ,
-	SQUAD_MARINE_3 = CHARLIE_FREQ,
-	SQUAD_MARINE_4 = DELTA_FREQ,
-	SQUAD_MARINE_5 = ECHO_FREQ,
-	SQUAD_MARINE_CRYO = CRYO_FREQ,
-	SQUAD_SOF = SOF_FREQ,
-	SQUAD_CBRN = CBRN_FREQ,
-	SQUAD_FORECON = FORECON_FREQ,
-	SQUAD_SOLAR = SOF_FREQ,
-	SQUAD_ARMY = ARMY_FREQ,
-
 	RADIO_CHANNEL_ALAMO = DS1_FREQ,
 	RADIO_CHANNEL_NORMANDY = DS2_FREQ,
 	RADIO_CHANNEL_SAIPAN = DS3_FREQ,
@@ -261,7 +251,7 @@ GLOBAL_LIST_INIT(radiochannels, list(
 #define FAX_RESP_FREQS list(FAX_WY_FREQ, FAX_USCM_HC_FREQ, FAX_USCM_PVST_FREQ)
 
 //Depts - used for colors in headset.dm, as well as deciding what the marine comms tower can listen into
-#define DEPT_FREQS list(COMM_FREQ, MED_FREQ, ENG_FREQ, SEC_FREQ, SENTRY_FREQ, ALPHA_FREQ, BRAVO_FREQ, CHARLIE_FREQ, DELTA_FREQ, ECHO_FREQ, CRYO_FREQ, REQ_FREQ, JTAC_FREQ, INTEL_FREQ, WY_FREQ)
+#define DEPT_FREQS list(COMM_FREQ, MED_FREQ, ENG_FREQ, SEC_FREQ, SENTRY_FREQ, ALPHA_FREQ, BRAVO_FREQ, CHARLIE_FREQ, DELTA_FREQ, ECHO_FREQ, KILO_FREQ, OSCAR_FREQ, CRYO_FREQ, REQ_FREQ, JTAC_FREQ, INTEL_FREQ, WY_FREQ)
 
 //Bonus frequencies for special survivor factions
 #define SURVIVOR_FREQS list(SOF_FREQ, ARMY_FREQ)
@@ -332,6 +322,8 @@ SUBSYSTEM_DEF(radio)
 		"[CHARLIE_FREQ]" = "charlieradio",
 		"[DELTA_FREQ]" = "deltaradio",
 		"[ECHO_FREQ]" = "echoradio",
+		"[KILO_FREQ]" = "kiloradio",
+		"[OSCAR_FREQ]" = "oscarradio",
 		"[CRYO_FREQ]" = "cryoradio",
 		"[CBRN_FREQ]" = "hcradio",
 		"[FORECON_FREQ]" = "hcradio",

diff --git a/code/controllers/subsystem/minimap.dm b/code/controllers/subsystem/minimap.dm
@@ -1831,6 +1831,16 @@ SUBSYSTEM_DEF(minimaps)
 	active_mouse_icon = 'icons/ui_icons/minimap_mouse/draw_blue.dmi'
 	color = MINIMAP_DRAWING_BLUE
 
+/atom/movable/screen/minimap_tool/draw_tool/teal
+	screen_loc = "14,12"
+	active_mouse_icon = 'icons/ui_icons/minimap_mouse/draw_blue.dmi'
+	color = MINIMAP_DRAWING_TEAL
+
+/atom/movable/screen/minimap_tool/draw_tool/lime
+	screen_loc = "14,11"
+	active_mouse_icon = 'icons/ui_icons/minimap_mouse/draw_green.dmi'
+	color = MINIMAP_DRAWING_LIME
+
 /atom/movable/screen/minimap_tool/draw_tool/erase
 	icon_state = "erase"
 	desc = "Drag to erase freely, middle click to erase a dot. Middle click this button to unselect."

diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
@@ -244,9 +244,10 @@ SUBSYSTEM_DEF(ticker)
 		var/roles_to_roll = null
 		if(length(mode.roles_to_roll))
 			roles_to_roll = mode.roles_to_roll
-		GLOB.RoleAuthority.setup_candidates_and_roles(roles_to_roll) //Distribute jobs
+		var/list/random_players = shuffle(GLOB.player_list)
+		GLOB.RoleAuthority.setup_candidates_and_roles(roles_to_roll, random_players) //Distribute jobs
 		if(mode.flags_round_type & MODE_NEW_SPAWN)
-			create_characters() // Create and equip characters
+			create_characters(random_players) // Create and equip characters
 		else
 			old_create_characters() //Create player characters and transfer them
 			equip_characters()
@@ -404,17 +405,17 @@ SUBSYSTEM_DEF(ticker)
 
 	world.Reboot()
 
-/datum/controller/subsystem/ticker/proc/create_characters()
+/datum/controller/subsystem/ticker/proc/create_characters(list/random_players)
 	if(!GLOB.RoleAuthority)
 		return
 
-	var/list/random_players = shuffle(GLOB.player_list)
 	for(var/mob/new_player/player in random_players)
 		if(!player || !player.ready || !player.mind || !player.job)
 			continue
 
 		INVOKE_ASYNC(src, PROC_REF(spawn_and_equip_char), player)
 
+
 /datum/controller/subsystem/ticker/proc/spawn_and_equip_char(mob/new_player/player)
 	var/datum/job/J = GLOB.RoleAuthority.roles_for_mode[player.job]
 
@@ -470,6 +471,7 @@ SUBSYSTEM_DEF(ticker)
 					msg_admin_niche("NEW PLAYER: <b>[key_name(player, 1, 1, 0)]</b>. IP: [player.lastKnownIP], CID: [player.computer_id]")
 				if(C.player_data && C.player_data.playtime_loaded && ((round(C.get_total_human_playtime() DECISECONDS_TO_HOURS, 0.1)) <= 5))
 					msg_sea(("NEW PLAYER: <b>[key_name(player, 0, 1, 0)]</b> only has [(round(C.get_total_human_playtime() DECISECONDS_TO_HOURS, 0.1))] hours as a human. Current role: [get_actual_job_name(player)] - Current location: [get_area(player)]"), TRUE)
+
 	if(captainless)
 		for(var/mob/M in GLOB.player_list)
 			if(!istype(M,/mob/new_player))

diff --git a/code/datums/components/tacmap.dm b/code/datums/components/tacmap.dm
@@ -43,6 +43,8 @@
 			/atom/movable/screen/minimap_tool/draw_tool/blue,
 			/atom/movable/screen/minimap_tool/draw_tool/green,
 			/atom/movable/screen/minimap_tool/draw_tool/black,
+			/atom/movable/screen/minimap_tool/draw_tool/teal,
+			/atom/movable/screen/minimap_tool/draw_tool/lime,
 			/atom/movable/screen/minimap_tool/draw_tool/erase,
 			/atom/movable/screen/minimap_tool/label,
 			/atom/movable/screen/minimap_tool/clear,

diff --git a/code/game/area/almayer.dm b/code/game/area/almayer.dm
@@ -782,8 +782,8 @@
 	icon_state = "bravo"
 	fake_zlevel = 2 // lowerdeck
 
-/area/almayer/squads/charlie
-	name = "\improper Squad Charlie Preparation"
+/area/almayer/squads/support
+	name = "\improper Support Squad Preparation"
 	icon_state = "charlie"
 	fake_zlevel = 2 // lowerdeck
 
@@ -792,14 +792,14 @@
 	icon_state = "delta"
 	fake_zlevel = 2 // lowerdeck
 
-/area/almayer/squads/alpha_bravo_shared
-	name = "\improper Alpha Bravo Equipment Preparation"
-	icon_state = "ab_shared"
+/area/almayer/squads/platoon1_shared
+	name = "\improper 1st Platoon Equipment Preparation"
+	icon_state = "p1_shared"
 	fake_zlevel = 2 // lowerdeck
 
-/area/almayer/squads/charlie_delta_shared
-	name = "\improper Charlie Delta Equipment Preparation"
-	icon_state = "cd_shared"
+/area/almayer/squads/platoon2_shared
+	name = "\improper 2nd Platoon Equipment Preparation"
+	icon_state = "p2_shared"
 	fake_zlevel = 2 // lowerdeck
 
 /area/almayer/squads/req

diff --git a/code/game/gamemodes/cm_initialize.dm b/code/game/gamemodes/cm_initialize.dm
@@ -132,10 +132,16 @@ Additional game mode variables.
 	surv_starting_num = clamp((GLOB.readied_players/CONFIG_GET(number/surv_number_divider)), 2, 8) //this doesn't run
 	marine_starting_num = length(GLOB.player_list) - xeno_starting_num - surv_starting_num
 	for(var/datum/squad/target_squad in GLOB.RoleAuthority.squads)
-		if(target_squad)
+		if(!target_squad)
+			continue
+
+		if(target_squad.dynamic_scaling)
 			target_squad.roles_cap[JOB_SQUAD_ENGI] = engi_slot_formula(marine_starting_num)
 			target_squad.roles_cap[JOB_SQUAD_MEDIC] = medic_slot_formula(marine_starting_num)
 
+		if(target_squad.pop_lock && target_squad.pop_lock < length(GLOB.clients))
+			target_squad.roles_cap = target_squad.initial_roles_cap
+
 	for(var/i in GLOB.RoleAuthority.roles_by_name)
 		var/datum/job/J = GLOB.RoleAuthority.roles_by_name[i]
 		if(J.scaled)

diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm
@@ -135,7 +135,7 @@
 				ACCESS_MARINE_TL_PREP,
 				ACCESS_MARINE_ALPHA,
 				ACCESS_MARINE_BRAVO,
-				ACCESS_MARINE_CHARLIE,
+				ACCESS_MARINE_SUPPORT,
 				ACCESS_MARINE_DELTA,
 				ACCESS_MARINE_PILOT,
 				ACCESS_MARINE_DROPSHIP,
@@ -338,7 +338,7 @@
 				ACCESS_MARINE_KITCHEN,
 			)
 		if(7)//Squads
-			return list(ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, ACCESS_MARINE_CHARLIE, ACCESS_MARINE_DELTA)
+			return list(ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, ACCESS_MARINE_SUPPORT, ACCESS_MARINE_DELTA)
 		if(8)//Civilian
 			return list(
 				ACCESS_CIVILIAN_PUBLIC,
@@ -431,8 +431,8 @@
 			return "Alpha Squad"
 		if(ACCESS_MARINE_BRAVO)
 			return "Bravo Squad"
-		if(ACCESS_MARINE_CHARLIE)
-			return "Charlie Squad"
+		if(ACCESS_MARINE_SUPPORT)
+			return "Support Squads"
 		if(ACCESS_MARINE_DELTA)
 			return "Delta Squad"
 		if(ACCESS_MARINE_CARGO)

diff --git a/code/game/jobs/job/marine/marine.dm b/code/game/jobs/job/marine/marine.dm
@@ -15,6 +15,24 @@
 	if(!Check_WO())
 		current_human.nutrition = rand(NUTRITION_VERYLOW, NUTRITION_LOW) //Start hungry for the default marine.
 
+/datum/job/marine/proc/calculate_extra_slots(latejoin, slots)
+	var/extra_slots = 0
+
+	for(var/datum/squad/target_squad in GLOB.RoleAuthority.squads)
+		if(!target_squad)
+			continue
+
+		if(target_squad.pop_lock && target_squad.pop_lock < length(GLOB.clients))
+			target_squad.roles_cap = target_squad.initial_roles_cap
+
+		if(target_squad.dynamic_scaling)
+			if(latejoin)
+				target_squad.roles_cap[title] = slots
+		else
+			extra_slots += target_squad.roles_cap[title]
+
+	return extra_slots
+
 /datum/timelock/squad
 	name = "Squad Roles"
 

diff --git a/code/game/jobs/job/marine/squad/engineer.dm b/code/game/jobs/job/marine/squad/engineer.dm
@@ -9,7 +9,7 @@
 
 /datum/job/marine/engineer/set_spawn_positions(count)
 	for(var/datum/squad/target_squad in GLOB.RoleAuthority.squads)
-		if(target_squad)
+		if(target_squad && target_squad.dynamic_scaling)
 			target_squad.roles_cap[title] = engi_slot_formula(count)
 
 /datum/job/marine/engineer/get_total_positions(latejoin=0)
@@ -20,12 +20,7 @@
 	else
 		total_positions_so_far = slots
 
-	if(latejoin)
-		for(var/datum/squad/target_squad in GLOB.RoleAuthority.squads)
-			if(target_squad)
-				target_squad.roles_cap[title] = slots
-
-	return (slots*4)
+	return slots * 2 + calculate_extra_slots(latejoin, slots)
 
 /datum/job/marine/engineer/whiskey
 	title = JOB_WO_SQUAD_ENGINEER
@@ -40,19 +35,3 @@ AddTimelock(/datum/job/marine/engineer, list(
 	name = JOB_SQUAD_ENGI
 	icon_state = "engi_spawn"
 	job = /datum/job/marine/engineer
-
-/obj/effect/landmark/start/marine/engineer/alpha
-	icon_state = "engi_spawn_alpha"
-	squad = SQUAD_MARINE_1
-
-/obj/effect/landmark/start/marine/engineer/bravo
-	icon_state = "engi_spawn_bravo"
-	squad = SQUAD_MARINE_2
-
-/obj/effect/landmark/start/marine/engineer/charlie
-	icon_state = "engi_spawn_charlie"
-	squad = SQUAD_MARINE_3
-
-/obj/effect/landmark/start/marine/engineer/delta
-	icon_state = "engi_spawn_delta"
-	squad = SQUAD_MARINE_4
diff --git a/code/game/jobs/job/marine/squad/leader.dm b/code/game/jobs/job/marine/squad/leader.dm
@@ -7,6 +7,18 @@
 	gear_preset = /datum/equipment_preset/uscm/leader
 	entry_message_body = "<a href='"+WIKI_PLACEHOLDER+"'>You are responsible for the men and women of your squad.</a> Make sure they are on task, working together, and communicating. You are also in charge of communicating with command and letting them know about the situation first hand. Keep out of harm's way."
 
+/datum/job/marine/leader/get_total_positions(latejoin=0)
+	var/extra_slots = 0
+
+	for(var/datum/squad/target_squad in GLOB.RoleAuthority.squads)
+		if(!target_squad)
+			continue
+
+		if(target_squad.pop_lock && target_squad.pop_lock < length(GLOB.clients))
+			target_squad.roles_cap = target_squad.initial_roles_cap
+			extra_slots++
+	return extra_slots + spawn_positions
+
 /datum/job/marine/leader/whiskey
 	title = JOB_WO_SQUAD_LEADER
 	flags_startup_parameters = ROLE_ADD_TO_SQUAD
@@ -20,19 +32,3 @@ AddTimelock(/datum/job/marine/leader, list(
 	name = JOB_SQUAD_LEADER
 	icon_state = "leader_spawn"
 	job = /datum/job/marine/leader
-
-/obj/effect/landmark/start/marine/leader/alpha
-	icon_state = "leader_spawn_alpha"
-	squad = SQUAD_MARINE_1
-
-/obj/effect/landmark/start/marine/leader/bravo
-	icon_state = "leader_spawn_bravo"
-	squad = SQUAD_MARINE_2
-
-/obj/effect/landmark/start/marine/leader/charlie
-	icon_state = "leader_spawn_charlie"
-	squad = SQUAD_MARINE_3
-
-/obj/effect/landmark/start/marine/leader/delta
-	icon_state = "leader_spawn_delta"
-	squad = SQUAD_MARINE_4