commit (#434)
This commit is contained in:
@@ -73,7 +73,7 @@ public abstract partial class SharedStandingStateSystem : EntitySystem
|
||||
if (!TryComp(uid, out StandingStateComponent? standing)) // WD EDIT
|
||||
return;
|
||||
|
||||
RaiseNetworkEvent(new CheckAutoGetUpEvent());
|
||||
RaiseNetworkEvent(new CheckAutoGetUpEvent()); // WD EDIT
|
||||
|
||||
if (_stun.IsParalyzed(uid))
|
||||
{
|
||||
@@ -97,7 +97,7 @@ public abstract partial class SharedStandingStateSystem : EntitySystem
|
||||
|
||||
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;
|
||||
return;
|
||||
@@ -236,12 +236,16 @@ public abstract partial class SharedStandingStateSystem : EntitySystem
|
||||
standingState.CurrentState = StandingState.Lying;
|
||||
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)
|
||||
_rotation.SetHorizontalAngle(uid, Angle.FromDegrees(270));
|
||||
else
|
||||
_rotation.ResetHorizontalAngle(uid);
|
||||
if (!state) // WD EDIT
|
||||
{
|
||||
if (rotation.GetDir() is Direction.East or Direction.North or Direction.NorthEast or Direction.SouthEast)
|
||||
_rotation.SetHorizontalAngle(uid, Angle.FromDegrees(270));
|
||||
else
|
||||
_rotation.ResetHorizontalAngle(uid);
|
||||
}
|
||||
|
||||
RaiseLocalEvent(uid, new DownedEvent());
|
||||
|
||||
@@ -288,6 +292,9 @@ public abstract partial class SharedStandingStateSystem : EntitySystem
|
||||
// Optional component.
|
||||
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)
|
||||
return true;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user