Added New Drinks, Edited Filesystem #39
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
github-actions
bot
added
Changes: Localization
Floof-Station-Bot
changed the title
|
RSI Diff Bot; head commit 873f93c merging into 74af0ba Resources/Textures/Floof/Objects/Consumable/Drinks/anisettebottle.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/blueballer.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/bottleocum.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/demonseed.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/doublecreamblaster.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/emeraldswinger.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/mariejulep.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/orgasmonthebeach.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/pompassion.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/redrocket.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/semenbomb.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/semenhemorrhage.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/watermelonginjizz.rsi
Resources/Textures/Floof/Objects/Consumable/Drinks/yeolhandy.rsi
|
|
Did not made a review yet as Linter is unhappy, you should fix that. Also there no need to put changelogs or code related things, changelogs should only be "in-game"/player related changes, not code or directory, if theres changes please state it in the description, witch you did. |
|
made linter happy |
|
Also please do not use discord link for media, just paste it directly in github. |
FoxxoTrystan
requested changes
Jul 20, 2024
Resources/Textures/Floof/Objects/Consumable/Drinks/anisettebottle.rsi/meta.json
Outdated
Show resolved
Hide resolved
Resources/Textures/Floof/Objects/Consumable/Drinks/blueballer.rsi/meta.json
Outdated
Show resolved
Hide resolved
Resources/Textures/Floof/Objects/Consumable/Drinks/bottleocum.rsi/meta.json
Outdated
Show resolved
Hide resolved
Resources/Textures/Floof/Objects/Consumable/Drinks/demonseed.rsi/meta.json
Outdated
Show resolved
Hide resolved
Resources/Textures/Floof/Objects/Consumable/Drinks/doublecreamblaster.rsi/meta.json
Outdated
Show resolved
Hide resolved
Resources/Textures/Floof/Objects/Consumable/Drinks/redrocket.rsi/meta.json
Outdated
Show resolved
Hide resolved
Resources/Textures/Floof/Objects/Consumable/Drinks/semenbomb.rsi/meta.json
Outdated
Show resolved
Hide resolved
Resources/Textures/Floof/Objects/Consumable/Drinks/semenhemorrhage.rsi/meta.json
Outdated
Show resolved
Hide resolved
Resources/Textures/Floof/Objects/Consumable/Drinks/watermelonginjizz.rsi/meta.json
Outdated
Show resolved
Hide resolved
Resources/Textures/Floof/Objects/Consumable/Drinks/yeolhandy.rsi/meta.json
Outdated
Show resolved
Hide resolved
FoxxoTrystan
added
the
Status: Awaiting Changes
github-actions
bot
removed
the
Status: Awaiting Changes
FoxxoTrystan
requested changes
Jul 20, 2024
FoxxoTrystan
approved these changes
Jul 20, 2024
Fansana
approved these changes
Jul 22, 2024
Floof-Station-Bot
added a commit
that referenced
this pull request
Jul 22, 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.
Description
Added in 12 new mixed drinks, 2 new bottles to the booze'o'mat, and edited some filesystem stuff that didn't make sense to me.
The drinks are to give pomjuice and the new aphrodisiacs another purpose, and unfortuantely the bottle'o'cum is just pandering to the masses. The filesystem stuff I changed was simple enough-- there used to be Resources/Prototypes/Floof/ as well as Resources/Prototypes/Floofstation/, I simply merged these both into Resources/Prototypes/Floofstation to make things a bit cleaner.
TODO
Additions
(https://cdn.discordapp.com/attachments/1261497448019529790/1263939111392378920/image.png?ex=669c0e87&is=669abd07&hm=e4f0c8f12169961bad739a221c980645bd23540b058b8a78483337f9cbdca635&)
(https://cdn.discordapp.com/attachments/1261497448019529790/1263940347675938919/2024-07-19_15-25-20.mp4?ex=669c0fad&is=669abe2d&hm=3f6cdec1ba6ab7475a46e88f37dc480196764bdfe48f356de230736d575a4baf&)
Changelog
🆑 Tilkku