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

shitcode is real

Browse Source
This commit is contained in:
Remuchi
2024-04-13 14:15:41 +07:00
parent e2b6002076
commit 57e50ceed5
7 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/_White/Cult/UI/ApocalypseRuneEui.cs
View File

@@ -41,7 +41,7 @@ public sealed class ApocalypseRuneEui : BaseEui
var argsDoAfterEvent = new DoAfterArgs(_entityManager, _whoCalled, 120f, ev, _whoCalled)
{
BreakOnUserMove = true,
BreakOnMove = true,
NeedHand = true
};

14
Content.Server/_White/ExperimentalSyndicateTeleporter/ExperimentalSyndicateTeleporter.cs
View File

@@ -3,13 +3,13 @@ using System.Numerics;
using Content.Server._White.Other;
using Content.Server.Body.Systems;
using Content.Server.Popups;
using Content.Server.Pulling;
using Content.Shared.Coordinates.Helpers;
using Content.Shared.Examine;
using Content.Shared.Interaction.Events;
using Content.Shared.Maps;
using Content.Shared.Movement.Pulling.Components;
using Content.Shared.Movement.Pulling.Systems;
using Content.Shared.Popups;
using Content.Shared.Pulling.Components;
using Robust.Server.Audio;
using Robust.Server.Containers;
using Robust.Server.GameObjects;
@@ -80,16 +80,16 @@ public sealed class ExperimentalSyndicateTeleporter : EntitySystem
if (!TryComp<TransformComponent>(args.User, out var xform))
return;
if (TryComp<SharedPullableComponent>(args.User, out var pullable) && pullable.BeingPulled)
if (TryComp<PullableComponent>(args.User, out var pullable) && pullable.BeingPulled)
{
_pullingSystem.TryStopPull(pullable);
_pullingSystem.TryStopPull(args.User, pullable);
}
if (TryComp<SharedPullerComponent>(args.User, out var pulling)
if (TryComp<PullerComponent>(args.User, out var pulling)
&& pulling.Pulling != null &&
TryComp<SharedPullableComponent>(pulling.Pulling.Value, out var subjectPulling))
TryComp<PullableComponent>(pulling.Pulling.Value, out var subjectPulling))
{
_pullingSystem.TryStopPull(subjectPulling);
_pullingSystem.TryStopPull(pulling.Pulling.Value, subjectPulling);
}
if (_containerSystem.IsEntityInContainer(args.User))

14
Content.Server/_White/TimeBeacon/TimeBeaconSystem.cs
View File

@@ -1,9 +1,9 @@
using Content.Server.Popups;
using Content.Server.Pulling;
using Content.Shared.Examine;
using Content.Shared.Interaction.Events;
using Content.Shared.Movement.Pulling.Components;
using Content.Shared.Movement.Pulling.Systems;
using Content.Shared.Popups;
using Content.Shared.Pulling.Components;
using Robust.Server.Audio;
using Robust.Server.GameObjects;
using Robust.Shared.Timing;
@@ -46,16 +46,16 @@ public sealed class TimeBeaconSystem : EntitySystem
return;
// break pulls before portal enter so we dont break shit
if (TryComp<SharedPullableComponent>(entity, out var pullable) && pullable.BeingPulled)
if (TryComp<PullableComponent>(entity, out var pullable) && pullable.BeingPulled)
{
_pulling.TryStopPull(pullable);
_pulling.TryStopPull(entity, pullable);
}
if (TryComp<SharedPullerComponent>(entity, out var pulling)
if (TryComp<PullerComponent>(entity, out var pulling)
&& pulling.Pulling != null &&
TryComp<SharedPullableComponent>(pulling.Pulling.Value, out var subjectPulling))
TryComp<PullableComponent>(pulling.Pulling.Value, out var subjectPulling))
{
_pulling.TryStopPull(subjectPulling);
_pulling.TryStopPull(pulling.Pulling.Value, subjectPulling);
}
_transform.SetCoordinates(entity, entXform, xform.Coordinates);