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

Double Ice Cream, a new drink for bartenders to serve #1579

Closed
wants to merge 14 commits into from

Conversation

dge21
Copy link
Contributor

@dge21 dge21 commented Aug 4, 2024

About the PR

Added a new non alchoholic drink

Why / Balance

its something I already used to mix, but people don't really pay attention to the "tastes like" messages, and this means the drink is more official looking and doesn't rely on me prompting them to pay attention to the taste like message

Technical details

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

probably not
Changelog

🆑

  • add: added a sweet new drink for the bar to serve

@github-actions github-actions bot added Changes: YML Changes any yml files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi labels Aug 4, 2024
Copy link
Contributor

github-actions bot commented Aug 4, 2024

RSI Diff Bot; head commit 6469426 merging into 9232e32
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Consumable/Drinks/doubleicecreamglass.rsi

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

description: flavor-complex-paint-thinner

- type: flavor
Copy link
Member

Choose a reason for hiding this comment

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

put this in deltav prototypes and indent properly

@@ -2344,3 +2344,19 @@
- type: Icon
sprite: Objects/Consumable/Drinks/bloodglass.rsi
state: icon

- type: entity
Copy link
Member

Choose a reason for hiding this comment

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

deltav prototypes

@@ -52,3 +52,5 @@ reagent-desc-fourteen-loko = A highly processed liquid substance barely-passing
reagent-name-shamblers-juice = Shambler's Juice
reagent-desc-shamblers-juice = ~Shake me up some of that Shambler's Juice!~

reagent-name-double-ice-cream = Double Ice Cream
Copy link
Member

Choose a reason for hiding this comment

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

deltav locale

@@ -254,6 +254,7 @@ flavor-complex-themartinez = like violets and lemon vodka
flavor-complex-cogchamp = like brass
flavor-complex-white-gilgamesh = like lightly carbonated cream
flavor-complex-antifreeze = warm
flavor-complex-double-ice-cream = like ice cream, twice
Copy link
Member

Choose a reason for hiding this comment

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

deltav locale

@@ -252,3 +252,19 @@
physicalDesc: reagent-physical-desc-fizzy
flavor: metallic
color: "#66538F"

- type: reagent
Copy link
Member

Choose a reason for hiding this comment

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

deltav prototypes

@@ -1117,3 +1117,15 @@
amount: 1
products:
Cola: 4

- type: reaction
Copy link
Member

Choose a reason for hiding this comment

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

deltav prototypes

flavor: doubleicecream
color: "#a06f42"
metamorphicSprite:
sprite: Objects/Consumable/Drinks/doubleicecreamglass.rsi
Copy link
Member

Choose a reason for hiding this comment

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

move it to deltav textures and update here

@dge21
Copy link
Contributor Author

dge21 commented Aug 4, 2024

got it, gonna do all that in a new pr because i don't know git well enough to edit one

@dge21 dge21 closed this Aug 4, 2024
@deltanedas
Copy link
Member

you just push to the same branch you dont have to recreate it

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants