Skip to content

Fix trash cleanup deleting bottles, vials, medipens, etc. that still contain reagents. #883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BramvanZijp wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix trash cleanup deleting bottles, vials, medipens, etc. that still contain reagents. #883

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6bb96dd
Fix trash cleanup deleting bottles, vials, medipens, etc. that still …
BramvanZijp Apr 22, 2026
3f3c500
Slight changes as requested by Marty
BramvanZijp Apr 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Content.Server/Nutrition/EntitySystems/TrashOnSolutionEmptySystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
using Content.Shared.Chemistry.EntitySystems;
using Content.Shared.Tag;
using Robust.Shared.Prototypes;
using Content.Server.Shuttles.Components;

namespace Content.Server.Nutrition.EntitySystems
{
Expand Down Expand Up @@ -59,10 +60,17 @@ public void UpdateTags(Entity<TrashOnSolutionEmptyComponent> entity, Solution so
if (solution.Volume <= 0)
{
_tagSystem.AddTag(entity.Owner, TrashTag);

EnsureComp<SpaceGarbageComponent>(entity.Owner); // Omu - Add the SpaceGarbage component when the container is empty.

return;
}

_tagSystem.RemoveTag(entity.Owner, TrashTag);

if (HasComp<SpaceGarbageComponent>(entity.Owner)) // Omu - Remove the SpaceGarbage component when the container has a reagent, preventing deletion of chem bottles, etc.
RemComp<SpaceGarbageComponent>(entity.Owner); // Omu

}
}
}
Loading