Ingestion Bugfixes (#39436)
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
This commit is contained in:
parent
a378dceb96
commit
40057be6a7
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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)));
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue