From 9aaf90f03630d7f1680f820e914b6baa40f5c233 Mon Sep 17 00:00:00 2001 From: Spatison <137375981+Spatison@users.noreply.github.com> Date: Wed, 28 Aug 2024 13:41:46 +0300 Subject: [PATCH] WD EDIT --- Content.Server/Body/Systems/RespiratorSystem.cs | 4 +++- Content.Shared/Administration/AdminFrozenSystem.cs | 2 +- Content.Shared/Hands/HandEvents.cs | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs index c1138a4719..786638a7b4 100644 --- a/Content.Server/Body/Systems/RespiratorSystem.cs +++ b/Content.Server/Body/Systems/RespiratorSystem.cs @@ -52,12 +52,14 @@ private void OnUnpaused(Entity 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(uid, out var pullable) && pullable.GrabStage == GrabStage.Suffocate) return false; return true; } + // WD EDIT END public override void Update(float frameTime) { diff --git a/Content.Shared/Administration/AdminFrozenSystem.cs b/Content.Shared/Administration/AdminFrozenSystem.cs index 30d11ecae9..f853934888 100644 --- a/Content.Shared/Administration/AdminFrozenSystem.cs +++ b/Content.Shared/Administration/AdminFrozenSystem.cs @@ -44,7 +44,7 @@ private void OnStartup(EntityUid uid, AdminFrozenComponent component, ComponentS { if (TryComp(uid, out var pullable)) { - _pulling.TryStopPull(uid, pullable, ignoreGrab: true); + _pulling.TryStopPull(uid, pullable, ignoreGrab: true); // WD EDIT } UpdateCanMove(uid, component, args); diff --git a/Content.Shared/Hands/HandEvents.cs b/Content.Shared/Hands/HandEvents.cs index dc99ca2afc..7ae389fb61 100644 --- a/Content.Shared/Hands/HandEvents.cs +++ b/Content.Shared/Hands/HandEvents.cs @@ -177,7 +177,6 @@ public VirtualItemThrownEvent(EntityUid blockingEntity, EntityUid user, EntityUi Direction = direction; } } - // WD EDIT END /// /// Raised directed on both the blocking entity and user when @@ -198,6 +197,7 @@ public VirtualItemDropAttemptEvent(EntityUid blockingEntity, EntityUid user, Ent Throw = thrown; } } + // WD EDIT END /// /// Raised when putting an entity into a hand slot