From 556097eed4ab312c2428b6c08ed7c68e8b9da971 Mon Sep 17 00:00:00 2001 From: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com> Date: Wed, 6 Aug 2025 17:19:26 -0700 Subject: [PATCH] Ingestion Bugfixes (#39436) Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> --- Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs | 6 +++--- Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs index cdd366ba50..3ac2df6508 100644 --- a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs +++ b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs @@ -249,17 +249,17 @@ public sealed partial class IngestionSystem : EntitySystem // Can we digest the specific item we're trying to eat? if (!IsDigestibleBy(args.Ingested, stomachs)) { + if (!args.Ingest) + return; + if (forceFed) - { _popup.PopupClient(Loc.GetString("ingestion-cant-digest-other", ("target", entity), ("entity", food)), entity, args.User); - } else _popup.PopupClient(Loc.GetString("ingestion-cant-digest", ("entity", food)), entity, entity); return; } - // Exit early if we're just trying to get verbs if (!args.Ingest) { diff --git a/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs b/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs index ab462557d9..588875d553 100644 --- a/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs +++ b/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs @@ -121,7 +121,7 @@ public sealed partial class OpenableSystem : EntitySystem private void OnTransferAttempt(Entity ent, ref SolutionTransferAttemptEvent args) { - if (ent.Comp.Opened) + if (!ent.Comp.Opened) args.Cancel(Loc.GetString(ent.Comp.ClosedPopup, ("owner", ent.Owner))); } -- 2.51.2