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

Delete FoodComponent, migrate prototypes to EdibleComponent (#41070)

Browse Source 
* yml

* yml fixes

* cs

* document regression

* comment

* organs fix

* diona consistency

* push

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
This commit is contained in:
āda
2025-10-24 13:32:14 -05:00
committed by GitHub
parent 9008f776ec
commit 48e2b2d263
30 changed files with 76 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,8 +34,8 @@ public sealed class CrayonSystem : SharedCrayonSystem
SubscribeLocalEvent<CrayonComponent, MapInitEvent>(OnMapInit);
SubscribeLocalEvent<CrayonComponent, CrayonSelectMessage>(OnCrayonBoundUI);
SubscribeLocalEvent<CrayonComponent, CrayonColorMessage>(OnCrayonBoundUIColor);
SubscribeLocalEvent<CrayonComponent, UseInHandEvent>(OnCrayonUse, before: new[] { typeof(FoodSystem) });
SubscribeLocalEvent<CrayonComponent, AfterInteractEvent>(OnCrayonAfterInteract, after: new[] { typeof(FoodSystem) });
SubscribeLocalEvent<CrayonComponent, UseInHandEvent>(OnCrayonUse);
SubscribeLocalEvent<CrayonComponent, AfterInteractEvent>(OnCrayonAfterInteract, after: [typeof(IngestionSystem)]);
SubscribeLocalEvent<CrayonComponent, DroppedEvent>(OnCrayonDropped);
}
@@ -47,6 +47,7 @@ public sealed class CrayonSystem : SharedCrayonSystem
Dirty(ent);
}
// Runs after IngestionSystem so it doesn't bulldoze force-feeding
private void OnCrayonAfterInteract(EntityUid uid, CrayonComponent component, AfterInteractEvent args)
{
if (args.Handled || !args.CanReach)