Adds Gelli's Hognose to VG Shipyards and Adds a T0 LPC.#4145
Open
Mrrpip wants to merge 8 commits into
Open
Conversation
monolith8319
changed the title
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
# Conflicts: # Resources/Prototypes/_Mono/Entities/Objects/Devices/ship_vouchers.yml # Resources/Prototypes/_Mono/Recipes/Lathes/Factions/shipyard.yml # Resources/Prototypes/_Mono/Recipes/Lathes/Packs/Factions/viper_group.yml
# Conflicts: # Resources/Prototypes/_Mono/Recipes/Lathes/Packs/Factions/viper_group.yml
Contributor
Author
|
I think that's the conflicts removed correctly? Nothing seems to have gone awry in the changed files. |
Contributor
|
the screenshot of the shuttleyard dosent show the hognose |
Contributor
Author
|
... I think I got my screenshots mixed up. Will correct shortly. Also need to do some other things related to recent merges. |
Contributor
Author
Sorry again about that. Here's the proper image. Double checked to make sure it spawned and everything too. 
|
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
2 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.
About the PR
Why / Balance
Media
Requirements
How to test
Breaking changes
Changelog
🆑