Ninrubssy Shi research tree (DRAFT DO NOT MERGE)#1209
Draft
HungryCuban wants to merge 26 commits intoSector-Crescent:masterfrom
Draft
Ninrubssy Shi research tree (DRAFT DO NOT MERGE)#1209HungryCuban wants to merge 26 commits intoSector-Crescent:masterfrom
HungryCuban wants to merge 26 commits intoSector-Crescent:masterfrom
Conversation
# Conflicts: # Resources/Prototypes/_Crescent/Entities/Industry/Research/imperial.yml
# Conflicts: # Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Recipes/Lathes/security.yml # Resources/Prototypes/_Crescent/Entities/Materials/organ.yml # Resources/Prototypes/_Crescent/Entities/Materials/scrap.yml # Resources/Prototypes/_Crescent/Entities/Objects/Devices/flatpack.yml # Resources/Prototypes/_Crescent/Entities/Recipes/Lathes/ammo.yml # Resources/Prototypes/_Crescent/Entities/Recipes/Lathes/communardcrafts.yml # Resources/Prototypes/_Crescent/Entities/Recipes/Lathes/cyberdawn.yml # Resources/Prototypes/_Crescent/Entities/Recipes/Lathes/imperialcrafts.yml # Resources/Prototypes/_Crescent/Entities/Recipes/Lathes/shinohara.yml # Resources/Prototypes/_Crescent/Entities/Structures/lathe.yml # Resources/Prototypes/_Crescent/Research/communard.yml # Resources/Prototypes/_Crescent/Research/cyberdawn.yml # Resources/Prototypes/_Crescent/Research/imperial.yml # Resources/Prototypes/_Crescent/Research/shinohara.yml # Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml
github-actions
bot
added
Changes: C#
Author
|
I actually will probally make a push request to ninrub branch so is all in one PR MMMMMMMMM |
|
you can set PR as a draft... |
Author
i like to see what errors pops ups |
Collaborator
|
you're highkirk fucked post upstream merge btw i have no idea what youre gonna do now |
Author
Highkey bro, i have to do this shit from the ground up now, not fun |
Author
want me to close this btw |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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
this is WIP, check recipes and notice anything missing for feedback
TODO
Media
Soon
Changelog
🆑