Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

synthflesh nerf (#343)

Browse Source 
* synthflesh nerf

* sky-blue carpet

* vaporSystem tweak

* throwSystem tweaks

* Revert "throwSystem tweaks"

This reverts commit a8820ab703ba3008bddeafbe7933ae94e88db3c8.

* Revert "vaporSystem tweak"

This reverts commit da5a7ef1db42033ee115467295882323f9d58ce6.

* prevent double collision rework

* showmanifest command

* client issue
This commit is contained in:
RinKeeper
2024-06-20 22:29:43 +03:00
committed by GitHub
parent cb37ba5714
commit e32403a26c
7 changed files with 71 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Content.Server/Chemistry/EntitySystems/VaporSystem.cs
View File

@@ -30,17 +30,26 @@ namespace Content.Server.Chemistry.EntitySystems
[Dependency] private readonly ReactiveSystem _reactive = default!;
private const float ReactTime = 0.125f;
private readonly HashSet<(EntityUid, EntityUid)> _processed = new (); // WD edit
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<VaporComponent, StartCollideEvent>(HandleCollide);
SubscribeLocalEvent<VaporComponent, ComponentRemove>(OnDespawn); // WD edit
}
private void HandleCollide(Entity<VaporComponent> entity, ref StartCollideEvent args)
{
if (!EntityManager.TryGetComponent(entity.Owner, out SolutionContainerManagerComponent? contents)) return;
if (!EntityManager.TryGetComponent(entity.Owner, out SolutionContainerManagerComponent? contents))
return;
// WD edit start
var collisionPair = (entity.Owner, args.OtherEntity);
if (_processed.Contains(collisionPair))
return;
// WD edit end
foreach (var (_, soln) in _solutionContainerSystem.EnumerateSolutions((entity.Owner, contents)))
{
@@ -48,6 +57,8 @@ namespace Content.Server.Chemistry.EntitySystems
_reactive.DoEntityReaction(args.OtherEntity, solution, ReactionMethod.Touch);
}
_processed.Add(collisionPair); // WD edit
// Check for collision with a impassable object (e.g. wall) and stop
if ((args.OtherFixture.CollisionLayer & (int) CollisionGroup.Impassable) != 0 && args.OtherFixture.Hard)
{
@@ -55,6 +66,12 @@ namespace Content.Server.Chemistry.EntitySystems
}
}
// WD edit
private void OnDespawn(Entity<VaporComponent> entity, ref ComponentRemove args)
{
_processed.RemoveWhere(pair => pair.Item1 == entity.Owner);
}
public void Start(Entity<VaporComponent> vapor, TransformComponent vaporXform, Vector2 dir, float speed, MapCoordinates target, float aliveTime, EntityUid? user = null)
{
vapor.Comp.Active = true;