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

Port EE fix to disposal chutes #2198

Closed
wants to merge 5 commits into from

Conversation

Lyndomen
Copy link
Contributor

About the PR

Disposal chutes shoot at orientation 0 no matter where they are pointing at now on the grid as i detailed in space-wizards/space-station-14#31459

I would love to PR this upstream but AGPL :trollface:

ported from Fansana/floofstation1#220

This PR fixes an issue with disposal pipes that lead into space. The ejection would use the transform of the map instead of the one from the grid and throw into the wrong direction.
Another issue this fixes is with disposal bends which would take direction from a previous pipe instead of the current one.

Why / Balance

Important for #1582 and any ship with a disposal cannon

Technical details

tiny 2 line change C#

Media

image

Requirements

  • I have tested all added content and changes.
  • I have added media to this PR or it does not require an ingame showcase.

Breaking changes

no
Changelog

🆑

  • fix: Disposal chutes on a shuttle will now shoot out in the appropriate direction

@Lyndomen Lyndomen requested a review from a team as a code owner November 15, 2024 04:19
@github-actions github-actions bot added S: Needs Review Changes: C# Changes any cs files and removed S: Needs Review labels Nov 15, 2024
@@ -136,9 +136,9 @@ public void ExitDisposals(EntityUid uid, DisposalHolderComponent? holder = null,
{
_xformSystem.AttachToGridOrMap(entity, xform);

if (holder.PreviousDirection != Direction.Invalid && _xformQuery.TryGetComponent(xform.ParentUid, out var parentXform))
if (holder.PreviousDirection != Direction.Invalid && _xformQuery.TryGetComponent(uid, out var parentXform)) // start DeltaV EE Disposal fix
Copy link
Member

Choose a reason for hiding this comment

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

just leave it how it was

Copy link
Contributor Author

Choose a reason for hiding this comment

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

the item shot just dissapears if i dont do this change or the one prev committed

Copy link
Member

Choose a reason for hiding this comment

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

the pipe's WorldRotation and the parent (grid) Should be the exact same, are you sure they are different

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 not sure of anything but when I changed it to only edit on line 141, no edit on 139, the objects sit in one place then eventually disappear

@Lyndomen
Copy link
Contributor Author

Closed, being resolved upstream

@Lyndomen Lyndomen closed this Nov 26, 2024
@Lyndomen Lyndomen deleted the garbagecannon branch November 26, 2024 15:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files S: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants