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

Fix the singularity (#8890)

Browse Source 
* Revert "Fixes the singularity bouncing off the station. (#8452)"

This reverts commit dc186f1e24.

* Fix singulo
This commit is contained in:
metalgearsloth
2022-06-27 15:22:44 +10:00
committed by GitHub
parent 12e5cdacae
commit e9d6156d0c
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Shared/Singularity/SharedSingularitySystem.cs
View File

@@ -12,7 +12,6 @@ namespace Content.Shared.Singularity
[Dependency] private readonly FixtureSystem _fixtures = default!;
public const string DeleteFixture = "DeleteCircle";
public const string CollideFixture = "ColliderCircle";
private float GetFalloff(int level)
{
@@ -116,10 +115,17 @@ namespace Content.Shared.Singularity
appearance.SetData(SingularityVisuals.Level, value);
}
if (physics != null && _fixtures.GetFixtureOrNull(physics, DeleteFixture) is {Shape: PhysShapeCircle deleteCircle} && _fixtures.GetFixtureOrNull(physics, CollideFixture) is {Shape: PhysShapeCircle collideCircle})
if (physics != null)
{
deleteCircle.Radius = value - 0.5f;
collideCircle.Radius = value;
var fixture = _fixtures.GetFixtureOrNull(physics, DeleteFixture);
if (fixture != null)
{
var circle = (PhysShapeCircle) fixture.Shape;
circle.Radius = value - 0.5f;
fixture.Hard = value <= 4;
}
}
if (EntityManager.TryGetComponent(singularity.Owner, out SingularityDistortionComponent? distortion))