Merge remote-tracking branch 'upstream/master' into ups

2024-08-13 22:18:51 +03:00
parent dbb90cab56 5a0bc40b7e
commit cbd6a8cff2
28 changed files with 32303 additions and 31023 deletions
--- a/Content.Client/UserInterface/Systems/Actions/ChargeActionSystem.cs
+++ b/Content.Client/UserInterface/Systems/Actions/ChargeActionSystem.cs
@@ -132,7 +132,7 @@ public sealed class ChargeActionSystem : SharedChargingSystem
        {
            if (_chargeLevel > 0 && _charging)
            {
-                RaiseNetworkEvent(new AddWizardChargeEvent(action.ChargeProto));
+                RaiseNetworkEvent(new AddWizardChargeEvent(GetNetEntity(actionId)));
            }
            _prevChargeLevel = _chargeLevel;
        }