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

Material Silo #1488

Merged
merged 10 commits into from
Jan 11, 2025
Merged

Material Silo #1488

merged 10 commits into from
Jan 11, 2025

Conversation

Spatison
Copy link
Contributor

Description

Port from Goob

Changelog

🆑 Aviu00, Spatison

  • add: Added material silo

@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: UI Changes any XAML files Changes: Map Changes any yml file in the Maps directories Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an RSI labels Jan 11, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 11, 2025 •
edited
Loading

RSI Diff Bot; head commit 5cc7891 merging into 07401aa
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Structures/Machines/material_silo.rsi

State Old New Status
inserting Added
material_silo Added

Edit: diff updated after 5cc7891

@VMSolidus
Copy link
Member

I was literally DM'ing April to ask if she had a link to the Ore Silo PR, right as you dropped this port. Holy fuck thank you lol.

@VMSolidus
Copy link
Member

I fixed the yml linter issue.

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 11, 2025
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 11, 2025
@VMSolidus
Copy link
Member

image

My god it's amazing.

VMSolidus
VMSolidus approved these changes Jan 11, 2025
View reviewed changes
Copy link
Member

@VMSolidus VMSolidus left a comment

Choose a reason for hiding this comment

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

Oh My God.

@VMSolidus
Copy link
Member

oresilobateman

@VMSolidus VMSolidus merged commit 9897094 into Simple-Station:master Jan 11, 2025
11 of 12 checks passed
SimpleStation14 added a commit that referenced this pull request Jan 11, 2025
@SimpleStation14
Automatic Changelog Update (#1488)
289a2a7
@Spatison Spatison deleted the silo branch January 11, 2025 22:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@VMSolidus VMSolidus VMSolidus approved these changes

Assignees
No one assigned
Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an RSI Changes: UI Changes any XAML files Changes: YML Changes any yml files
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Spatison @VMSolidus