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

Revert "Fix goliath tentacle exploit (#37168)" (#37479)

Browse Source 
* Revert "Fix goliath tentacle exploit (#37168)"

This reverts commit 6fbd0c9da1.

* wawawewa
This commit is contained in:
metalgearsloth
2025-05-15 20:54:20 +10:00
committed by GitHub
parent 24ab2193d6
commit 7ec37451d0
2 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Content.Shared/Stunnable/SharedStunSystem.cs
View File

@@ -17,7 +17,6 @@ using Content.Shared.StatusEffect;
using Content.Shared.Throwing;
using Content.Shared.Whitelist;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Physics;
using Robust.Shared.Physics.Components;
using Robust.Shared.Physics.Events;
using Robust.Shared.Physics.Systems;
@@ -27,12 +26,10 @@ namespace Content.Shared.Stunnable;
public abstract class SharedStunSystem : EntitySystem
{
[Dependency] private readonly ActionBlockerSystem _blocker = default!;
[Dependency] private readonly SharedBroadphaseSystem _broadphase = default!;
[Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
[Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly EntityWhitelistSystem _entityWhitelist = default!;
[Dependency] private readonly SharedPhysicsSystem _physics = default!;
[Dependency] private readonly StandingStateSystem _standingState = default!;
[Dependency] private readonly StatusEffectsSystem _statusEffect = default!;
@@ -54,7 +51,6 @@ public abstract class SharedStunSystem : EntitySystem
SubscribeLocalEvent<StunnedComponent, ComponentStartup>(UpdateCanMove);
SubscribeLocalEvent<StunnedComponent, ComponentShutdown>(UpdateCanMove);
SubscribeLocalEvent<StunOnContactComponent, ComponentStartup>(OnStunOnContactStartup);
SubscribeLocalEvent<StunOnContactComponent, StartCollideEvent>(OnStunOnContactCollide);
// helping people up if they're knocked down
@@ -116,17 +112,6 @@ public abstract class SharedStunSystem : EntitySystem
_blocker.UpdateCanMove(uid);
}
private void OnStunOnContactStartup(Entity<StunOnContactComponent> ent, ref ComponentStartup args)
{
if (!TryComp<PhysicsComponent>(ent, out var body) ||
!TryComp<FixturesComponent>(ent, out var manager))
return;
_physics.SetBodyType(ent, BodyType.Dynamic, manager: manager, body: body);
_physics.SetCanCollide(ent, true, manager: manager, body: body);
_broadphase.RegenerateContacts((ent, body));
}
private void OnStunOnContactCollide(Entity<StunOnContactComponent> ent, ref StartCollideEvent args)
{
if (args.OurFixtureId != ent.Comp.FixtureId)