From 468629a9efecfcf8fb482655655523dd47570bde Mon Sep 17 00:00:00 2001 From: Max-023 Date: Fri, 20 Sep 2024 22:56:17 -0400 Subject: [PATCH] Lamp Fixes --- .../mob/living/carbon/human/update_icons.dm | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 6b27397802..6407b16431 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -551,6 +551,34 @@ Applied by gun suicide and high impact bullet executions, removed by rejuvenate, overlays_standing[SUIT_GARB_LAYER] = IMG apply_overlay(SUIT_GARB_LAYER) + if(istype(wear_suit, /obj/item/clothing/suit/marine)) + var/obj/item/clothing/suit/marine/marine_armor = wear_suit + if(marine_armor.flags_marine_armor & ARMOR_SQUAD_OVERLAY) + if(assigned_squad && assigned_squad.equipment_color && assigned_squad.use_stripe_overlay) + var/leader = assigned_squad.squad_leader + var/image/squad_overlay = image(marine_armor.squad_overlay_icon, icon_state = "std-armor") + if(leader == src) + squad_overlay = image(marine_armor.squad_overlay_icon, icon_state = "sql-armor") + squad_overlay.layer = -SUIT_SQUAD_LAYER + squad_overlay.alpha = assigned_squad.armor_alpha + squad_overlay.color = assigned_squad.equipment_color + overlays_standing[SUIT_SQUAD_LAYER] = squad_overlay + apply_overlay(SUIT_SQUAD_LAYER) + + if(length(marine_armor.armor_overlays)) + var/image/K + var/image/IMG + for(var/i in marine_armor.armor_overlays) + K = marine_armor.armor_overlays[i] + if(K) + if(!IMG) + IMG = image(K.icon,src,K.icon_state, "layer"= -SUIT_GARB_LAYER) + else + IMG.overlays += image(K.icon,src,K.icon_state, "layer"= -SUIT_GARB_LAYER) + if(IMG) + overlays_standing[SUIT_GARB_LAYER] = IMG + apply_overlay(SUIT_GARB_LAYER) + update_tail_showing() else update_tail_showing()