The Bartender can now make Eggnog (#34065)

* Preliminary eggnog changes (egg in shaker crashes?)

* Fixed eggnog reagent name and description

* added - to flavor

* deleted a space

* Added eggnog glass sprite

* changed fill levels to match rsi

* Added two more fill levels to eggnog

* Removed fizziness, changed physical description, and fixed rsi

---------

Co-authored-by: uhbg <29674581+uhbg@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
This commit is contained in:
uhbg
2025-04-20 17:27:35 -04:00
committed by GitHub
parent 251cfbd8be
commit 94b46a9edc
13 changed files with 83 additions and 0 deletions

View File

@@ -301,6 +301,7 @@ flavor-complex-brave-bull = like being ran over by a truck
flavor-complex-demons-blood = like the seventh circle of Hell
flavor-complex-devils-kiss = like cannibalism
flavor-complex-driest-martini = like a drunk mimic
flavor-complex-eggnog = like melted custard
flavor-complex-erika-surprise = like the bartender made a mistake
flavor-complex-gin-fizz = refreshing and lemony
flavor-complex-gildlager = like the Tzar's gold

View File

@@ -142,6 +142,9 @@ reagent-desc-doctors-delight = A gulp a day keeps the MediBot away. That's proba
reagent-name-driest-martini = driest martini
reagent-desc-driest-martini = Only for the experienced. You think you see sand floating in the glass.
reagent-name-eggnog = eggnog
reagent-desc-eggnog = Not enough egg.
reagent-name-electric-shark = electric shark
reagent-desc-electric-shark = Fun Shark fact: Selachians make up 20% of Space Station 16s Engineering staff!

View File

@@ -837,6 +837,22 @@
sprite: Objects/Consumable/Drinks/dr_gibb_glass.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkEggnog
suffix: eggnog
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: Eggnog
Quantity: 30
- type: Icon
sprite: Objects/Consumable/Drinks/eggnogglass.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkElectricSharkGlass

View File

@@ -1049,6 +1049,11 @@
flavorType: Complex
description: flavor-complex-driest-martini
- type: flavor
id: eggnog
flavorType: Complex
description: flavor-complex-eggnog
- type: flavor
id: erikasurprise
flavorType: Complex

View File

@@ -968,6 +968,21 @@
reagent: Ethanol
amount: 0.15
- type: reagent
id: Eggnog
name: reagent-name-eggnog
parent: BaseAlcohol
desc: reagent-desc-eggnog
physicalDesc: reagent-physical-desc-creamy
flavor: eggnog
color: "#e6d6bc"
metamorphicSprite:
sprite: Objects/Consumable/Drinks/eggnogglass.rsi
state: icon_empty
metamorphicMaxFillLevels: 4
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
- type: reagent
id: ElectricShark
name: reagent-name-electric-shark

View File

@@ -398,6 +398,20 @@
products:
DriestMartini: 2
- type: reaction
id: Eggnog
requiredMixerCategories:
- Shake
reactants:
Egg:
amount: 1
Milk:
amount: 4
Rum:
amount: 5
products:
Eggnog: 10
- type: reaction
id: ElectricShark
requiredMixerCategories:

Binary file not shown.

After

Width:  |  Height:  |  Size: 220 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 243 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 250 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 281 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 386 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 326 B

View File

@@ -0,0 +1,29 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Sprite by uhbg on github",
"states": [
{
"name": "icon"
},
{
"name": "icon_empty"
},
{
"name": "fill-1"
},
{
"name": "fill-2"
},
{
"name": "fill-3"
},
{
"name": "fill-4"
}
]
}