juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ingestion Bugfixes (#39436)

Browse Source 
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
This commit is contained in:
Princess Cheeseballs
2025-08-06 17:19:26 -07:00
committed by GitHub
parent 88a86be500
commit 556097eed4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs
View File

@@ -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)
{

2
Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs
View File

@@ -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)));
}