tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor slippery stuff (#20535)

Browse Source
This commit is contained in:
metalgearsloth
2023-09-28 20:27:35 +10:00
committed by GitHub
parent e502b6be61
commit 040538a0b7
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Shared/Slippery/SlipperySystem.cs
View File

@@ -103,14 +103,6 @@ public sealed class SlipperySystem : EntitySystem
_adminLogger.Add(LogType.Slip, LogImpact.Low, _adminLogger.Add(LogType.Slip, LogImpact.Low,
$"{ToPrettyString(other):mob} slipped on collision with {ToPrettyString(uid):entity}"); $"{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> /// <summary>

3
Content.Shared/StatusEffect/StatusEffectsSystem.cs
View File

@@ -61,7 +61,8 @@ namespace Content.Shared.StatusEffect
if (args.Current is not StatusEffectsComponentState state) if (args.Current is not StatusEffectsComponentState state)
return; return;
component.AllowedEffects = new(state.AllowedEffects); component.AllowedEffects.Clear();
component.AllowedEffects.AddRange(state.AllowedEffects);
// Remove non-existent effects. // Remove non-existent effects.
foreach (var effect in component.ActiveEffects.Keys) foreach (var effect in component.ActiveEffects.Keys)