Merge remote-tracking branch 'upstream/master' into ed-06-11-2024-upstream

# Conflicts:
#	Resources/Changelog/Changelog.yml
#	Resources/Credits/GitHub.txt
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml
This commit is contained in:
Ed
2024-11-06 16:53:24 +03:00
207 changed files with 2180 additions and 1314 deletions

View File

@@ -49,12 +49,9 @@ namespace Content.Server.Nutrition.EntitySystems
{
_puddle.TrySpillAt(uid, solution, out _, false);
}
if (foodComp.Trash.Count == 0)
foreach (var trash in foodComp.Trash)
{
foreach (var trash in foodComp.Trash)
{
EntityManager.SpawnEntity(trash, Transform(uid).Coordinates);
}
EntityManager.SpawnEntity(trash, Transform(uid).Coordinates);
}
}
ActivatePayload(uid);