Skip to content

Commit

Permalink
WD EDIT
Browse files Browse the repository at this point in the history
  • Loading branch information
Spatison committed Aug 28, 2024
1 parent 70bcfaf commit 9aaf90f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion Content.Server/Body/Systems/RespiratorSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,14 @@ private void OnUnpaused(Entity<RespiratorComponent> ent, ref EntityUnpausedEvent
ent.Comp.NextUpdate += args.PausedTime;
}

public bool CanBreathe(EntityUid uid) // WD EDIT
// WD EDIT START
public bool CanBreathe(EntityUid uid)
{
if (TryComp<PullableComponent>(uid, out var pullable) && pullable.GrabStage == GrabStage.Suffocate)
return false;
return true;
}
// WD EDIT END

public override void Update(float frameTime)
{
Expand Down
2 changes: 1 addition & 1 deletion Content.Shared/Administration/AdminFrozenSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ private void OnStartup(EntityUid uid, AdminFrozenComponent component, ComponentS
{
if (TryComp<PullableComponent>(uid, out var pullable))
{
_pulling.TryStopPull(uid, pullable, ignoreGrab: true);
_pulling.TryStopPull(uid, pullable, ignoreGrab: true); // WD EDIT
}

UpdateCanMove(uid, component, args);
Expand Down
2 changes: 1 addition & 1 deletion Content.Shared/Hands/HandEvents.cs
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ public VirtualItemThrownEvent(EntityUid blockingEntity, EntityUid user, EntityUi
Direction = direction;
}
}
// WD EDIT END

/// <summary>
/// Raised directed on both the blocking entity and user when
Expand All @@ -198,6 +197,7 @@ public VirtualItemDropAttemptEvent(EntityUid blockingEntity, EntityUid user, Ent
Throw = thrown;
}
}
// WD EDIT END

/// <summary>
/// Raised when putting an entity into a hand slot
Expand Down

0 comments on commit 9aaf90f

Please sign in to comment.