From 831199a5b95f913e4dbc799ff2cb3db370d93c1f Mon Sep 17 00:00:00 2001 From: Perry Fraser Date: Mon, 11 Aug 2025 09:57:42 -0400 Subject: [PATCH] fix: make advanced operating table advanced (#4170) * fix: make advanced operating table advanced * Test flake * Test flake * Bro --- .../_Shitmed/Surgery/SharedSurgerySystem.Steps.cs | 2 +- .../_Shitmed/Surgery/SurgerySpeedModifierSystem.cs | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.Steps.cs b/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.Steps.cs index 868ea862d3..42300adfc3 100644 --- a/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.Steps.cs +++ b/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.Steps.cs @@ -814,7 +814,7 @@ public abstract partial class SharedSurgerySystem { var buckledEvent = new SurgerySpeedModifyEvent(speed); RaiseLocalEvent(buckledTo, ref buckledEvent); - speed = ev.Multiplier; + speed = buckledEvent.Multiplier; } return stepComp.Duration / speed; diff --git a/Content.Shared/_Shitmed/Surgery/SurgerySpeedModifierSystem.cs b/Content.Shared/_Shitmed/Surgery/SurgerySpeedModifierSystem.cs index e2a1e3a684..05bee97280 100644 --- a/Content.Shared/_Shitmed/Surgery/SurgerySpeedModifierSystem.cs +++ b/Content.Shared/_Shitmed/Surgery/SurgerySpeedModifierSystem.cs @@ -9,13 +9,19 @@ public sealed partial class SurgerySpeedModifierSystem : EntitySystem { base.Initialize(); - SubscribeLocalEvent>(OnSpeedModify); + SubscribeLocalEvent(OnSpeedModify); + SubscribeLocalEvent>(OnSpeedModifyRelay); SubscribeLocalEvent(OnExamineEquipment); } - private void OnSpeedModify(Entity ent, ref InventoryRelayedEvent args) + private void OnSpeedModify(Entity ent, ref SurgerySpeedModifyEvent args) { - args.Args.Multiplier *= ent.Comp.SpeedModifier; + args.Multiplier *= ent.Comp.SpeedModifier; + } + + private void OnSpeedModifyRelay(Entity ent, ref InventoryRelayedEvent args) + { + OnSpeedModify(ent, ref args.Args); } private void OnExamineEquipment(Entity ent, ref ArmorExamineEvent args)