From 126f64a9149fde473c47cf92e170648e974964df Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Thu, 18 Apr 2024 14:36:40 +1000 Subject: [PATCH] Fix merg conflict (#27080) bo --- Resources/Prototypes/Entities/Clothing/Eyes/hud.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml index 9c29b17b34..c919f9173b 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml @@ -216,7 +216,7 @@ - type: ShowSyndicateIcons - type: entity - parent: ClothingEyesBase + parent: [ClothingEyesBase, ShowSecurityIcons] id: ClothingEyesHudSyndicateAgent name: syndicate agent visor description: The Syndicate Agent's professional heads-up display, designed for quick diagnosis of their team's status. @@ -226,7 +226,6 @@ - type: Clothing sprite: Clothing/Eyes/Hud/syndagent.rsi - type: ShowSyndicateIcons - - type: ShowSecurityIcons - type: ShowHealthBars damageContainers: - Biological -- 2.52.0