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

Failed to cherry-pick PR #26463: Objects such as lighters/welders are now able to be dropped in disposal units. #454

Closed
SimpleStation14 opened this issue Jun 11, 2024 · 0 comments
Closed

Failed to cherry-pick PR #26463: Objects such as lighters/welders are now able to be dropped in disposal units. #454

SimpleStation14 opened this issue Jun 11, 2024 · 0 comments
Labels
Pull Request Mirror Mirrors a PR from another Repo. Automatically applied by mirror bot Status: Derelict Has not been active for a while

Comments

@SimpleStation14
Copy link
Member

Failed to cherry-pick PR: Git error: 1 uncommitted change would be overwritten by merge; class=Merge (22); code=Conflict (-13)

PR body below

Mirror of PR #26463: Objects such as lighters/welders are now able to be dropped in disposal units. from space-wizards space-wizards/space-station-14

ebddef7675269ea4c354673a888a2c8f6e418548

PR opened by Huxellberger at 2024-03-26 23:00:06 UTC - merged at 2024-03-26 23:13:58 UTC

PR changed 1 files with 2 additions and 2 deletions.

The PR had the following labels:

Original Body

About the PR

Minor code changes to ToolSystem.Welder.cs (first ever go at a change so kept it simple)

Why / Balance

Fixes #26172 and fixes #25790

Technical details

Entities with the WelderComponent were unable to interact with disposals due to the ToolsSystem always marking the AfterInteractEvent as "handled", even when nothing was actually done. I've made it so we only mark the event as handled when the ToolsSystem actually does something.

Media

welder_fix.mov
  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

🆑 Jake Huxell

  • fix: Objects such as lighters/welders are now able to be dropped in disposal units.
@SimpleStation14 SimpleStation14 added the Pull Request Mirror Mirrors a PR from another Repo. Automatically applied by mirror bot label Jun 11, 2024
@Pspritechologist Pspritechologist added the Status: Derelict Has not been active for a while label Jun 11, 2024
VMSolidus pushed a commit to VMSolidus/Einstein-Engines that referenced this issue Sep 11, 2024
@Aidenkrz @misandrie @VMSolidus
Ghost bar!!!! (Simple-Station#454)
01b035b 
* Ghost bar!!!!

* Update Content.Server/Goobstation/Ghostbar/Components/GhostBarSpawnComponent.cs

Co-authored-by: Rank #1 Jonestown partygoer <mary@thughunt.ing>

* Update Content.Server/Goobstation/Ghostbar/GhostBarSystem.cs

Co-authored-by: Rank #1 Jonestown partygoer <mary@thughunt.ing>

* Update Content.Server/Goobstation/Ghostbar/GhostBarSystem.cs

Co-authored-by: Rank #1 Jonestown partygoer <mary@thughunt.ing>

* Rule Window

* Delete on ghost + Random job selection

* Fix map

---------

Co-authored-by: Rank #1 Jonestown partygoer <mary@thughunt.ing>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
Pull Request Mirror Mirrors a PR from another Repo. Automatically applied by mirror bot Status: Derelict Has not been active for a while
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@Pspritechologist @SimpleStation14