Skip to content
This repository was archived by the owner on Dec 23, 2025. It is now read-only.

Commit 7ec3745

Browse files
Revert "Fix goliath tentacle exploit (space-wizards#37168)" (space-wizards#37479)
* Revert "Fix goliath tentacle exploit (space-wizards#37168)" This reverts commit 6fbd0c9. * wawawewa
1 parent 24ab219 commit 7ec3745

2 files changed

Lines changed: 3 additions & 16 deletions

File tree

Content.Shared/Stunnable/SharedStunSystem.cs

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
using Content.Shared.Throwing;
1818
using Content.Shared.Whitelist;
1919
using Robust.Shared.Audio.Systems;
20-
using Robust.Shared.Physics;
2120
using Robust.Shared.Physics.Components;
2221
using Robust.Shared.Physics.Events;
2322
using Robust.Shared.Physics.Systems;
@@ -27,12 +26,10 @@ namespace Content.Shared.Stunnable;
2726
public abstract class SharedStunSystem : EntitySystem
2827
{
2928
[Dependency] private readonly ActionBlockerSystem _blocker = default!;
30-
[Dependency] private readonly SharedBroadphaseSystem _broadphase = default!;
3129
[Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
3230
[Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!;
3331
[Dependency] private readonly SharedAudioSystem _audio = default!;
3432
[Dependency] private readonly EntityWhitelistSystem _entityWhitelist = default!;
35-
[Dependency] private readonly SharedPhysicsSystem _physics = default!;
3633
[Dependency] private readonly StandingStateSystem _standingState = default!;
3734
[Dependency] private readonly StatusEffectsSystem _statusEffect = default!;
3835

@@ -54,7 +51,6 @@ public override void Initialize()
5451
SubscribeLocalEvent<StunnedComponent, ComponentStartup>(UpdateCanMove);
5552
SubscribeLocalEvent<StunnedComponent, ComponentShutdown>(UpdateCanMove);
5653

57-
SubscribeLocalEvent<StunOnContactComponent, ComponentStartup>(OnStunOnContactStartup);
5854
SubscribeLocalEvent<StunOnContactComponent, StartCollideEvent>(OnStunOnContactCollide);
5955

6056
// helping people up if they're knocked down
@@ -116,17 +112,6 @@ private void UpdateCanMove(EntityUid uid, StunnedComponent component, EntityEven
116112
_blocker.UpdateCanMove(uid);
117113
}
118114

119-
private void OnStunOnContactStartup(Entity<StunOnContactComponent> ent, ref ComponentStartup args)
120-
{
121-
if (!TryComp<PhysicsComponent>(ent, out var body) ||
122-
!TryComp<FixturesComponent>(ent, out var manager))
123-
return;
124-
125-
_physics.SetBodyType(ent, BodyType.Dynamic, manager: manager, body: body);
126-
_physics.SetCanCollide(ent, true, manager: manager, body: body);
127-
_broadphase.RegenerateContacts((ent, body));
128-
}
129-
130115
private void OnStunOnContactCollide(Entity<StunOnContactComponent> ent, ref StartCollideEvent args)
131116
{
132117
if (args.OurFixtureId != ent.Comp.FixtureId)

Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,10 @@
121121
id: GoliathTentacle
122122
name: tentacle
123123
components:
124+
- type: Transform
125+
anchored: True
124126
- type: Physics
125-
bodyType: Dynamic
127+
bodyType: Static
126128
canCollide: true
127129
- type: InteractionOutline
128130
- type: Sprite

0 commit comments

Comments
 (0)