Skip to content
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

Jump to bottom

Fixed pies don't drop Pie Tins after being Thrown #2048

Closed
wants to merge 1 commit into from
Closed

Fixed pies don't drop Pie Tins after being Thrown #2048

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ protected override void SplattedCreamPie(EntityUid uid, CreamPieComponent creamP
{
_puddle.TrySpillAt(uid, solution, out _, false);
}
if (foodComp.Trash.Count == 0)
if (foodComp.Trash.Count != 0)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ideally should be upstreamed and then cherry-picked here, but otherwise needs a DeltaV comment.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the process of cherry-picking like here? I can submit a PR on upstream, and do the cherry-picking part here.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make the PR upstream, then cherry pick that the commit into a new branch of your DeltaV fork and make a new PR from it labeled Early merge "(original PR title)" (#1234). Make sure to also link it somewhere in the description.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm on it 👍

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (foodComp.Trash.Count != 0)
if (foodComp.Trash.Count != 0) // DeltaV

{
foreach (var trash in foodComp.Trash)
{
Expand Down
Loading