Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tilkku's-Toys #75

Merged
merged 5 commits into from
Aug 1, 2024
Merged

Tilkku's-Toys #75

merged 5 commits into from
Aug 1, 2024

Conversation

SleepyScarecrow
Copy link
Contributor

@SleepyScarecrow SleepyScarecrow commented Aug 1, 2024

Description

Added 24 New Drinks! These were sourced from the community as well as dako and I. Plenty of non-alcoholic cocktails are within.


TODO

  • Added 24 Drinks

Media

Drinks


Changelog

🆑 Tilkku

  • add: 24 New Drinks

@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Aug 1, 2024
Copy link
Contributor

github-actions bot commented Aug 1, 2024

RSI Diff Bot; head commit 2d6aebb merging into 8bc782f
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Floof/Objects/Consumable/Drinks/ablustine.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added

Resources/Textures/Floof/Objects/Consumable/Drinks/dragonsblood.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added

Resources/Textures/Floof/Objects/Consumable/Drinks/dragonsbreath.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added

Resources/Textures/Floof/Objects/Consumable/Drinks/dragonsseed.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added

Resources/Textures/Floof/Objects/Consumable/Drinks/eminence.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
icon Added
icon_empty Added

Resources/Textures/Floof/Objects/Consumable/Drinks/goldbloomspecial.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
icon Added
icon_empty Added

Resources/Textures/Floof/Objects/Consumable/Drinks/grandnavy.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
icon Added
icon_empty Added

Resources/Textures/Floof/Objects/Consumable/Drinks/hornystallion.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added

Resources/Textures/Floof/Objects/Consumable/Drinks/koboldkooler.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added

Resources/Textures/Floof/Objects/Consumable/Drinks/koboldkorkscrew.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added

Resources/Textures/Floof/Objects/Consumable/Drinks/lamplight.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
icon Added
icon_empty Added

Resources/Textures/Floof/Objects/Consumable/Drinks/lemonpopsicle.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
icon Added
icon_empty Added

Resources/Textures/Floof/Objects/Consumable/Drinks/loverskiss.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
icon Added
icon_empty Added

Resources/Textures/Floof/Objects/Consumable/Drinks/marsbar.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added

Resources/Textures/Floof/Objects/Consumable/Drinks/mossbloodshot.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
icon Added
icon_empty Added

Resources/Textures/Floof/Objects/Consumable/Drinks/opsshine.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
icon Added
icon_empty Added

Resources/Textures/Floof/Objects/Consumable/Drinks/pomtwist.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added

Resources/Textures/Floof/Objects/Consumable/Drinks/prairieoyster.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
icon Added
icon_empty Added

Resources/Textures/Floof/Objects/Consumable/Drinks/randystallion.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added

Resources/Textures/Floof/Objects/Consumable/Drinks/salvagersdelight.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
icon Added
icon_empty Added

Resources/Textures/Floof/Objects/Consumable/Drinks/silverstallion.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added

Resources/Textures/Floof/Objects/Consumable/Drinks/syndicatesoverseer.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added

Resources/Textures/Floof/Objects/Consumable/Drinks/voltage.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
icon Added
icon_empty Added

Resources/Textures/Floof/Objects/Consumable/Drinks/whiskeysour.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
icon Added
icon_empty Added

Edit: diff updated after 2d6aebb

Copy link
Collaborator

@FoxxoTrystan FoxxoTrystan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In all honest, no changes needed for ya PR for once.

Great job you and the spriter, keep it up!

- !type:ReagentThreshold
min: 1
- !type:OrganType
type: Moth # Get them moffy fucks horny
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My.... god...

Horny moff alert.

@FoxxoTrystan FoxxoTrystan added the Priority: 2-Medium Needs to be resolved at some point label Aug 1, 2024
@Fansana Fansana self-requested a review August 1, 2024 05:45
@Fansana Fansana merged commit ea5b9c1 into Fansana:master Aug 1, 2024
13 of 14 checks passed
Floof-Station-Bot added a commit that referenced this pull request Aug 1, 2024
Merrokitsune pushed a commit to Merrokitsune/Aphrodite that referenced this pull request Nov 17, 2024
This reverts commit 97506744d2686709b7817ab1a858f919fd151448.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Priority: 2-Medium Needs to be resolved at some point Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants