From 94b46a9edc12ca51a5eb112eb0488bb0910df49f Mon Sep 17 00:00:00 2001 From: uhbg Date: Sun, 20 Apr 2025 17:27:35 -0400 Subject: [PATCH] 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> --- .../Locale/en-US/flavors/flavor-profiles.ftl | 1 + .../meta/consumable/drink/alcohol.ftl | 3 ++ .../Objects/Consumable/Drinks/drinks.yml | 16 ++++++++++ Resources/Prototypes/Flavors/flavors.yml | 5 +++ .../Reagents/Consumable/Drink/alcohol.yml | 15 +++++++++ .../Prototypes/Recipes/Reactions/drinks.yml | 14 +++++++++ .../Drinks/eggnogglass.rsi/fill-1.png | Bin 0 -> 220 bytes .../Drinks/eggnogglass.rsi/fill-2.png | Bin 0 -> 243 bytes .../Drinks/eggnogglass.rsi/fill-3.png | Bin 0 -> 250 bytes .../Drinks/eggnogglass.rsi/fill-4.png | Bin 0 -> 281 bytes .../Drinks/eggnogglass.rsi/icon.png | Bin 0 -> 386 bytes .../Drinks/eggnogglass.rsi/icon_empty.png | Bin 0 -> 326 bytes .../Drinks/eggnogglass.rsi/meta.json | 29 ++++++++++++++++++ 13 files changed, 83 insertions(+) create mode 100644 Resources/Textures/Objects/Consumable/Drinks/eggnogglass.rsi/fill-1.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/eggnogglass.rsi/fill-2.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/eggnogglass.rsi/fill-3.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/eggnogglass.rsi/fill-4.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/eggnogglass.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/eggnogglass.rsi/icon_empty.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/eggnogglass.rsi/meta.json 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 0000000000000000000000000000000000000000..38d1eb92aa75c52ced556d874ff912614a3027b4 GIT binary patch literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}(>z@qLn2y} z6C_v{Cy4Yk1sZU<9n_FuW#*AMdGX7eY0v6Q3^ljD?s-4&?Z5K}4jlOK<6|vb?Prrk zXVMm4DdL;w$pZrK=NTqgbgA(izT+_#kF2761}Ujspu-uYGr8#hPRWI_e7rN^ar|- N!PC{xWt~$(695;vP&5Dl literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d00b0091e5a092e3064ea0dd6056883a3714b3a6 GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ydu{YLn2y} z6C_v{Cy4Yk1sZU<9b{m3D>Aj)z4WL2O#P*0b9FYKxYUwosoJLyb@+7q?SGp$Z4z4g z?RmdE&m^yXE;G-%tYOYz?I=6&{Jeap*_W%YpI<3wSj%vc&!VnG{$ks!*~ldwhs$#8RR%`Zn_xAOLryfsU+{G*b1R*7hB{sGm n0SZb2nJ4rj-4AL=>||hABB&iJc5<6M(BTZ8u6{1-oD!M9$=&Twqd>>a7^HAQ=a4 zhb_!=yA}HTPHEB_k2Vdhy!X)hn_rPx5v6&OiI(-P`OrpME@9@rZ#92t@B{ qxaBB*1PX$fo3ytF8gRMkF)*xf(2iO!psNUUKZB>MpUXO@geCwr9AAzA literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5c93fe71d2f109c600a2e0bfe7a664625d5d4bb9 GIT binary patch literal 281 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}mpxq^Ln2y} z6C_v{Cy4YkF|zeM$=Xwxc(FcZUz?*$WZJ}~oOg>14L#XFKv6S%(plxm!@JXW|4$Zv z{zx!A0SF#ExU78AM=eO!A=hD2cHvJs*$G0T%yLXF)(Ha0a^${E%&T;%)l=cn?;wtZE9=ltSZAgXYS@p%6`Zd@2D zkb8Ge*Q#lg-!$C#ah)9-;e)4w4N_{ zL04ROa!LXa?D%rCA;o>dk{<`oUjP5KLO)^Z<41z&AQ_8~F_To>6MS2~u(<3Nng9MG zqh_Gt14V}^%zSrh{>FEH6u8*t_5Y4*$wLzpr-nu#m^*iJhI3`bj}`A3q8Jy+e)##> zeGzZ%*I$-jWgWB~wlMd}-*w-z@I5P2ryhGmN8pnMdZ#!}h8+=gS;8=BQNrtIp)6M? zL@5fsWneE2bc<{^Yb(!>e;m^6-;CNox3_&;y~z`Nw>A6 efPv+}$e?Lcv1(%ke>5;q89ZJ6T-G@yGywq0MX2il literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d361c1816e76141ea57afb637ea8bfcc10d4368a GIT binary patch literal 326 zcmV-M0lEH(P)Px$07*naR9J=Wmaz(hFcd|v%_2A!2fsk*+z%*p>e6o(>>m^gg1dvG2vP{?l#)us zyqAa+azGRl&CLlU4~RtmnX2hk)%0q&!EMh}4z`!i@~otslzHb4utwtAQOZdPk$(Hn zXMHJi=YN@44cHJOO|*%s=~a;d=EYqGQfetDRks6*%--IObQ8`70HAIM9PhWqc8&>B z0020>9@J051kmf=b_3qma2Ci0fUp*v0_fRmLRw%M0K!>d2UxSPc>o}c1+M@hEO-R~ z{4IC~uvwsN$xZ<-WuA27a=VWOZv()u1?qw19AGO8qDW*{ YK8bvW6U=4z!2kdN07*qoM6N<$f-tCr2><{9 literal 0 HcmV?d00001 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" + } + ] +}