diff --git a/Content.Server/_White/SecurityHud/SecurityHudSystem.cs b/Content.Server/_White/SecurityHud/SecurityHudSystem.cs index 22c36b4fd6..b05f5cdebc 100644 --- a/Content.Server/_White/SecurityHud/SecurityHudSystem.cs +++ b/Content.Server/_White/SecurityHud/SecurityHudSystem.cs @@ -66,7 +66,7 @@ public sealed class SecurityHudSystem : EntitySystem SetWanted(args.User, args.Target, ent.Value, component); }, Disabled = false, - Priority = 0, + Priority = 3, Text = Loc.GetString("security-hud-verb"), }; diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index e25572140d..83d2ffe0f5 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -156,7 +156,7 @@ - WhitelistChameleon - type: entity - parent: ClothingEyesBase + parent: [ClothingEyesBase, SecHud] id: ClothingEyesGlassesSecurity name: security glasses description: Upgraded sunglasses that provide flash immunity and a security HUD. diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml index 3fcad2d428..35d28aede8 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml @@ -34,7 +34,7 @@ - HudMedical - type: entity - parent: ClothingEyesBase + parent: [ClothingEyesBase, SecHud] id: ClothingEyesHudSecurity name: security hud description: A heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records. @@ -44,20 +44,6 @@ - type: Clothing sprite: Clothing/Eyes/Hud/sec.rsi - type: ShowSecurityIcons - - type: AccessReader - access: [["Security"]] - - type: SecurityHud - criminalrecords: - - SecurityIconDischarged - - SecurityIconParoled - - SecurityIconSuspected - - SecurityIconWanted - - SecurityIconIncarcerated - - CriminalRecordIconRemove - - type: UserInterface - interfaces: - - key: enum.SecurityHudUiKey.Key - type: SecurityHudBUI - type: Tag tags: - HudSecurity @@ -152,7 +138,7 @@ - type: ShowThirstIcons - type: entity - parent: ClothingEyesBase + parent: [ClothingEyesBase, SecHud] id: ClothingEyesHudMedSec name: medsec hud description: An eye display that looks like a mixture of medical and security huds. @@ -173,7 +159,7 @@ - Biological - type: entity - parent: ClothingEyesBase + parent: [ClothingEyesBase, SecHud] id: ClothingEyesHudMultiversal name: multiversal hud description: Filler @@ -193,7 +179,7 @@ - type: ShowSyndicateIcons - type: entity - parent: ClothingEyesBase + parent: [ClothingEyesBase, SecHud] id: ClothingEyesHudOmni name: omni hud description: Filler diff --git a/Resources/Prototypes/_White/sechud.yml b/Resources/Prototypes/_White/sechud.yml new file mode 100644 index 0000000000..e994e94662 --- /dev/null +++ b/Resources/Prototypes/_White/sechud.yml @@ -0,0 +1,20 @@ +- type: entity + id: SecHud + name: sechud + abstract: true + noSpawn: true + components: + - type: AccessReader + access: [["Security"]] + - type: SecurityHud + criminalrecords: + - SecurityIconDischarged + - SecurityIconParoled + - SecurityIconSuspected + - SecurityIconWanted + - SecurityIconIncarcerated + - CriminalRecordIconRemove + - type: UserInterface + interfaces: + - key: enum.SecurityHudUiKey.Key + type: SecurityHudBUI