diff --git a/Content.Server/Crayon/CrayonSystem.cs b/Content.Server/Crayon/CrayonSystem.cs index e680a21574..0d3bed6133 100644 --- a/Content.Server/Crayon/CrayonSystem.cs +++ b/Content.Server/Crayon/CrayonSystem.cs @@ -1,6 +1,7 @@ using System.Linq; using Content.Server.Administration.Logs; using Content.Server.Decals; +using Content.Server.Nutrition.EntitySystems; using Content.Server.Popups; using Content.Shared.Audio; using Content.Shared.Crayon; @@ -35,7 +36,7 @@ public sealed class CrayonSystem : EntitySystem SubscribeLocalEvent(OnCrayonBoundUI); SubscribeLocalEvent(OnCrayonBoundUIColor); SubscribeLocalEvent(OnCrayonUse); - SubscribeLocalEvent(OnCrayonAfterInteract); + SubscribeLocalEvent(OnCrayonAfterInteract, after: new []{ typeof(FoodSystem) }); SubscribeLocalEvent(OnCrayonDropped); SubscribeLocalEvent(OnCrayonGetState); } diff --git a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml index fd39c9fe31..8dad5bfdb1 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml @@ -18,6 +18,15 @@ type: CrayonBoundUserInterface - type: Crayon capacity: 5 + - type: Food + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: MindbreakerToxin + Quantity: 2 - type: entity parent: Crayon