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

commit (#434)

Browse Source
This commit is contained in:
Spatison
2024-07-10 21:01:39 +03:00
committed by GitHub
parent fa00ea8ae1
commit 80ca59e026
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Content.Shared/Standing/Systems/SharedStandingStateSystem.cs
View File

@@ -73,7 +73,7 @@ public abstract partial class SharedStandingStateSystem : EntitySystem
if (!TryComp(uid, out StandingStateComponent? standing)) // WD EDIT if (!TryComp(uid, out StandingStateComponent? standing)) // WD EDIT
return; return;
RaiseNetworkEvent(new CheckAutoGetUpEvent()); RaiseNetworkEvent(new CheckAutoGetUpEvent()); // WD EDIT
if (_stun.IsParalyzed(uid)) if (_stun.IsParalyzed(uid))
{ {
@@ -97,7 +97,7 @@ public abstract partial class SharedStandingStateSystem : EntitySystem
private void OnStandingUpDoAfter(EntityUid uid, StandingStateComponent component, StandingUpDoAfterEvent args) private void OnStandingUpDoAfter(EntityUid uid, StandingStateComponent component, StandingUpDoAfterEvent args)
{ {
if (args.Handled) // WD EDIT if (args.Handled || _stun.IsParalyzed(uid)) // WD EDIT
{ {
component.CurrentState = StandingState.Lying; component.CurrentState = StandingState.Lying;
return; return;
@@ -236,12 +236,16 @@ public abstract partial class SharedStandingStateSystem : EntitySystem
standingState.CurrentState = StandingState.Lying; standingState.CurrentState = StandingState.Lying;
Dirty(uid, standingState); Dirty(uid, standingState);
var rotation = _transform.GetWorldRotation(uid); var rotation = _transform.GetWorldRotation(uid); // WD EDIT
_appearance.TryGetData<bool>(uid, BuckleVisuals.Buckled, out var state, appearance); // WD EDIT
if (rotation.GetDir() is Direction.East or Direction.North or Direction.NorthEast or Direction.SouthEast) if (!state) // WD EDIT
_rotation.SetHorizontalAngle(uid, Angle.FromDegrees(270)); {
else if (rotation.GetDir() is Direction.East or Direction.North or Direction.NorthEast or Direction.SouthEast)
_rotation.ResetHorizontalAngle(uid); _rotation.SetHorizontalAngle(uid, Angle.FromDegrees(270));
else
_rotation.ResetHorizontalAngle(uid);
}
RaiseLocalEvent(uid, new DownedEvent()); RaiseLocalEvent(uid, new DownedEvent());
@@ -288,6 +292,9 @@ public abstract partial class SharedStandingStateSystem : EntitySystem
// Optional component. // Optional component.
Resolve(uid, ref appearance, false); Resolve(uid, ref appearance, false);
if (TryComp(uid, out BuckleComponent? buckle) && buckle.Buckled && !_buckle.TryUnbuckle(uid, uid, buckleComp: buckle)) // WD EDIT
return false;
if (standingState.CurrentState is StandingState.Standing) if (standingState.CurrentState is StandingState.Standing)
return true; return true;

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

@@ -115,6 +115,12 @@ public abstract class SharedStunSystem : EntitySystem
if (!TryComp(uid, out StandingStateComponent? standing) || !(!standing.CanLieDown || standing.AutoGetUp)) // WD EDIT if (!TryComp(uid, out StandingStateComponent? standing) || !(!standing.CanLieDown || standing.AutoGetUp)) // WD EDIT
return; return;
if (standing.AutoGetUp) // WD EDIT
{
_standingState.TryStandUp(uid, standing);
return;
}
_standingState.Stand(uid, standing); _standingState.Stand(uid, standing);
// WD EDIT END // WD EDIT END
} }