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

[HOTFIX] Fix Burgers (#39773)

Browse Source 
* Borgar

* Review

* Predicted queuedel

* Predict

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
This commit is contained in:
Princess Cheeseballs
2025-09-06 02:18:06 -07:00
committed by Princess Cheeseballs
parent d02aa1a4e2
commit 8a1a1b98c4
5 changed files with 73 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Content.Shared/Nutrition/EntitySystems/IngestionSystem.API.cs
View File

@@ -1,4 +1,5 @@
using System.Diagnostics.CodeAnalysis;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using Content.Shared.Chemistry.Components;
using Content.Shared.Chemistry.Components.SolutionManager;
using Content.Shared.Chemistry.Reagent;
@@ -140,25 +141,35 @@ public sealed partial class IngestionSystem
#region EdibleComponent
public void SpawnTrash(Entity<EdibleComponent> entity, EntityUid user)
public void SpawnTrash(Entity<EdibleComponent> entity, EntityUid? user = null)
{
if (entity.Comp.Trash.Count == 0)
return;
var position = _transform.GetMapCoordinates(entity);
var trashes = entity.Comp.Trash;
var tryPickup = _hands.IsHolding(user, entity, out _);
var pickup = user != null && _hands.IsHolding(user.Value, entity, out _);
foreach (var trash in trashes)
{
var spawnedTrash = EntityManager.PredictedSpawn(trash, position);
// If the user is holding the item
if (tryPickup)
{
// Put the trash in the user's hand
_hands.TryPickupAnyHand(user, spawnedTrash);
}
if (!pickup)
continue;
// Put the trash in the user's hand
// I am 100% confident we don't need this check but rider gets made at me if it's not here.
if (user != null)
_hands.TryPickupAnyHand(user.Value, spawnedTrash);
}
}
public void AddTrash(Entity<EdibleComponent> entity, List<EntProtoId> newTrash)
{
foreach (var trash in newTrash)
{
entity.Comp.Trash.Add(trash);
}
}