From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Thu, 18 Apr 2024 04:36:40 +0000 (+1000)
Subject: Fix merg conflict (#27080)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=126f64a9149fde473c47cf92e170648e974964df;p=space-station-14.git

Fix merg conflict (#27080)

bo
---

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