tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Paper Default Interaction (#41547)

Browse Source 
* Fix paper default interaction

* Remove BeforeUIOpen

* Revert "Remove BeforeUIOpen"

This reverts commit c0db6c743f7cd07279b8a509317a54925a5f7d27.

* Revert "Fix paper default interaction"

This reverts commit 7efae70b96fbb5800a0e043b6deca176babe3399.

* Trigger UI before Ingestion

* Revert "Trigger UI before Ingestion"

This reverts commit a642ab40bf5b973d7e5f5b772d578dc2b9a436c1.

* Trigger ingestion after ui
This commit is contained in:
Justin Pfeifler
2025-11-23 06:59:09 -06:00
committed by GitHub
parent 871cc53082
commit fa2e4309cc
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,7 @@ using Content.Shared.Mobs.Systems;
using Content.Shared.Nutrition.Components; using Content.Shared.Nutrition.Components;
using Content.Shared.Popups; using Content.Shared.Popups;
using Content.Shared.Tools.EntitySystems; using Content.Shared.Tools.EntitySystems;
using Content.Shared.UserInterface;
using Content.Shared.Verbs; using Content.Shared.Verbs;
using Content.Shared.Whitelist; using Content.Shared.Whitelist;
using Robust.Shared.Audio.Systems; using Robust.Shared.Audio.Systems;
@@ -68,8 +69,8 @@ public sealed partial class IngestionSystem : EntitySystem
SubscribeLocalEvent<EdibleComponent, ComponentInit>(OnEdibleInit); SubscribeLocalEvent<EdibleComponent, ComponentInit>(OnEdibleInit);
// Interactions // Interactions
SubscribeLocalEvent<EdibleComponent, UseInHandEvent>(OnUseEdibleInHand, after: new[] { typeof(OpenableSystem), typeof(InventorySystem) }); SubscribeLocalEvent<EdibleComponent, UseInHandEvent>(OnUseEdibleInHand, after: [typeof(OpenableSystem), typeof(InventorySystem), typeof(ActivatableUISystem)]);
SubscribeLocalEvent<EdibleComponent, AfterInteractEvent>(OnEdibleInteract, after: new[] { typeof(ToolOpenableSystem) }); SubscribeLocalEvent<EdibleComponent, AfterInteractEvent>(OnEdibleInteract, after: [typeof(ToolOpenableSystem)]);
// Generic Eating Handlers // Generic Eating Handlers
SubscribeLocalEvent<EdibleComponent, BeforeIngestedEvent>(OnBeforeIngested); SubscribeLocalEvent<EdibleComponent, BeforeIngestedEvent>(OnBeforeIngested);