From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Thu, 28 Sep 2023 10:27:35 +0000 (+1000) Subject: Minor slippery stuff (#20535) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=040538a0b7a1562c3662d83fb47e93a3b246010d;p=space-station-14.git Minor slippery stuff (#20535) --- diff --git a/Content.Shared/Slippery/SlipperySystem.cs b/Content.Shared/Slippery/SlipperySystem.cs index 41bfe03c4c..a89291aea4 100644 --- a/Content.Shared/Slippery/SlipperySystem.cs +++ b/Content.Shared/Slippery/SlipperySystem.cs @@ -103,14 +103,6 @@ public sealed class SlipperySystem : EntitySystem _adminLogger.Add(LogType.Slip, LogImpact.Low, $"{ToPrettyString(other):mob} slipped on collision with {ToPrettyString(uid):entity}"); } - - public void CopyConstruct(EntityUid destUid, SlipperyComponent srcSlip) - { - var destEvaporation = EntityManager.EnsureComponent(destUid); - destEvaporation.SlipSound = srcSlip.SlipSound; - destEvaporation.ParalyzeTime = srcSlip.ParalyzeTime; - destEvaporation.LaunchForwardsMultiplier = srcSlip.LaunchForwardsMultiplier; - } } /// diff --git a/Content.Shared/StatusEffect/StatusEffectsSystem.cs b/Content.Shared/StatusEffect/StatusEffectsSystem.cs index 70822a05f4..bedc5a824c 100644 --- a/Content.Shared/StatusEffect/StatusEffectsSystem.cs +++ b/Content.Shared/StatusEffect/StatusEffectsSystem.cs @@ -61,7 +61,8 @@ namespace Content.Shared.StatusEffect if (args.Current is not StatusEffectsComponentState state) return; - component.AllowedEffects = new(state.AllowedEffects); + component.AllowedEffects.Clear(); + component.AllowedEffects.AddRange(state.AllowedEffects); // Remove non-existent effects. foreach (var effect in component.ActiveEffects.Keys)