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

Trigger Refactor (#39034)

Browse Source
This commit is contained in:
slarticodefast
2025-08-03 21:20:37 +02:00
committed by GitHub
parent 777e89ab3e
commit 2c40a950f7
256 changed files with 3987 additions and 2892 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Shared/Rootable/SharedRootableSystem.cs
View File

@@ -1,5 +1,4 @@
using Content.Shared.Damage.Components;
using Content.Shared.Actions;
using Content.Shared.Actions;
using Content.Shared.Actions.Components;
using Content.Shared.Alert;
using Content.Shared.Coordinates;
@@ -9,6 +8,7 @@ using Content.Shared.Mobs;
using Content.Shared.Movement.Systems;
using Content.Shared.Slippery;
using Content.Shared.Toggleable;
using Content.Shared.Trigger.Components.Effects;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Physics.Components;
using Robust.Shared.Physics.Events;
@@ -127,7 +127,7 @@ public abstract class SharedRootableSystem : EntitySystem
if (!ent.Comp.Rooted)
return;
if (args.SlipCausingEntity != null && HasComp<DamageUserOnTriggerComponent>(args.SlipCausingEntity))
if (args.SlipCausingEntity != null && HasComp<DamageOnTriggerComponent>(args.SlipCausingEntity))
return;
args.NoSlip = true;