juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix + Carcat nerf (#1761)

Browse Source 
* fix #1758

* nerf carcat

* fix #1747
This commit is contained in:
Red
2025-09-10 15:51:16 +03:00
committed by GitHub
parent 81ce27b935
commit 8e18c5e121
7 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Shared/Nutrition/Components/EdibleComponent.cs
View File

@@ -1,4 +1,5 @@
using Content.Shared.Body.Components;
using Content.Shared._CP14.Cooking;
using Content.Shared.Body.Components;
using Content.Shared.FixedPoint;
using Content.Shared.Nutrition.EntitySystems;
using Content.Shared.Nutrition.Prototypes;
@@ -11,7 +12,7 @@ namespace Content.Shared.Nutrition.Components;
/// This is used on an entity with a solution container to flag a specific solution as being able to have its
/// reagents consumed directly.
/// </summary>
[RegisterComponent, NetworkedComponent, Access(typeof(IngestionSystem))]
[RegisterComponent, NetworkedComponent, Access(typeof(IngestionSystem), typeof(CP14SharedCookingSystem))]
public sealed partial class EdibleComponent : Component
{
/// <summary>

3
Content.Shared/Nutrition/Components/FoodComponent.cs
View File

@@ -1,4 +1,3 @@
using Content.Shared._CP14.Cooking;
using Content.Shared.Body.Components;
using Content.Shared.FixedPoint;
using Content.Shared.Nutrition.EntitySystems;
@@ -7,7 +6,7 @@ using Robust.Shared.Prototypes;
namespace Content.Shared.Nutrition.Components;
[Obsolete("Migration to Content.Shared.Nutrition.Components.EdibleComponent is required")]
[RegisterComponent, Access(typeof(FoodSystem), typeof(FoodSequenceSystem), typeof(CP14SharedCookingSystem))]
[RegisterComponent, Access(typeof(FoodSystem), typeof(FoodSequenceSystem))]
public sealed partial class FoodComponent : Component
{
[DataField]

4
Content.Shared/_CP14/Cooking/CP14SharedCookingSystem.cs
View File

@@ -119,7 +119,7 @@ public abstract partial class CP14SharedCookingSystem : EntitySystem
if (source.Comp.FoodData is null)
return false;
if (!TryComp<FoodComponent>(target, out var holderFoodComp))
if (!TryComp<EdibleComponent>(target, out var holderFoodComp))
return false;
if (!_solution.TryGetSolution(source.Owner, source.Comp.SolutionId, out var cookerSoln, out var cookerSolution))
@@ -287,7 +287,7 @@ public abstract partial class CP14SharedCookingSystem : EntitySystem
//Process entities
foreach (var contained in container.ContainedEntities)
{
if (TryComp<FoodComponent>(contained, out var food))
if (TryComp<EdibleComponent>(contained, out var food))
{
//Merge trash
newData.Trash.AddRange(food.Trash);