Fix merg conflict (#27080)

bo
This commit is contained in:
metalgearsloth
2024-04-18 14:36:40 +10:00
committed by GitHub
parent ee96d8aa66
commit 126f64a914

View File

@@ -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