Revert PR #56 through #76 #104
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…th (Simple-Station#76)" This reverts commit 9617a47.
This reverts commit e20884b.
This reverts commit 9d2ae50.
This reverts commit 37df4a2.
This reverts commit 749332d.
This reverts commit ce036ed.
This reverts commit 6c4c179.
This reverts commit 6653885.
This reverts commit 56e7e8e.
This reverts commit 81bc8be.
This reverts commit cddbcba.
This reverts commit f8fd2aa.
This reverts commit f85dca9.
This reverts commit ef7681a.
This reverts commit 6249759.
This reverts commit c1646d8.
This reverts commit 5f500ea.
github-actions
bot
added
Changes: C#
|
RSI Diff Bot; head commit b6151b6 merging into 9617a47 Resources/Textures/DeltaV/Objects/Storage/lunchbox.rsi
|
|
I think the bot might be offended by this.
|
You can revert this revert PR |
DEATHB4DEFEAT
approved these changes
Apr 12, 2024
SimpleStation14
approved these changes
Apr 13, 2024
|
Oh he's fine with it |
|
🤖👍 |
Pspritechologist
added
Pull Request Mirror
VMSolidus
added a commit
to VMSolidus/Einstein-Engines
that referenced
this pull request
Apr 23, 2024
…-Station#104)" This reverts commit 648fea3.
Mnemotechnician
pushed a commit
to Mnemotechnician/Einstein-Engines
that referenced
this pull request
Sep 9, 2024
Add: Recipe for Making Cream From Milk
Mnemotechnician
pushed a commit
to Mnemotechnician/Einstein-Engines
that referenced
this pull request
Sep 9, 2024
LaryNevesPR
pushed a commit
to LaryNevesPR/Einstein-Engines
that referenced
this pull request
Sep 15, 2024
* Adds cards sprites from Paradise * Adds Cards entities * adds Card Decks They can be joined, shuffled, and cards can be picked up from them! * Make cards flippable * Make Card Decks show what's on their pile Known bugs: Decks are not updated at start Decks sprites are glitched at spawn menu * Adds Cards ftl files * Adds Cards SFX, Fixes decks sprites not starting correctly, Refactors the code Known bugs: Decks sprites are STILL glitched at spawn menu * Adds deck organization (flipping all cards to a specific direction) and fixes deck sprites appearing wrongly at spawn menu * Add CardsHandMenu, makes Cards rotatable, Refactor events * Fixes Cards not joining correctly and cards being added to stacks in a weird way Still more bugs to be fixed tho * Makes the card draw function from CardHand actually work and other things Re-adds ComponentStartup to carddecksystem, but preventing it to appear as an error Refactors namespace of Stack * Makes Card Hand sprite change dynamically * Fixes Audio and makes card hands to decks interaction better * Some fixes, FTL texts and refactors Adds ftl entries Refactors CardHandSystem importing cardstacksystem twice Fixes InteractUsing events not being handled at all * Adds option to get a specific card from hand if picked with empty hand. Prevent Stack joining with itself * Retexture Card Sprites and adds Card boxes sprites Co-Authored-By: VictorJob <[email protected]> * Adds ways to view how many cards are there in stacks * Fixes card names not appearing properly at card hand menu * Add Convert from hand to deck cards button * Muda o nome do conjunto Preto para Conjunto mão do povo * Add a way to fill storages ONLY when someone interacts with them * Change convertToDeck verb icon * Change convertToDeck verb icon * Rework of how Card Hand/Deck Sprite layers work so it allows multilayered cards * Adds a way to split decks in half * Adds CardBox to vending machines * Fix OpenTriggeredStorageFillSystem not removing itself at the end * Fixes sound collection * removes white space from texture names I guess this fixes the issue...? --------- Co-authored-by: VictorJob <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
There was a miscommunication, and I bungled the repository during the last round of merges. The Mirror Bot is not quite finished yet, and some polishing needs to happen behind the scenes before we can actually start doing this. Also new policies from the discord are pending regarding how these PRs need to be handled. I'll need to either reopen or remake the reverted PRs, since we do actually still need them. But we need PRs mirrored from Wizards' Den in order to go through the list properly.