Flowers, Tea, And Clothes #701
Closed
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
github-actions
bot
added
Changes: Localization
|
RSI Diff Bot; head commit a121ddc merging into 13aea27 Resources/Textures/Clothing/Uniforms/Costume/azaleadress.rsi
Resources/Textures/Clothing/Uniforms/Costume/azaleadressblue.rsi
Resources/Textures/Clothing/Uniforms/Costume/azaleadressred.rsi
Resources/Textures/Clothing/Uniforms/Costume/azaleadresswhite.rsi
Resources/Textures/Objects/Consumable/Drinks/electrickettle.rsi
Resources/Textures/Objects/Consumable/Drinks/kettle.rsi
Resources/Textures/Objects/Specific/Hydroponics/Flowers/azalea.rsi
Resources/Textures/Objects/Specific/Hydroponics/Flowers/azaleablue.rsi
Resources/Textures/Objects/Specific/Hydroponics/Flowers/azaleared.rsi
Resources/Textures/Objects/Specific/Hydroponics/Flowers/azaleawhite.rsi
|
|
40 commits |
Not a problem. Every PR gets squashed into one commit when merging. I'd personally prefer to see all commits so we can examine changes in depth. |
DangerRevolution
suggested changes
Aug 8, 2024
|
|
||
| - type: entity | ||
| parent: ClothingHandsArmWarmers | ||
| id: ClothingHandsArmWarmersValid |
There was a problem hiding this comment.
no to the item in general or just id:valid
Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
Outdated
Show resolved
Hide resolved
VMSolidus
requested changes
Aug 9, 2024
github-actions
bot
added
Changes: Audio
|
if you care to review this draft still do not pay attention to the c#, only reason I committed it was so a friend could see (i was too lazy to make a patch) |
|
had the realisation that oh god dammit I can't acutally base this off microwaves and I have to write it all from scratch :blunt: |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
SleepyScarecrow
force-pushed
the
Tilkku's-Toys
branch
from
a121ddc
to
88451f1
Compare
github-actions
bot
removed
Changes: YML
|
gonna redo this shit |
This pull request was closed.
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
This adds in a few different things. Most minor is some clothing -- a couple dresses, and some arm warmers to match your favourite pair of coder socks. Flowers are next up-- decorational (for now) plants that I'm going to use for the third thing- tea! I'm going to set up a system for brewing teas, available via a kettle for bartenders, where you shove in the flowers and some water, heat it up, and bam, tea. This tea may be just pure rp, or potentially I'll make it give some effects.
Don't merge this yet, I'm setting it here for drafting sake.
TODO
Media
None yet, I'll fill this out once it's all said and done.
Changelog
🆑 Tilkku