-
Notifications
You must be signed in to change notification settings - Fork 297
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
Conversation
@@ -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) |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if (foodComp.Trash.Count != 0) | |
if (foodComp.Trash.Count != 0) // DeltaV |
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 likeFoodPieBase
has the correcttrash
component. Consume still leaves the tin, but the splat function doesn't seem to spawn trash due to conditionfoodComp.Trash.Count
being compared to zero.Media
None
Requirements
Breaking changes
None
Changelog