Clearing update_icons conflic

cmss13-devs · Jun 19, 2024 · d4b6b0e · d4b6b0e
1 parent 78282dd
commit d4b6b0e
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -351,8 +351,11 @@ Applied by gun suicide and high impact bullet executions, removed by rejuvenate,
 	if(species.flags & NO_OVERLAYS && !wear_id.force_overlays_on)
 		return
 
-	if(!wear_id.pinned_on_uniform || (w_uniform && w_uniform.displays_id && !(w_uniform.flags_jumpsuit & UNIFORM_JACKET_REMOVED)))
-		var/image/id_overlay = wear_id.get_mob_overlay(src, WEAR_ID)
+	var/obj/item/card/id/card = get_idcard()
+	if(!card)
+		return
+	if(!card.pinned_on_uniform || (w_uniform && w_uniform.displays_id && !(w_uniform.flags_jumpsuit & UNIFORM_JACKET_REMOVED)))
+		var/image/id_overlay = card.get_mob_overlay(src, WEAR_ID)
 		id_overlay.layer = -ID_LAYER
 		overlays_standing[ID_LAYER] = id_overlay
 		apply_overlay(ID_LAYER)