From 34cd4556fe257e6ad493fed12e9fa1115575def5 Mon Sep 17 00:00:00 2001
From: BlackCrystalic <39885003+blackcrystall@users.noreply.github.com>
Date: Sun, 27 Oct 2024 17:29:15 +0500
Subject: [PATCH] no more checking for squad marine role

---
 code/game/jobs/job/marine/squads.dm | 2 ++
 code/game/jobs/role_authority.dm    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/game/jobs/job/marine/squads.dm b/code/game/jobs/job/marine/squads.dm
index 40fc6e872c07..cffbd326c91a 100644
--- a/code/game/jobs/job/marine/squads.dm
+++ b/code/game/jobs/job/marine/squads.dm
@@ -45,6 +45,7 @@
 	var/omni_squad_vendor = FALSE
 	/// Squad roles max caps per role list
 	var/list/roles_cap = list(
+		JOB_SQUAD_MARINE = null,
 		JOB_SQUAD_ENGI = 3,
 		JOB_SQUAD_MEDIC = 4,
 		JOB_SQUAD_SMARTGUN = 1,
@@ -189,6 +190,7 @@
 	prepend_squad_name_to_assignment = FALSE
 
 	roles_cap = list(
+		JOB_SQUAD_MARINE = null,
 		JOB_SQUAD_ENGI = 0,
 		JOB_SQUAD_MEDIC = 0,
 		JOB_SQUAD_SMARTGUN = 0,
diff --git a/code/game/jobs/role_authority.dm b/code/game/jobs/role_authority.dm
index d22213782452..4d431da86a34 100644
--- a/code/game/jobs/role_authority.dm
+++ b/code/game/jobs/role_authority.dm
@@ -549,7 +549,7 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou
 
 	var/datum/squad/lowest
 	for(var/datum/squad/squad in mixed_squads)
-		if(slot_check && !skip_limit)
+		if(slot_check && !isnull(squad.roles_cap[slot_check]) && !skip_limit)
 			if(squad.roles_in[slot_check] >= squad.roles_cap[slot_check])
 				continue