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.

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

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

Closed

Conversation

reesque
Copy link
Contributor

@reesque reesque commented Oct 26, 2024

About the PR

#1843 Changed a flag check that prevent trash from being generated from pie thrown

Why / Balance

I believe it is a typo

Technical details

Checked the Pie.yml file, it looks like FoodPieBase has the correct trash component. Consume still leaves the tin, but the splat function doesn't seem to spawn trash due to condition foodComp.Trash.Count being compared to zero.

Media

None

Requirements

Breaking changes

None

Changelog

  • fix: pie not dropping tin on thrown

@reesque reesque requested a review from a team as a code owner October 26, 2024 16:36
@@ -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 👍

@@ -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.

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

@reesque reesque closed this Oct 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants