From 167c08825d12742833f678f544cba8647dcf5af4 Mon Sep 17 00:00:00 2001
From: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
Date: Thu, 24 Aug 2023 00:53:19 +0200
Subject: [PATCH] Update overwatch.dm

---
 code/modules/cm_marines/overwatch.dm | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/code/modules/cm_marines/overwatch.dm b/code/modules/cm_marines/overwatch.dm
index 4e427a7c850f..26de42ad99ec 100644
--- a/code/modules/cm_marines/overwatch.dm
+++ b/code/modules/cm_marines/overwatch.dm
@@ -246,16 +246,18 @@
 					ftl_alive++
 			if(JOB_SQUAD_SPECIALIST)
 				spec_count++
-				if(istype(marine_human.wear_id, /obj/item/card/id)) //decapitated marine is mindless,
-					var/obj/item/card/id/ID = marine_human.wear_id //we use their ID to get their role.
-					if(ID.assignment)
-						if(specialist_type)
-							specialist_type = "MULTIPLE"
-						else
-							var/list/spec_type = splittext(ID.assignment, "(")
-							if(islist(spec_type) && (length(spec_type) > 1))
-								specialist_type = splittext(spec_type[2], ")")[1]
-
+				if(marine_human)
+					if(istype(marine_human.wear_id, /obj/item/card/id)) //decapitated marine is mindless,
+						var/obj/item/card/id/ID = marine_human.wear_id //we use their ID to get their role.
+						if(ID.assignment)
+							if(specialist_type)
+								specialist_type = "MULTIPLE"
+							else
+								var/list/spec_type = splittext(ID.assignment, "(")
+								if(islist(spec_type) && (length(spec_type) > 1))
+									specialist_type = splittext(spec_type[2], ")")[1]
+				else if(!specialist_type)
+					specialist_type = "UNKNOWN"
 				if(mob_state != "Dead")
 					spec_alive++
 			if(JOB_SQUAD_MEDIC)