]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Minor slippery stuff (#20535)
authormetalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Thu, 28 Sep 2023 10:27:35 +0000 (20:27 +1000)
committerGitHub <noreply@github.com>
Thu, 28 Sep 2023 10:27:35 +0000 (20:27 +1000)
Content.Shared/Slippery/SlipperySystem.cs
Content.Shared/StatusEffect/StatusEffectsSystem.cs

index 41bfe03c4c3b204c0b10c5a48f9d223e84175c16..a89291aea49b461d9987a7c2ed89c53b0bf1f14e 100644 (file)
@@ -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<SlipperyComponent>(destUid);
-        destEvaporation.SlipSound = srcSlip.SlipSound;
-        destEvaporation.ParalyzeTime = srcSlip.ParalyzeTime;
-        destEvaporation.LaunchForwardsMultiplier = srcSlip.LaunchForwardsMultiplier;
-    }
 }
 
 /// <summary>
index 70822a05f44e7b01d3c7393f147c7883318c6e37..bedc5a824ce2eaf4be1fc74e5316d5006c60ef71 100644 (file)
@@ -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)