Simple-Station / Einstein-Engines

A Space Station 14 upstream repository, inspired by Baystation12.
https://einstein.simplestation.org
GNU Affero General Public License v3.0
24 stars 49 forks source link

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

Closed SimpleStation14 closed 2 weeks ago

SimpleStation14 commented 2 weeks ago

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 > > > https://github.com/space-wizards/space-station-14/assets/15147863/ca782c20-d2e3-4907-988e-2b3954981934 > > - [X] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase > > ## Breaking changes > > > **Changelog** > > > :cl: Jake Huxell > - fix: Objects such as lighters/welders are now able to be dropped in disposal units. > > >