Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

9
Content.Shared/Throwing/ThrownItemSystem.cs
View File

@@ -26,6 +26,7 @@ namespace Content.Shared.Throwing
[Dependency] private readonly SharedGravitySystem _gravity = default!;
private const string ThrowingFixture = "throw-fixture";
private readonly HashSet<(EntityUid, EntityUid)> _processed = new (); // WD edit
public override void Initialize()
{
@@ -66,7 +67,14 @@ namespace Content.Shared.Throwing
if (args.OtherEntity == component.Thrower)
return;
// WD edit start
var collisionPair = (uid, args.OtherEntity);
if (_processed.Contains(collisionPair))
return;
// WD edit end
ThrowCollideInteraction(component, args.OurEntity, args.OtherEntity);
_processed.Add(collisionPair);
}
private void PreventCollision(EntityUid uid, ThrownItemComponent component, ref PreventCollideEvent args)
@@ -113,6 +121,7 @@ namespace Content.Shared.Throwing
EntityManager.EventBus.RaiseLocalEvent(uid, new StopThrowEvent { User = thrownItemComponent.Thrower }, true);
EntityManager.RemoveComponent<ThrownItemComponent>(uid);
_processed.Clear(); // WD edit
}
public void LandComponent(EntityUid uid, ThrownItemComponent thrownItem, PhysicsComponent physics, bool playSound)