Ingestion Bugfixes (#39436)

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>

diff --git a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs
index cdd366ba507f5a54192b2d6879822b14b3a1872a..3ac2df6508c90c57e01c56f89a5740ad27fdc41e 100644 (file)
--- 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 ab462557d96da2ec6edd88f3e30a2c4347c2f18a..588875d5533a9210bbe1c8a8d48fe88156b9001c 100644 (file)
--- 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<OpenableComponent> ent, ref SolutionTransferAttemptEvent args)
     {
-        if (ent.Comp.Opened)
+        if (!ent.Comp.Opened)
             args.Cancel(Loc.GetString(ent.Comp.ClosedPopup, ("owner", ent.Owner)));
     }