SilverCore research for the silver golem #94
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
Don't do that.
|
RSI Diff Bot; head commit d3dd2cf merging into 6e72475 Resources/Textures/Nyanotrasen/Mobs/Golem/cult.rsi
Resources/Textures/Nyanotrasen/Mobs/Golem/silver.rsi
Resources/Textures/Nyanotrasen/Mobs/Golem/wood.rsi
Resources/Textures/Nyanotrasen/Objects/Devices/QSI.rsi
|
github-actions
bot
added
Changes: Sprites
Changes: YML
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Signed-off-by: Fluffiest Floofers <[email protected]>
|
> "no golem"
|
DEATHB4DEFEAT
previously requested changes
Oct 3, 2023
Resources/Prototypes/Entities/Objects/Specific/Research/silvercore.yml
Outdated
Show resolved
Hide resolved
Resources/Textures/Nyanotrasen/Objects/Devices/QSI.rsi/icon.png
Outdated
Show resolved
Hide resolved
Resources/Textures/Nyanotrasen/Objects/Devices/QSI.rsi/meta.json
Outdated
Show resolved
Hide resolved
Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: Fluffiest Floofers <[email protected]>
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Signed-off-by: Fluffiest Floofers <[email protected]>
|
@DEATHB4DEFEAT Please re-review and change it if applicable |
|
Considering it seems to work fine, and I dont see why we should keep this waiting any longer, I'll just merge it without waiting for death to re-review :clueless: |
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.
About the PR
Silver Golem not included.
Neither are the rest of the research items related to this one like QSI and HandTeleporter.
Includes all the golem sprites tho
Why / Balance
Technical details
Media
Breaking changes
Changelog