From 0099da911fbea3f91ba5faa483d5f225082315c4 Mon Sep 17 00:00:00 2001 From: Emily9031 <182209267+Emily9031@users.noreply.github.com> Date: Sat, 7 Dec 2024 19:46:00 -0700 Subject: [PATCH 01/11] Mostly done, just needs some messaging added Going to change the description for the unborgable brain and add a popup. --- Content.Server/Body/Systems/BrainSystem.cs | 4 ++++ Content.Server/Traits/Assorted/UnborgableComponent.cs | 10 ++++++++++ Resources/Locale/en-US/deltav/traits/traits.ftl | 3 +++ Resources/Prototypes/DeltaV/Traits/disabilities.yml | 8 ++++++++ .../Entities/Objects/Specific/Robotics/mmi.yml | 3 +++ 5 files changed, 28 insertions(+) create mode 100644 Content.Server/Traits/Assorted/UnborgableComponent.cs diff --git a/Content.Server/Body/Systems/BrainSystem.cs b/Content.Server/Body/Systems/BrainSystem.cs index 86d2cb61ffe..e19960bb607 100644 --- a/Content.Server/Body/Systems/BrainSystem.cs +++ b/Content.Server/Body/Systems/BrainSystem.cs @@ -1,5 +1,6 @@ using Content.Server.Body.Components; using Content.Server.Ghost.Components; +using Content.Server.Traits.Assorted; using Content.Shared.Body.Components; using Content.Shared.Body.Events; using Content.Shared.Mind; @@ -33,6 +34,9 @@ private void HandleMind(EntityUid newEntity, EntityUid oldEntity) if (HasComp(newEntity)) ghostOnMove.MustBeDead = true; + if (HasComp(oldEntity)) + EnsureComp(newEntity); + if (!_mindSystem.TryGetMind(oldEntity, out var mindId, out var mind)) return; diff --git a/Content.Server/Traits/Assorted/UnborgableComponent.cs b/Content.Server/Traits/Assorted/UnborgableComponent.cs new file mode 100644 index 00000000000..c751ef0779b --- /dev/null +++ b/Content.Server/Traits/Assorted/UnborgableComponent.cs @@ -0,0 +1,10 @@ +namespace Content.Server.Traits.Assorted; + +/// +/// This is used for the unborgable trait. +/// +[RegisterComponent] +public sealed partial class UnborgableComponent : Component +{ + +} diff --git a/Resources/Locale/en-US/deltav/traits/traits.ftl b/Resources/Locale/en-US/deltav/traits/traits.ftl index 5fb2e7052bc..b7f66f0bf8d 100644 --- a/Resources/Locale/en-US/deltav/traits/traits.ftl +++ b/Resources/Locale/en-US/deltav/traits/traits.ftl @@ -32,3 +32,6 @@ trait-inpain-desc = You’re constantly in discomfort. You need painkillers to f trait-addicted-name = Addicted trait-addicted-desc = You crave the substance, and your thoughts keep drifting back to it. Without it, you feel incomplete, anxious, and on edge. + +trait-unborgable-name = Machine Incompatible +trait-unborgable-desc = Your brain cannot be put into a man-machine interface. diff --git a/Resources/Prototypes/DeltaV/Traits/disabilities.yml b/Resources/Prototypes/DeltaV/Traits/disabilities.yml index 96ded539387..8eed767c453 100644 --- a/Resources/Prototypes/DeltaV/Traits/disabilities.yml +++ b/Resources/Prototypes/DeltaV/Traits/disabilities.yml @@ -22,3 +22,11 @@ category: Disabilities components: - type: Pain + +- type: trait + id: Unborgable + name: trait-unborgable-name + description: trait-unborgable-desc + category: Disabilities + components: + - type: Unborgable diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml index 33eabbb60b5..ed97847bd52 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml @@ -41,6 +41,9 @@ whitelist: components: - Brain + blacklist: + components: + - Unborgable - type: ContainerContainer containers: brain_slot: !type:ContainerSlot From 2cdc8c41d6228b75245fb7bb5537678aeca23f95 Mon Sep 17 00:00:00 2001 From: Emily9031 <182209267+Emily9031@users.noreply.github.com> Date: Sat, 7 Dec 2024 22:47:46 -0700 Subject: [PATCH 02/11] Inspection says if brain has trait --- Content.Server/Body/Systems/BrainSystem.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Content.Server/Body/Systems/BrainSystem.cs b/Content.Server/Body/Systems/BrainSystem.cs index e19960bb607..8fd85a959b5 100644 --- a/Content.Server/Body/Systems/BrainSystem.cs +++ b/Content.Server/Body/Systems/BrainSystem.cs @@ -3,9 +3,11 @@ using Content.Server.Traits.Assorted; using Content.Shared.Body.Components; using Content.Shared.Body.Events; +using Content.Shared.Examine; using Content.Shared.Mind; using Content.Shared.Mind.Components; using Content.Shared.Pointing; +using Robust.Shared.Utility; namespace Content.Server.Body.Systems { @@ -20,6 +22,7 @@ public override void Initialize() SubscribeLocalEvent((uid, _, args) => HandleMind(args.Body, uid)); SubscribeLocalEvent((uid, _, args) => HandleMind(uid, args.OldBody)); SubscribeLocalEvent(OnPointAttempt); + SubscribeLocalEvent(OnExamined); } private void HandleMind(EntityUid newEntity, EntityUid oldEntity) @@ -43,6 +46,14 @@ private void HandleMind(EntityUid newEntity, EntityUid oldEntity) _mindSystem.TransferTo(mindId, newEntity, mind: mind); } + private void OnExamined(Entity ent, ref ExaminedEvent args) + { + var msg = new FormattedMessage(); + msg.AddMarkupPermissive("[color=red]This brain is damaged beyond use.[/color]"); + + args.PushMessage(msg, 1); + } + private void OnPointAttempt(Entity ent, ref PointAttemptEvent args) { args.Cancel(); From c9825240bb081c2fe8d4d013919d6b5b5120b6de Mon Sep 17 00:00:00 2001 From: Emily9031 <182209267+Emily9031@users.noreply.github.com> Date: Sun, 8 Dec 2024 01:29:41 -0700 Subject: [PATCH 03/11] Comments --- Content.Server/Body/Systems/BrainSystem.cs | 12 +++++++----- .../Entities/Objects/Specific/Robotics/mmi.yml | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Content.Server/Body/Systems/BrainSystem.cs b/Content.Server/Body/Systems/BrainSystem.cs index 8fd85a959b5..0f34b92efe3 100644 --- a/Content.Server/Body/Systems/BrainSystem.cs +++ b/Content.Server/Body/Systems/BrainSystem.cs @@ -1,13 +1,15 @@ using Content.Server.Body.Components; using Content.Server.Ghost.Components; -using Content.Server.Traits.Assorted; using Content.Shared.Body.Components; using Content.Shared.Body.Events; -using Content.Shared.Examine; using Content.Shared.Mind; using Content.Shared.Mind.Components; using Content.Shared.Pointing; +// DeltaV Start +using Content.Shared.Examine; +using Content.Server.Traits.Assorted; using Robust.Shared.Utility; +// DeltaV End namespace Content.Server.Body.Systems { @@ -22,7 +24,7 @@ public override void Initialize() SubscribeLocalEvent((uid, _, args) => HandleMind(args.Body, uid)); SubscribeLocalEvent((uid, _, args) => HandleMind(uid, args.OldBody)); SubscribeLocalEvent(OnPointAttempt); - SubscribeLocalEvent(OnExamined); + SubscribeLocalEvent(OnExamined); // DeltaV } private void HandleMind(EntityUid newEntity, EntityUid oldEntity) @@ -37,7 +39,7 @@ private void HandleMind(EntityUid newEntity, EntityUid oldEntity) if (HasComp(newEntity)) ghostOnMove.MustBeDead = true; - if (HasComp(oldEntity)) + if (HasComp(oldEntity)) // DeltaV EnsureComp(newEntity); if (!_mindSystem.TryGetMind(oldEntity, out var mindId, out var mind)) @@ -46,7 +48,7 @@ private void HandleMind(EntityUid newEntity, EntityUid oldEntity) _mindSystem.TransferTo(mindId, newEntity, mind: mind); } - private void OnExamined(Entity ent, ref ExaminedEvent args) + private void OnExamined(Entity ent, ref ExaminedEvent args) //DeltaV { var msg = new FormattedMessage(); msg.AddMarkupPermissive("[color=red]This brain is damaged beyond use.[/color]"); diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml index ed97847bd52..a251fa526ba 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml @@ -43,7 +43,7 @@ - Brain blacklist: components: - - Unborgable + - Unborgable # DeltaV - type: ContainerContainer containers: brain_slot: !type:ContainerSlot From 13ee791699c9272a989b84ce8385dbf0edf61272 Mon Sep 17 00:00:00 2001 From: Emily9031 <182209267+Emily9031@users.noreply.github.com> Date: Mon, 16 Dec 2024 19:49:46 -0700 Subject: [PATCH 04/11] Moved comment, removed body, localized, etc. --- Content.Server/Body/Systems/BrainSystem.cs | 5 +---- Content.Server/Traits/Assorted/UnborgableComponent.cs | 5 +---- Resources/Locale/en-US/deltav/borg/borg.ftl | 2 ++ .../Prototypes/Entities/Objects/Specific/Robotics/mmi.yml | 4 ++-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Content.Server/Body/Systems/BrainSystem.cs b/Content.Server/Body/Systems/BrainSystem.cs index 0f34b92efe3..29e29653cc3 100644 --- a/Content.Server/Body/Systems/BrainSystem.cs +++ b/Content.Server/Body/Systems/BrainSystem.cs @@ -50,10 +50,7 @@ private void HandleMind(EntityUid newEntity, EntityUid oldEntity) private void OnExamined(Entity ent, ref ExaminedEvent args) //DeltaV { - var msg = new FormattedMessage(); - msg.AddMarkupPermissive("[color=red]This brain is damaged beyond use.[/color]"); - - args.PushMessage(msg, 1); + args.PushMarkup($"[color=red]{Loc.GetString("brain-cannot-be-borged-message")}[/color]"); } private void OnPointAttempt(Entity ent, ref PointAttemptEvent args) diff --git a/Content.Server/Traits/Assorted/UnborgableComponent.cs b/Content.Server/Traits/Assorted/UnborgableComponent.cs index c751ef0779b..8e388de5c63 100644 --- a/Content.Server/Traits/Assorted/UnborgableComponent.cs +++ b/Content.Server/Traits/Assorted/UnborgableComponent.cs @@ -4,7 +4,4 @@ namespace Content.Server.Traits.Assorted; /// This is used for the unborgable trait. /// [RegisterComponent] -public sealed partial class UnborgableComponent : Component -{ - -} +public sealed partial class UnborgableComponent : Component; diff --git a/Resources/Locale/en-US/deltav/borg/borg.ftl b/Resources/Locale/en-US/deltav/borg/borg.ftl index 22c7e3850c6..8edb5eaf5b2 100644 --- a/Resources/Locale/en-US/deltav/borg/borg.ftl +++ b/Resources/Locale/en-US/deltav/borg/borg.ftl @@ -1,3 +1,5 @@ borg-type-security-name = Security borg-type-security-desc = Assist security in the fight for justice by detaining dangerous criminals. borg-type-security-transponder = security cyborg + +brain-cannot-be-borged-message = This brain is damaged beyond use. diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml index a251fa526ba..4251a2447a5 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml @@ -41,9 +41,9 @@ whitelist: components: - Brain - blacklist: + blacklist: # DeltaV components: - - Unborgable # DeltaV + - Unborgable - type: ContainerContainer containers: brain_slot: !type:ContainerSlot From ddfe968e561243bf85c06797dc995d4faa9e09df Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Wed, 1 Jan 2025 14:25:17 +0000 Subject: [PATCH 05/11] move to shared, shitmed ready, add warning to health analyzer --- .../UI/HealthAnalyzerWindow.xaml.cs | 14 ++++- .../Traits/Assorted/UnborgableComponent.cs | 10 ++++ .../_DV/Traits/Assorted/UnborgableSystem.cs | 54 +++++++++++++++++++ Resources/Locale/en-US/_DV/borg/borg.ftl | 2 +- .../components/health-analyzer-component.ftl | 1 + .../Prototypes/_DV/Traits/disabilities.yml | 2 +- 6 files changed, 80 insertions(+), 3 deletions(-) create mode 100644 Content.Shared/_DV/Traits/Assorted/UnborgableComponent.cs create mode 100644 Content.Shared/_DV/Traits/Assorted/UnborgableSystem.cs create mode 100644 Resources/Locale/en-US/_DV/medical/components/health-analyzer-component.ftl diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs index fd3615d59f5..1fbf876b3e0 100644 --- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs +++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs @@ -1,6 +1,7 @@ using System.Linq; using System.Numerics; using Content.Client.Message; +using Content.Shared._DV.Traits.Assorted; // DeltaV using Content.Shared.Atmos; using Content.Client.UserInterface.Controls; using Content.Shared.Alert; @@ -35,6 +36,7 @@ public sealed partial class HealthAnalyzerWindow : FancyWindow private readonly SpriteSystem _spriteSystem; private readonly IPrototypeManager _prototypes; private readonly IResourceCache _cache; + private readonly UnborgableSystem _unborgable; // DeltaV public HealthAnalyzerWindow() { @@ -45,6 +47,7 @@ public HealthAnalyzerWindow() _spriteSystem = _entityManager.System(); _prototypes = dependencies.Resolve(); _cache = dependencies.Resolve(); + _unborgable = _entityManager.System(); // DeltaV } public void Populate(HealthAnalyzerScannedUserMessage msg) @@ -110,7 +113,8 @@ public void Populate(HealthAnalyzerScannedUserMessage msg) // Alerts - var showAlerts = msg.Unrevivable == true || msg.Bleeding == true; + var unborgable = _unborgable.IsUnborgable(target.Value); // DeltaV + var showAlerts = msg.Unrevivable == true || msg.Bleeding == true || unborgable; AlertsDivider.Visible = showAlerts; AlertsContainer.Visible = showAlerts; @@ -134,6 +138,14 @@ public void Populate(HealthAnalyzerScannedUserMessage msg) MaxWidth = 300 }); + if (unborgable) // DeltaV + AlertsContainer.AddChild(new RichTextLabel + { + Text = Loc.GetString("health-analyzer-window-entity-unborgable-text"), + Margin = new Thickness(0, 4), + MaxWidth = 300 + }); + // Damage Groups var damageSortedGroups = diff --git a/Content.Shared/_DV/Traits/Assorted/UnborgableComponent.cs b/Content.Shared/_DV/Traits/Assorted/UnborgableComponent.cs new file mode 100644 index 00000000000..752d745870d --- /dev/null +++ b/Content.Shared/_DV/Traits/Assorted/UnborgableComponent.cs @@ -0,0 +1,10 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared._DV.Traits.Assorted; + +/// +/// This is used for the unborgable trait, which blacklists a brain from MMIs. +/// If this is added to a body, it gets moved to its brain if it has one. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class UnborgableComponent : Component; diff --git a/Content.Shared/_DV/Traits/Assorted/UnborgableSystem.cs b/Content.Shared/_DV/Traits/Assorted/UnborgableSystem.cs new file mode 100644 index 00000000000..7b4f588ce80 --- /dev/null +++ b/Content.Shared/_DV/Traits/Assorted/UnborgableSystem.cs @@ -0,0 +1,54 @@ +using Content.Shared.Body.Components; +using Content.Shared.Body.Organ; +using Content.Shared.Body.Systems; +using Content.Shared.Examine; +using Content.Shared.Movement.Components; // TODO: use BrainComponent instead of InputMover when shitmed is merged +using Robust.Shared.Utility; + +namespace Content.Shared._DV.Traits.Assorted; + +/// +/// Adds a warning examine message to brains with . +/// +public sealed class UnborgableSystem : EntitySystem +{ + [Dependency] private readonly SharedBodySystem _body = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnMapInit); + SubscribeLocalEvent(OnExamined); + } + + /// + /// Returns true if a mob's brain has . + /// + public bool IsUnborgable(Entity ent) + { + // technically this will apply for any organ not just brain, but assume nobody will be evil and do that + return _body.GetBodyOrganEntityComps().Count > 0; + } + + private void OnMapInit(Entity ent, ref MapInitEvent args) + { + if (!TryComp(ent, out var body)) + return; + + var brains = _body.GetBodyOrganEntityComps((ent.Owner, body)); + foreach (var brain in brains) + { + EnsureComp(ent); + } + } + + private void OnExamined(Entity ent, ref ExaminedEvent args) + { + // need a health analyzer to see if someone can't be borged, can't just look at them and know + if (!args.IsInDetailsRange || HasComp(ent)) + return; + + args.PushMarkup(Loc.GetString("brain-cannot-be-borged-message")); + } +} diff --git a/Resources/Locale/en-US/_DV/borg/borg.ftl b/Resources/Locale/en-US/_DV/borg/borg.ftl index 8edb5eaf5b2..afb1e15827d 100644 --- a/Resources/Locale/en-US/_DV/borg/borg.ftl +++ b/Resources/Locale/en-US/_DV/borg/borg.ftl @@ -2,4 +2,4 @@ borg-type-security-name = Security borg-type-security-desc = Assist security in the fight for justice by detaining dangerous criminals. borg-type-security-transponder = security cyborg -brain-cannot-be-borged-message = This brain is damaged beyond use. +brain-cannot-be-borged-message = [color=red]This brain is damaged beyond use.[/color] diff --git a/Resources/Locale/en-US/_DV/medical/components/health-analyzer-component.ftl b/Resources/Locale/en-US/_DV/medical/components/health-analyzer-component.ftl new file mode 100644 index 00000000000..0cfbdc2f940 --- /dev/null +++ b/Resources/Locale/en-US/_DV/medical/components/health-analyzer-component.ftl @@ -0,0 +1 @@ +health-analyzer-window-entity-unrevivable-text = [color=red]Patient's brain signatures are incompatible with MMI technology![/color] diff --git a/Resources/Prototypes/_DV/Traits/disabilities.yml b/Resources/Prototypes/_DV/Traits/disabilities.yml index 8eed767c453..611933b2e15 100644 --- a/Resources/Prototypes/_DV/Traits/disabilities.yml +++ b/Resources/Prototypes/_DV/Traits/disabilities.yml @@ -29,4 +29,4 @@ description: trait-unborgable-desc category: Disabilities components: - - type: Unborgable + - type: Unborgable # Automatically gets moved to the brain From b4be13eec0cfc2dbf2491da337b3a061750ece9e Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Wed, 1 Jan 2025 14:33:32 +0000 Subject: [PATCH 06/11] pro --- Content.Shared/_DV/Traits/Assorted/UnborgableSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/_DV/Traits/Assorted/UnborgableSystem.cs b/Content.Shared/_DV/Traits/Assorted/UnborgableSystem.cs index 7b4f588ce80..9376a0baade 100644 --- a/Content.Shared/_DV/Traits/Assorted/UnborgableSystem.cs +++ b/Content.Shared/_DV/Traits/Assorted/UnborgableSystem.cs @@ -28,7 +28,7 @@ public override void Initialize() public bool IsUnborgable(Entity ent) { // technically this will apply for any organ not just brain, but assume nobody will be evil and do that - return _body.GetBodyOrganEntityComps().Count > 0; + return _body.GetBodyOrganEntityComps(ent).Count > 0; } private void OnMapInit(Entity ent, ref MapInitEvent args) From a95b7526da7d94fb788afabee7ed6da64c0d11e3 Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Wed, 1 Jan 2025 14:36:51 +0000 Subject: [PATCH 07/11] remove old component --- Content.Server/Traits/Assorted/UnborgableComponent.cs | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 Content.Server/Traits/Assorted/UnborgableComponent.cs diff --git a/Content.Server/Traits/Assorted/UnborgableComponent.cs b/Content.Server/Traits/Assorted/UnborgableComponent.cs deleted file mode 100644 index 8e388de5c63..00000000000 --- a/Content.Server/Traits/Assorted/UnborgableComponent.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Content.Server.Traits.Assorted; - -/// -/// This is used for the unborgable trait. -/// -[RegisterComponent] -public sealed partial class UnborgableComponent : Component; From 0a69d78dee64bc2afc8992960db4c9f3f91cebcf Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Wed, 1 Jan 2025 14:37:40 +0000 Subject: [PATCH 08/11] untroll brain system --- Content.Server/Body/Systems/BrainSystem.cs | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/Content.Server/Body/Systems/BrainSystem.cs b/Content.Server/Body/Systems/BrainSystem.cs index 29e29653cc3..86d2cb61ffe 100644 --- a/Content.Server/Body/Systems/BrainSystem.cs +++ b/Content.Server/Body/Systems/BrainSystem.cs @@ -5,11 +5,6 @@ using Content.Shared.Mind; using Content.Shared.Mind.Components; using Content.Shared.Pointing; -// DeltaV Start -using Content.Shared.Examine; -using Content.Server.Traits.Assorted; -using Robust.Shared.Utility; -// DeltaV End namespace Content.Server.Body.Systems { @@ -24,7 +19,6 @@ public override void Initialize() SubscribeLocalEvent((uid, _, args) => HandleMind(args.Body, uid)); SubscribeLocalEvent((uid, _, args) => HandleMind(uid, args.OldBody)); SubscribeLocalEvent(OnPointAttempt); - SubscribeLocalEvent(OnExamined); // DeltaV } private void HandleMind(EntityUid newEntity, EntityUid oldEntity) @@ -39,20 +33,12 @@ private void HandleMind(EntityUid newEntity, EntityUid oldEntity) if (HasComp(newEntity)) ghostOnMove.MustBeDead = true; - if (HasComp(oldEntity)) // DeltaV - EnsureComp(newEntity); - if (!_mindSystem.TryGetMind(oldEntity, out var mindId, out var mind)) return; _mindSystem.TransferTo(mindId, newEntity, mind: mind); } - private void OnExamined(Entity ent, ref ExaminedEvent args) //DeltaV - { - args.PushMarkup($"[color=red]{Loc.GetString("brain-cannot-be-borged-message")}[/color]"); - } - private void OnPointAttempt(Entity ent, ref PointAttemptEvent args) { args.Cancel(); From c8733a3a9a26290646bd2c9b5cc2736a93d23ae9 Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Wed, 1 Jan 2025 14:39:29 +0000 Subject: [PATCH 09/11] :trollface: --- .../en-US/_DV/medical/components/health-analyzer-component.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/_DV/medical/components/health-analyzer-component.ftl b/Resources/Locale/en-US/_DV/medical/components/health-analyzer-component.ftl index 0cfbdc2f940..7698576e4e5 100644 --- a/Resources/Locale/en-US/_DV/medical/components/health-analyzer-component.ftl +++ b/Resources/Locale/en-US/_DV/medical/components/health-analyzer-component.ftl @@ -1 +1 @@ -health-analyzer-window-entity-unrevivable-text = [color=red]Patient's brain signatures are incompatible with MMI technology![/color] +health-analyzer-window-entity-unborgable-text = [color=red]Patient's brain signatures are incompatible with MMI technology![/color] From f64f163de5628f3c4e59a23619c107a6873e9807 Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Wed, 1 Jan 2025 14:41:59 +0000 Subject: [PATCH 10/11] :trollface: --- Content.Shared/_DV/Traits/Assorted/UnborgableSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/_DV/Traits/Assorted/UnborgableSystem.cs b/Content.Shared/_DV/Traits/Assorted/UnborgableSystem.cs index 9376a0baade..5580e171531 100644 --- a/Content.Shared/_DV/Traits/Assorted/UnborgableSystem.cs +++ b/Content.Shared/_DV/Traits/Assorted/UnborgableSystem.cs @@ -39,7 +39,7 @@ private void OnMapInit(Entity ent, ref MapInitEvent args) var brains = _body.GetBodyOrganEntityComps((ent.Owner, body)); foreach (var brain in brains) { - EnsureComp(ent); + EnsureComp(brain); } } From 2d19c914b9d413ce1657b86fb5719b1fc281e9f6 Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Thu, 9 Jan 2025 18:04:03 +0000 Subject: [PATCH 11/11] fix --- Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs index 0aee5410ac9..8ed6fc63e40 100644 --- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs +++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs @@ -187,7 +187,7 @@ public void Populate(HealthAnalyzerScannedUserMessage msg) // Alerts - var unborgable = _unborgable.IsUnborgable(target.Value); // DeltaV + var unborgable = _unborgable.IsUnborgable(_target.Value); // DeltaV var showAlerts = msg.Unrevivable == true || msg.Bleeding == true || unborgable; AlertsDivider.Visible = showAlerts;