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

Remove the Scream Action #57

Merged
merged 2 commits into from
Mar 10, 2024
Merged

Remove the Scream Action #57

merged 2 commits into from
Mar 10, 2024

Conversation

DEATHB4DEFEAT
Copy link
Member

Changelog

🆑

  • remove: I have a mouth but must not scream (removed the scream action in favor of emotes)

@DEATHB4DEFEAT DEATHB4DEFEAT added Priority: 3-Medium Needs to be resolved at some point Size: 5-Very Small For especially small issues/PRs labels Mar 10, 2024
@github-actions github-actions bot added Changes: C# Changes any cs files Changes: YML Changes any yml files labels Mar 10, 2024
@DEATHB4DEFEAT DEATHB4DEFEAT mentioned this pull request Mar 10, 2024
Open
75 tasks
Pspritechologist
Pspritechologist requested changes Mar 10, 2024
View reviewed changes
Copy link
Member

@Pspritechologist Pspritechologist left a comment •
edited
Loading

Choose a reason for hiding this comment

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

I say we comment out the line where the action is added, undo all the other changes, and maybe comment it out of the component as well. There's no need to touch this much Upstream stuff, let alone without annotation 😲

@DEATHB4DEFEAT

This comment was marked as off-topic.

Sign in to view
@github-actions github-actions bot added Status: Needs Review Someone please review this and removed Changes: YML Changes any yml files labels Mar 10, 2024
@Pspritechologist
Copy link
Member

Did you take a look at the Component refs to make sure it isn't ever added via any other shenanigans?

@DEATHB4DEFEAT
Copy link
Member Author

Did you take a look at the Component refs to make sure it isn't ever added via any other shenanigans?

Yes

@DEATHB4DEFEAT DEATHB4DEFEAT merged commit 3b9ef0a into master Mar 10, 2024
11 checks passed
@DEATHB4DEFEAT DEATHB4DEFEAT deleted the remove-screaming branch March 10, 2024 08:11
SimpleStation14 added a commit that referenced this pull request Mar 10, 2024
@SimpleStation14
Automatic Changelog Update (#57)
ff9908b
DEATHB4DEFEAT pushed a commit that referenced this pull request Jun 2, 2024
@SimpleStation14 @IamVelcroboy
Add magnet pickup system from Frontier (#57)
c1646d8 
## Mirror of PR #949: [Add magnet pickup system from
Frontier](DeltaV-Station/Delta-v#949) from <img
src="https://avatars.githubusercontent.com/u/131613340?v=4"
alt="DeltaV-Station" width="22"/>
[DeltaV-Station](https://github.com/DeltaV-Station)/[Delta-v](https://github.com/DeltaV-Station/Delta-v)

<aside>PR opened by <img
src="https://avatars.githubusercontent.com/u/107660393?v=4"
width="16"/><a href="https://github.com/IamVelcroboy"> IamVelcroboy</a>
at 2024-03-10 20:17:18 UTC</aside>
<aside>PR merged by <img
src="https://avatars.githubusercontent.com/u/107660393?v=4"
width="16"/><a href="https://github.com/IamVelcroboy"> IamVelcroboy</a>
at 2024-03-17 13:38:11 UTC</aside>
<sup>

`5acb90a4eb6b8e8436d06cffe92169d07e38d140`

</sup>

---

PR changed 0 files with 0 additions and 0 deletions.

The PR had the following labels:
- Changes: YML
- Status: Needs Review
- Changes: C#
- Changes: Localization


---

<details open="true"><summary><h1>Original Body</h1></summary>

> ## About the PR
> - Title: Machines will automatically pull in tagged items for
processing, allowing to set them up on conveyor belts.
> - Adds to Ore Processors
> - Adds to Material Reclaimer
> 
> ## Why / Balance
> Better gameplay and Factorio mapping
> 
> ## Technical details
> n/a
> 
> ## Media
>
https://github.com/DeltaV-Station/Delta-v/assets/107660393/defb8724-acaf-4897-9d5a-4edb5ba17edd
> 
>
https://github.com/DeltaV-Station/Delta-v/assets/107660393/725a74a3-3978-4097-bdf4-d84ff2f55f38
> 
> 
> 
> - [x] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
> 
> ## Breaking changes
> n/a
> 
> **Changelog**
> 🆑 Velcroboy
> - add: Added magnet pickup to Ore Processors and Material Reclaimer


</details>

Co-authored-by: Velcroboy <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Pspritechologist Pspritechologist Pspritechologist approved these changes

Assignees
No one assigned
Labels
Changes: C# Changes any cs files Priority: 3-Medium Needs to be resolved at some point Size: 5-Very Small For especially small issues/PRs Status: Needs Review Someone please review this
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@DEATHB4DEFEAT @Pspritechologist