]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix merg conflict (#27080)
authormetalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Thu, 18 Apr 2024 04:36:40 +0000 (14:36 +1000)
committerGitHub <noreply@github.com>
Thu, 18 Apr 2024 04:36:40 +0000 (14:36 +1000)
bo

Resources/Prototypes/Entities/Clothing/Eyes/hud.yml

index 9c29b17b3456651f9c72387fd59ac0ceaafbb708..c919f9173b44a4ca2fa9e1b7040487b92dcb1664 100644 (file)
   - 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.
   - type: Clothing
     sprite: Clothing/Eyes/Hud/syndagent.rsi
   - type: ShowSyndicateIcons
-  - type: ShowSecurityIcons
   - type: ShowHealthBars
     damageContainers:
     - Biological