Floofstation Release V2 #340
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
….yml Co-authored-by: FoxxoTrystan <[email protected]>
…into Nikko-Botany
A project relating to potential future ERTs and a branch of NanoTrasen dubbed the "NanoTrasen Naval Force" Acts as an ert and a current placeholder for future reworks and implementation. Currently admin spawn only.
Adds new combat boots to Sec
Co-authored-by: FoxxoTrystan <[email protected]>
Botany - Plant Additions
Combat Boots
…-patch Fix Unable to Call Shuttle
github-actions
bot
added
Status: Needs Review
|
RSI Diff Bot; head commit 99ed774 merging into 5c096e2 Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Cosmic_Revenant.rsi
Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Crystal_Thistle.rsi
Resources/Textures/DeltaV/Objects/Specific/Hydroponics/Ghost_Pepper.rsi
Resources/Textures/Floof/Clothing/Shoes/Boots/combatMagboots.rsi
Resources/Textures/Floof/Objects/Specific/Hydroponics/anomaly_berry.rsi
Resources/Textures/Floof/Objects/Specific/Hydroponics/blue_pumpkin.rsi
Resources/Textures/Floof/Objects/Specific/Hydroponics/capfruit.rsi
Resources/Textures/Floof/Objects/Specific/Hydroponics/cherry.rsi
Resources/Textures/Floof/Objects/Specific/Hydroponics/extradimensional_orange.rsi
Resources/Textures/Floof/Objects/Specific/Hydroponics/golden_apple.rsi
Resources/Textures/Floof/Objects/Specific/Hydroponics/holymelon.rsi
Resources/Textures/Floof/Objects/Specific/Hydroponics/meatwheat.rsi
Resources/Textures/Floof/Objects/Specific/Hydroponics/papercane.rsi
Resources/Textures/Floof/Objects/Specific/Hydroponics/plant_bag_holding.rsi
Resources/Textures/Floof/Objects/Specific/Hydroponics/tea_plant.rsi
Resources/Textures/Floof/Objects/Specific/Hydroponics/world_pea.rsi
Resources/Textures/_NF/Objects/Specific/Hydroponics/coffee.rsi
Resources/Textures/_NF/Objects/Specific/Hydroponics/pear.rsi
Resources/Textures/_NF/Objects/Specific/Hydroponics/spesostree.rsi
|
Memeji
approved these changes
Nov 10, 2024
|
This is missing changelog, please fix. |
|
Changelogs are not generated as the fix for those were added AFTER this PR. |
|
They can still be generated manually |
Fansana
approved these changes
Nov 11, 2024
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.
Adds the following PRs:
#338
#335
#334
#284