- add: Medhuds.

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

@@ -8,9 +8,7 @@
     sprite: Clothing/Eyes/Hud/diag.rsi
   - type: Clothing
     sprite: Clothing/Eyes/Hud/diag.rsi
-  - type: ClothingGrantComponent
+  - type: ShowHealthBars
-    component:
-      - type: ShowWhiteHealthBars
     damageContainers:
     - Inorganic
     - Silicon
@@ -25,15 +23,10 @@
     sprite: Clothing/Eyes/Hud/med.rsi
   - type: Clothing
     sprite: Clothing/Eyes/Hud/med.rsi
-# - type: ShowHealthBars
+  - type: ShowHealthBars
-#   damageContainers:
-#   - Biological
-  - type: ShowHealthIcons
     damageContainers:
     - Biological
-  - type: ClothingGrantComponent
+  - type: ShowHealthIcons
-    component:
-      - type: ShowWhiteHealthBars
     damageContainers:
     - Biological
   - type: Tag
@@ -117,12 +110,10 @@
     sprite: Clothing/Eyes/Hud/medonion.rsi
   - type: Clothing
     sprite: Clothing/Eyes/Hud/medonion.rsi
-  - type: ShowHealthIcons
+  - type: ShowHealthBars
     damageContainers:
     - Biological
-  - type: ClothingGrantComponent
+  - type: ShowHealthIcons
-    component:
-      - type: ShowWhiteHealthBars
     damageContainers:
     - Biological
   - type: ShowHungerIcons
@@ -137,12 +128,10 @@
     sprite: Clothing/Eyes/Hud/medonionbeer.rsi
   - type: Clothing
     sprite: Clothing/Eyes/Hud/medonionbeer.rsi
-  - type: ShowHealthIcons
+  - type: ShowHealthBars
     damageContainers:
     - Biological
-  - type: ClothingGrantComponent
+  - type: ShowHealthIcons
-    component:
-      - type: ShowWhiteHealthBars
     damageContainers:
     - Biological
   - type: ShowHungerIcons
@@ -162,12 +151,10 @@
     graph: HudMedSec
     node: medsecHud
   - type: ShowSecurityIcons
-  - type: ShowHealthIcons
+  - type: ShowHealthBars
     damageContainers:
     - Biological
-  - type: ClothingGrantComponent
+  - type: ShowHealthIcons
-    component:
-      - type: ShowWhiteHealthBars
     damageContainers:
     - Biological
 
@@ -182,13 +169,10 @@
   - type: Clothing
     sprite: Clothing/Eyes/Hud/medsecengi.rsi
   - type: ShowSecurityIcons
-  - type: ClothingGrantComponent
+  - type: ShowHealthBars
-    component:
-      - type: ShowWhiteHealthBars
     damageContainers:
     - Biological
     - Inorganic
-        - Silicon
   - type: ShowHealthIcons
     damageContainers:
     - Biological
@@ -205,16 +189,13 @@
   - type: Clothing
     sprite: Clothing/Eyes/Hud/omni.rsi
   - type: ShowSecurityIcons
-  - type: ShowHealthIcons
+  - type: ShowHealthBars
-    damageContainers:
-    - Biological
-  - type: ClothingGrantComponent
-    component:
-      - type: ShowWhiteHealthBars
     damageContainers:
     - Biological
     - Inorganic
-        - Silicon
+  - type: ShowHealthIcons
+    damageContainers:
+    - Biological
   - type: ShowHungerIcons
   - type: ShowThirstIcons
   - type: ShowSyndicateIcons

Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml

@@ -785,13 +785,16 @@
         Caustic: 0.95
   - type: FlashImmunity # WD edit
   - type: EyeProtection # WD edit
+  - type: ShowHealthBars
+    damageContainers:
+    - Biological
+    - Inorganic
   - type: ShowHealthIcons
     damageContainers:
     - Biological
   - type: ClothingGrantComponent
     component:
     - type: NightVision
-    - type: ShowWhiteHealthBars
 
 #MISC. HARDSUITS
 #Clown Hardsuit

Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml

@@ -220,10 +220,10 @@
     access: [["Medical"], ["Command"], ["Research"]]
   - type: Inventory
     templateId: borgDutch
-  - type: ShowHealthIcons
+  - type: ShowHealthBars
     damageContainers:
     - Biological
-  - type: ShowWhiteHealthBars
+  - type: ShowHealthIcons
     damageContainers:
     - Biological
 

Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml

@@ -279,10 +279,10 @@
     interactFailureString: petting-failure-medibot
     interactSuccessSound:
       path: /Audio/Ambience/Objects/periodic_beep.ogg
-  - type: ShowHealthIcons
+  - type: ShowHealthBars
     damageContainers:
     - Biological
-  - type: ShowWhiteHealthBars
+  - type: ShowHealthIcons
     damageContainers:
     - Biological
 

Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml

@@ -96,7 +96,10 @@
   - type: ShowHealthIcons
     damageContainers:
     - Biological
-  - type: ShowWhiteHealthBars
+  - type: ShowHealthBars
+    damageContainers:
+    - Biological
+    - Inorganic
   - type: Invisibility
 
 - type: entity

Resources/Prototypes/StatusEffects/health.yml

@@ -32,4 +32,3 @@
   icon:
     sprite: /Textures/Interface/Misc/health_icons.rsi
     state: Rotting
-

Resources/Prototypes/_White/Entities/Cult/Items/tome_craft.yml

@@ -43,9 +43,10 @@
         toggleAction: null
         toggleSound: null
         color: White
-      - type: ShowWhiteHealthBars
+    - type: ShowHealthBars
       damageContainers:
       - Biological
+      - Inorganic
     - type: ShowHealthIcons
       damageContainers:
       - Biological

Resources/Prototypes/_White/Entities/Cult/constructs.yml

@@ -66,9 +66,10 @@
     - type: NightVision
       toggleSound: null
       color: White
-    - type: ShowWhiteHealthBars
+    - type: ShowHealthBars
       damageContainers:
       - Biological
+      - Inorganic
     - type: ShowHealthIcons
       damageContainers:
       - Biological