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 f1db59257d..10d224489b 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))); }