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

Undo warp-strings #103

Conversation

SimpleStation14
Copy link
Member

@SimpleStation14 SimpleStation14 commented Apr 10, 2024

Mirror of PR #1013: Undo warp-strings from DeltaV-Station DeltaV-Station/Delta-v

f3048043658cde7a69c831b3c5342d516ed55449

PR opened by IamVelcroboy at 2024-03-27 16:28:25 UTC
PR merged by web-flow at 2024-03-27 16:40:16 UTC


PR changed 2 files with 34 additions and 34 deletions.

The PR had the following labels:

  • Changes: YML
  • Changes: Localization

Original Body

About the PR

Moves warp point location out of local strings

Why / Balance

Code not properly set up to read it. I will leave the local file in so, in the future we can adjust to use it. But I am too busy and will not have time to do that any time soon. But this change is holding up map merges. So, this is the next best.

* prevent funny meta

* Totally didn't forget about drinks

* damn chocolate bar

* big but less and more or something

* while im here fix the empty orange carton

Apparently people don't want empty orange cartons???

* juicebox + more random stuff

* fix that
Copy link
Contributor

github-actions bot commented Apr 10, 2024

RSI Diff Bot; head commit 8d0acfc merging into 923eb1c
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxapple.rsi

State Old New Status
icon Added
icon_open Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxchocolate.rsi

State Old New Status
icon Added
icon_open Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxgrape.rsi

State Old New Status
icon Added
icon_open Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxorange.rsi

State Old New Status
icon Added
icon_open Added

Resources/Textures/DeltaV/Objects/Consumable/Drinks/juiceboxpineapple.rsi

State Old New Status
icon Added
icon_open Added

Edit: diff updated after 8d0acfc

@Pspritechologist Pspritechologist added the Pull Request Mirror Mirrors a PR from another Repo. Automatically applied by mirror bot label Apr 10, 2024
@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Apr 14, 2024
Copy link
Contributor

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

@SimpleStation14 SimpleStation14 marked this pull request as draft May 4, 2024 21:14
@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label May 5, 2024
@VMSolidus VMSolidus marked this pull request as ready for review May 11, 2024 02:50
@github-actions github-actions bot added Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels May 11, 2024
@VMSolidus VMSolidus merged commit be0115b into Simple-Station:master May 11, 2024
12 checks passed
Mnemotechnician pushed a commit to Mnemotechnician/Einstein-Engines that referenced this pull request Sep 9, 2024
…-for-a-hug

Content.Integration Works Again
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Pull Request Mirror Mirrors a PR from another Repo. Automatically applied by mirror bot
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants