Second id check was necessary in case of removal during tgui input

cmss13-devs · Jun 9, 2024 · 2b824c9 · 2b824c9
1 parent 6034c6f
commit 2b824c9
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/code/modules/cm_marines/overwatch.dm b/code/modules/cm_marines/overwatch.dm
@@ -711,6 +711,11 @@
 		to_chat(usr, "[icon2html(src, usr)] [SPAN_WARNING("[transfer_marine] is KIA.")]")
 		return
 
+	card = transfer_marine.get_idcard()
+	if(!card)
+		to_chat(usr, "[icon2html(src, usr)] [SPAN_WARNING("Transfer aborted. [transfer_marine] isn't wearing an ID.")]")
+		return
+
 	var/datum/squad/old_squad = transfer_marine.assigned_squad
 	if(new_squad == old_squad)
 		to_chat(usr, "[icon2html(src, usr)] [SPAN_WARNING("[transfer_marine] is already in [new_squad]!")]")