From 173f24590ffd1351a0e37343c48fe4531e3d4d7e Mon Sep 17 00:00:00 2001 From: Janet Blackquill Date: Mon, 6 Oct 2025 01:55:42 -0400 Subject: [PATCH] resimmed offmed --- .../UI/HealthAnalyzerWindow.xaml | 15 +- .../UI/HealthAnalyzerWindow.xaml.cs | 70 ++-- .../UI/Tooltips/BloodFlowTooltip.xaml.cs | 24 -- .../UI/Tooltips/BloodOxygenationTooltip.xaml | 8 - .../Tooltips/BloodOxygenationTooltip.xaml.cs | 34 -- .../UI/Tooltips/BloodPressureTooltip.cs | 6 + .../UI/Tooltips/BloodPressureTooltip.xaml | 8 - .../UI/Tooltips/BloodPressureTooltip.xaml.cs | 24 -- .../UI/Tooltips/BloodTooltip.cs | 6 + .../UI/Tooltips/BloodTooltip.xaml | 8 - .../UI/Tooltips/BloodTooltip.xaml.cs | 15 - .../UI/Tooltips/BrainHealthTooltip.cs | 14 + .../UI/Tooltips/BrainHealthTooltip.xaml | 8 - .../UI/Tooltips/BrainHealthTooltip.xaml.cs | 24 -- .../UI/Tooltips/DamageTooltip.cs | 6 + .../UI/Tooltips/DamageTooltip.xaml | 8 - .../UI/Tooltips/DamageTooltip.xaml.cs | 15 - .../UI/Tooltips/EtCO2Tooltip.cs | 14 + .../UI/Tooltips/HeartHealthTooltip.cs | 14 + .../UI/Tooltips/HeartHealthTooltip.xaml.cs | 24 -- .../UI/Tooltips/HeartRateTooltip.cs | 14 + .../UI/Tooltips/HeartRateTooltip.xaml | 8 - .../UI/Tooltips/HeartRateTooltip.xaml.cs | 33 -- .../UI/Tooltips/LungHealthTooltip.cs | 6 + .../UI/Tooltips/LungHealthTooltip.xaml | 8 - .../Tooltips/RespiratoryRateTooltip.xaml.cs | 14 + .../HealthAnalyzer/UI/Tooltips/SpO2Tooltip.cs | 14 + ...oodFlowTooltip.xaml => StaticTooltip.xaml} | 0 ...hTooltip.xaml.cs => StaticTooltip.xaml.cs} | 9 +- .../UI/Tooltips/StatusTooltip.cs | 6 + .../UI/Tooltips/StatusTooltip.xaml | 8 - ...althTooltip.xaml => UpdatableTooltip.xaml} | 2 +- ...oltip.xaml.cs => UpdatableTooltip.xaml.cs} | 10 +- .../CrewMonitoringWindow.xaml.cs | 10 +- .../DamageOverlayUiController.cs | 6 +- ...HeartateOverlay.cs => HeartrateOverlay.cs} | 18 +- .../Body/Components/RespiratorComponent.cs | 40 ++- .../Body/Systems/RespiratorSystem.cs | 32 +- .../Zombies/ZombieSystem.Transform.cs | 3 +- .../Wounds/WoundableHealthAnalyzerSystem.cs | 26 ++ .../Mobs/Systems/MobThresholdSystem.cs | 2 +- .../StatusEffectSystem.Relay.cs | 8 +- ...ssistedCirculationStatusEffectComponent.cs | 14 - .../AssistedCirculationStatusEffectSystem.cs | 20 -- ...odOxygenationModifierStatusEffectSystem.cs | 22 -- ...yxgenationModifierStatusEffectComponent.cs | 14 - ...diacOutputModifierStatusEffectComponent.cs | 12 + ...CardiacOutputModifierStatusEffectSystem.cs | 19 + ...ngFunctionModifierStatusEffectComponent.cs | 12 + .../LungFunctionModifierStatusEffectSystem.cs | 19 + ...abolicRateModifierStatusEffectComponent.cs | 24 ++ ...MetabolicRateModifierStatusEffectSystem.cs | 19 + ...difyBrainDamageChanceStatusEffectSystem.cs | 2 +- ...OxygenDepletionChanceStatusEffectSystem.cs | 2 +- ...ratoryRateModifierStatusEffectComponent.cs | 12 + ...spiratoryRateModifierStatusEffectSystem.cs | 19 + .../StrainStatusEffectComponent.cs | 11 - .../StatusEffects/StrainStatusEffectSystem.cs | 19 - ...scularToneModifierStatusEffectComponent.cs | 12 + .../VascularToneModifierStatusEffectSystem.cs | 19 + .../_Offbrand/Wounds/BrainDamageSystem.cs | 20 +- .../Wounds/BrainDamageThresholdsSystem.cs | 6 +- .../_Offbrand/Wounds/HeartSystem.cs | 331 +++++++++--------- .../_Offbrand/Wounds/HeartrateAlertsSystem.cs | 9 +- .../_Offbrand/Wounds/HeartrateComponent.cs | 306 ++++++++++------ .../_Offbrand/Wounds/LungDamageComponent.cs | 13 + .../_Offbrand/Wounds/LungDamageSystem.cs | 18 + .../_Offbrand/Wounds/PainComponent.cs | 14 + Content.Shared/_Offbrand/Wounds/PainSystem.cs | 12 +- .../_Offbrand/Wounds/ShockThresholdsSystem.cs | 2 +- .../_Offbrand/Wounds/WoundComponent.cs | 6 - .../_Offbrand/Wounds/WoundableComponent.cs | 2 +- .../Wounds/WoundableHealthAnalyzer.cs | 106 +++--- .../en-US/_Offbrand/health-analyzer.ftl | 131 +++---- Resources/Locale/en-US/_Offbrand/messages.ftl | 4 +- Resources/Locale/en-US/_Offbrand/vitals.ftl | 16 +- .../Entities/Mobs/Species/slime.yml | 7 + .../Prototypes/Entities/Mobs/Species/vox.yml | 51 +-- Resources/Prototypes/Reagents/botany.yml | 2 +- Resources/Prototypes/Reagents/gases.yml | 4 +- Resources/Prototypes/Reagents/medicine.yml | 2 +- Resources/Prototypes/_Offbrand/base_mob.yml | 48 +-- .../Prototypes/_Offbrand/status_effects.yml | 66 ++-- Resources/ServerInfo/_Offbrand/Body.xml | 145 +++++--- 84 files changed, 1210 insertions(+), 1004 deletions(-) delete mode 100644 Content.Client/HealthAnalyzer/UI/Tooltips/BloodFlowTooltip.xaml.cs delete mode 100644 Content.Client/HealthAnalyzer/UI/Tooltips/BloodOxygenationTooltip.xaml delete mode 100644 Content.Client/HealthAnalyzer/UI/Tooltips/BloodOxygenationTooltip.xaml.cs create mode 100644 Content.Client/HealthAnalyzer/UI/Tooltips/BloodPressureTooltip.cs delete mode 100644 Content.Client/HealthAnalyzer/UI/Tooltips/BloodPressureTooltip.xaml delete mode 100644 Content.Client/HealthAnalyzer/UI/Tooltips/BloodPressureTooltip.xaml.cs create mode 100644 Content.Client/HealthAnalyzer/UI/Tooltips/BloodTooltip.cs delete mode 100644 Content.Client/HealthAnalyzer/UI/Tooltips/BloodTooltip.xaml delete mode 100644 Content.Client/HealthAnalyzer/UI/Tooltips/BloodTooltip.xaml.cs create mode 100644 Content.Client/HealthAnalyzer/UI/Tooltips/BrainHealthTooltip.cs delete mode 100644 Content.Client/HealthAnalyzer/UI/Tooltips/BrainHealthTooltip.xaml delete mode 100644 Content.Client/HealthAnalyzer/UI/Tooltips/BrainHealthTooltip.xaml.cs create mode 100644 Content.Client/HealthAnalyzer/UI/Tooltips/DamageTooltip.cs delete mode 100644 Content.Client/HealthAnalyzer/UI/Tooltips/DamageTooltip.xaml delete mode 100644 Content.Client/HealthAnalyzer/UI/Tooltips/DamageTooltip.xaml.cs create mode 100644 Content.Client/HealthAnalyzer/UI/Tooltips/EtCO2Tooltip.cs create mode 100644 Content.Client/HealthAnalyzer/UI/Tooltips/HeartHealthTooltip.cs delete mode 100644 Content.Client/HealthAnalyzer/UI/Tooltips/HeartHealthTooltip.xaml.cs create mode 100644 Content.Client/HealthAnalyzer/UI/Tooltips/HeartRateTooltip.cs delete mode 100644 Content.Client/HealthAnalyzer/UI/Tooltips/HeartRateTooltip.xaml delete mode 100644 Content.Client/HealthAnalyzer/UI/Tooltips/HeartRateTooltip.xaml.cs create mode 100644 Content.Client/HealthAnalyzer/UI/Tooltips/LungHealthTooltip.cs delete mode 100644 Content.Client/HealthAnalyzer/UI/Tooltips/LungHealthTooltip.xaml create mode 100644 Content.Client/HealthAnalyzer/UI/Tooltips/RespiratoryRateTooltip.xaml.cs create mode 100644 Content.Client/HealthAnalyzer/UI/Tooltips/SpO2Tooltip.cs rename Content.Client/HealthAnalyzer/UI/Tooltips/{BloodFlowTooltip.xaml => StaticTooltip.xaml} (100%) rename Content.Client/HealthAnalyzer/UI/Tooltips/{LungHealthTooltip.xaml.cs => StaticTooltip.xaml.cs} (54%) create mode 100644 Content.Client/HealthAnalyzer/UI/Tooltips/StatusTooltip.cs delete mode 100644 Content.Client/HealthAnalyzer/UI/Tooltips/StatusTooltip.xaml rename Content.Client/HealthAnalyzer/UI/Tooltips/{HeartHealthTooltip.xaml => UpdatableTooltip.xaml} (73%) rename Content.Client/HealthAnalyzer/UI/Tooltips/{StatusTooltip.xaml.cs => UpdatableTooltip.xaml.cs} (57%) rename Content.Client/_Offbrand/Overlays/{HeartateOverlay.cs => HeartrateOverlay.cs} (89%) delete mode 100644 Content.Shared/_Offbrand/StatusEffects/AssistedCirculationStatusEffectComponent.cs delete mode 100644 Content.Shared/_Offbrand/StatusEffects/AssistedCirculationStatusEffectSystem.cs delete mode 100644 Content.Shared/_Offbrand/StatusEffects/BloodOxygenationModifierStatusEffectSystem.cs delete mode 100644 Content.Shared/_Offbrand/StatusEffects/BloodOyxgenationModifierStatusEffectComponent.cs create mode 100644 Content.Shared/_Offbrand/StatusEffects/CardiacOutputModifierStatusEffectComponent.cs create mode 100644 Content.Shared/_Offbrand/StatusEffects/CardiacOutputModifierStatusEffectSystem.cs create mode 100644 Content.Shared/_Offbrand/StatusEffects/LungFunctionModifierStatusEffectComponent.cs create mode 100644 Content.Shared/_Offbrand/StatusEffects/LungFunctionModifierStatusEffectSystem.cs create mode 100644 Content.Shared/_Offbrand/StatusEffects/MetabolicRateModifierStatusEffectComponent.cs create mode 100644 Content.Shared/_Offbrand/StatusEffects/MetabolicRateModifierStatusEffectSystem.cs create mode 100644 Content.Shared/_Offbrand/StatusEffects/RespiratoryRateModifierStatusEffectComponent.cs create mode 100644 Content.Shared/_Offbrand/StatusEffects/RespiratoryRateModifierStatusEffectSystem.cs delete mode 100644 Content.Shared/_Offbrand/StatusEffects/StrainStatusEffectComponent.cs delete mode 100644 Content.Shared/_Offbrand/StatusEffects/StrainStatusEffectSystem.cs create mode 100644 Content.Shared/_Offbrand/StatusEffects/VascularToneModifierStatusEffectComponent.cs create mode 100644 Content.Shared/_Offbrand/StatusEffects/VascularToneModifierStatusEffectSystem.cs diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml index 2f4057cee7..be8eaf482f 100644 --- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml +++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml @@ -46,18 +46,21 @@