diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl index 14e4ed5adb..f9249a7f13 100644 --- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl @@ -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 diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl index df9e6ce78f..773368be94 100644 --- a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl +++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl @@ -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 16’s Engineering staff! diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index 9b50ed8a1e..c8c5c70d5f 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -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 diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index 0aa9341647..a24de46b55 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -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 diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index 2bf72de35e..bd55967c79 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -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 diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml index 8cc2da8623..02e992441b 100644 --- a/Resources/Prototypes/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml @@ -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: diff --git a/Resources/Textures/Objects/Consumable/Drinks/eggnogglass.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/eggnogglass.rsi/fill-1.png new file mode 100644 index 0000000000..38d1eb92aa Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/eggnogglass.rsi/fill-1.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/eggnogglass.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/eggnogglass.rsi/fill-2.png new file mode 100644 index 0000000000..d00b0091e5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/eggnogglass.rsi/fill-2.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/eggnogglass.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/eggnogglass.rsi/fill-3.png new file mode 100644 index 0000000000..cf98ba8480 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/eggnogglass.rsi/fill-3.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/eggnogglass.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/eggnogglass.rsi/fill-4.png new file mode 100644 index 0000000000..5c93fe71d2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/eggnogglass.rsi/fill-4.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/eggnogglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/eggnogglass.rsi/icon.png new file mode 100644 index 0000000000..f0ad42136b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/eggnogglass.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/eggnogglass.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/eggnogglass.rsi/icon_empty.png new file mode 100644 index 0000000000..d361c1816e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/eggnogglass.rsi/icon_empty.png differ diff --git a/Resources/Textures/Objects/Consumable/Drinks/eggnogglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/eggnogglass.rsi/meta.json new file mode 100644 index 0000000000..5b4e18246f --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/eggnogglass.rsi/meta.json @@ -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" + } + ] +}