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

delicious delicious crayons (#8021)

Browse Source 
* Edible crayons

* yeah why not
This commit is contained in:
Kara
2022-05-08 01:51:33 -07:00
committed by GitHub
parent ccae4960ad
commit 4fe648bb06
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Crayon/CrayonSystem.cs
View File

@@ -1,6 +1,7 @@
using System.Linq; using System.Linq;
using Content.Server.Administration.Logs; using Content.Server.Administration.Logs;
using Content.Server.Decals; using Content.Server.Decals;
using Content.Server.Nutrition.EntitySystems;
using Content.Server.Popups; using Content.Server.Popups;
using Content.Shared.Audio; using Content.Shared.Audio;
using Content.Shared.Crayon; using Content.Shared.Crayon;
@@ -35,7 +36,7 @@ public sealed class CrayonSystem : EntitySystem
SubscribeLocalEvent<CrayonComponent, CrayonSelectMessage>(OnCrayonBoundUI); SubscribeLocalEvent<CrayonComponent, CrayonSelectMessage>(OnCrayonBoundUI);
SubscribeLocalEvent<CrayonComponent, CrayonColorMessage>(OnCrayonBoundUIColor); SubscribeLocalEvent<CrayonComponent, CrayonColorMessage>(OnCrayonBoundUIColor);
SubscribeLocalEvent<CrayonComponent, UseInHandEvent>(OnCrayonUse); SubscribeLocalEvent<CrayonComponent, UseInHandEvent>(OnCrayonUse);
SubscribeLocalEvent<CrayonComponent, AfterInteractEvent>(OnCrayonAfterInteract); SubscribeLocalEvent<CrayonComponent, AfterInteractEvent>(OnCrayonAfterInteract, after: new []{ typeof(FoodSystem) });
SubscribeLocalEvent<CrayonComponent, DroppedEvent>(OnCrayonDropped); SubscribeLocalEvent<CrayonComponent, DroppedEvent>(OnCrayonDropped);
SubscribeLocalEvent<CrayonComponent, ComponentGetState>(OnCrayonGetState); SubscribeLocalEvent<CrayonComponent, ComponentGetState>(OnCrayonGetState);
} }

9
Resources/Prototypes/Entities/Objects/Fun/crayons.yml
View File

@@ -18,6 +18,15 @@
type: CrayonBoundUserInterface type: CrayonBoundUserInterface
- type: Crayon - type: Crayon
capacity: 5 capacity: 5
- type: Food
- type: SolutionContainerManager
solutions:
food:
reagents:
- ReagentId: Nutriment
Quantity: 3
- ReagentId: MindbreakerToxin
Quantity: 2
- type: entity - type: entity
parent: Crayon parent: Crayon