From cbba09ae256be2cfa60adcb7a12082c46ef9c571 Mon Sep 17 00:00:00 2001 From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Date: Fri, 31 May 2024 23:54:24 -0500 Subject: [PATCH] Gives Mediborg the Medical Hud (#28391) --- .../Prototypes/Entities/Clothing/Eyes/hud.yml | 53 ++++++------------- .../Entities/Mobs/Cyborgs/borg_chassis.yml | 2 +- .../Prototypes/Entities/Mobs/NPCs/silicon.yml | 8 +-- 3 files changed, 19 insertions(+), 44 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml index 835c405e19..c74a60e8fc 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml @@ -7,6 +7,17 @@ - type: ShowMindShieldIcons - type: ShowCriminalRecordIcons +- type: entity + id: ShowMedicalIcons + abstract: true + noSpawn: true + components: + - type: ShowHealthBars + damageContainers: + - Biological + - type: ShowHealthIcons + damageContainers: + - Biological - type: entity parent: ClothingEyesBase @@ -24,7 +35,7 @@ - Silicon - type: entity - parent: ClothingEyesBase + parent: [ClothingEyesBase, ShowMedicalIcons] id: ClothingEyesHudMedical name: medical hud description: A heads-up display that scans the humanoids in view and provides accurate data about their health status. @@ -33,12 +44,6 @@ sprite: Clothing/Eyes/Hud/med.rsi - type: Clothing sprite: Clothing/Eyes/Hud/med.rsi - - type: ShowHealthBars - damageContainers: - - Biological - - type: ShowHealthIcons - damageContainers: - - Biological - type: Tag tags: - HudMedical @@ -110,7 +115,7 @@ - type: ShowThirstIcons - type: entity - parent: ClothingEyesBase + parent: [ClothingEyesBase, ShowMedicalIcons] id: ClothingEyesHudMedOnion name: medonion hud description: Filler @@ -119,16 +124,10 @@ sprite: Clothing/Eyes/Hud/medonion.rsi - type: Clothing sprite: Clothing/Eyes/Hud/medonion.rsi - - type: ShowHealthBars - damageContainers: - - Biological - - type: ShowHealthIcons - damageContainers: - - Biological - type: ShowHungerIcons - type: entity - parent: ClothingEyesBase + parent: [ClothingEyesBase, ShowMedicalIcons] id: ClothingEyesHudMedOnionBeer name: medthungerst hud description: Filler @@ -137,17 +136,11 @@ sprite: Clothing/Eyes/Hud/medonionbeer.rsi - type: Clothing sprite: Clothing/Eyes/Hud/medonionbeer.rsi - - type: ShowHealthBars - damageContainers: - - Biological - - type: ShowHealthIcons - damageContainers: - - Biological - type: ShowHungerIcons - type: ShowThirstIcons - type: entity - parent: [ClothingEyesBase, ShowSecurityIcons] + parent: [ClothingEyesBase, ShowSecurityIcons, ShowMedicalIcons] id: ClothingEyesHudMedSec name: medsec hud description: An eye display that looks like a mixture of medical and security huds. @@ -159,15 +152,9 @@ - type: Construction graph: HudMedSec node: medsecHud - - type: ShowHealthBars - damageContainers: - - Biological - - type: ShowHealthIcons - damageContainers: - - Biological - type: entity - parent: [ClothingEyesBase, ShowSecurityIcons] + parent: [ClothingEyesBase, ShowSecurityIcons, ShowMedicalIcons] id: ClothingEyesHudMultiversal name: multiversal hud description: Filler @@ -180,13 +167,10 @@ damageContainers: - Biological - Inorganic - - type: ShowHealthIcons - damageContainers: - - Biological - type: ShowSyndicateIcons - type: entity - parent: [ClothingEyesBase, ShowSecurityIcons] + parent: [ClothingEyesBase, ShowSecurityIcons, ShowMedicalIcons] id: ClothingEyesHudOmni name: omni hud description: Filler @@ -199,9 +183,6 @@ damageContainers: - Biological - Inorganic - - type: ShowHealthIcons - damageContainers: - - Biological - type: ShowHungerIcons - type: ShowThirstIcons - type: ShowSyndicateIcons diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml index 81f889b438..075ac534c6 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -192,7 +192,7 @@ - type: entity id: BorgChassisMedical - parent: BaseBorgChassisNT + parent: [BaseBorgChassisNT, ShowMedicalIcons] name: medical cyborg components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml index 3c61306e04..b2fefb67ae 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml @@ -246,7 +246,7 @@ path: /Audio/Ambience/Objects/periodic_beep.ogg - type: entity - parent: MobSiliconBase + parent: [MobSiliconBase, ShowMedicalIcons] id: MobMedibot name: medibot description: No substitute for a doctor, but better than nothing. @@ -287,12 +287,6 @@ interactFailureString: petting-failure-medibot interactSuccessSound: path: /Audio/Ambience/Objects/periodic_beep.ogg - - type: ShowHealthBars - damageContainers: - - Biological - - type: ShowHealthIcons - damageContainers: - - Biological - type: entity parent: MobSiliconBase -- 2.51.2