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

Merge stable into master (#37387)

Browse Source
This commit is contained in:
slarticodefast
2025-05-12 23:40:55 +02:00
committed by GitHub
parent 0dbf66a4ec 45253ca79e
commit 79b55d7549
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Shared/Anomaly/SharedAnomalySystem.cs
View File

@@ -51,13 +51,18 @@ public abstract class SharedAnomalySystem : EntitySystem
return; return;
// anomalies are static by default, so we have set them to dynamic to be throwable // anomalies are static by default, so we have set them to dynamic to be throwable
// only regular anomalies are static, so the check is meant to filter out things such as infection anomalies, which affect players
if (TryComp<PhysicsComponent>(ent, out var physics) && physics.BodyType == BodyType.Static)
_physics.SetBodyType(ent, BodyType.Dynamic, body: body); _physics.SetBodyType(ent, BodyType.Dynamic, body: body);
ChangeAnomalyStability(ent, Random.NextFloat(corePowered.StabilityPerThrow.X, corePowered.StabilityPerThrow.Y), ent.Comp); ChangeAnomalyStability(ent, Random.NextFloat(corePowered.StabilityPerThrow.X, corePowered.StabilityPerThrow.Y), ent.Comp);
} }
private void OnLand(Entity<AnomalyComponent> ent, ref LandEvent args) private void OnLand(Entity<AnomalyComponent> ent, ref LandEvent args)
{ {
// revert back to static // revert back to static, but only if the object was dynamic (such as thrown anomalies, but not anomaly infected players)
if (!TryComp<PhysicsComponent>(ent, out var body) || body.BodyType != BodyType.Dynamic)
return;
_physics.SetBodyType(ent, BodyType.Static); _physics.SetBodyType(ent, BodyType.Static);
} }