From cee179d0787543f3493d3450153847184ff296ea Mon Sep 17 00:00:00 2001 From: Plasmaguy Date: Thu, 27 Jan 2022 02:33:27 -0500 Subject: [PATCH] Root beer, ice cream, and root beer floats (#6334) --- .../Catalog/ReagentDispensers/beverage.yml | 1 + .../VendingMachines/Inventories/cola.yml | 1 + .../Entities/Objects/Consumable/drinks.yml | 54 ++++++++++++++++++ .../Objects/Consumable/drinks_cans.yml | 18 ++++++ .../Reagents/Consumable/Drink/soda.yml | 27 +++++++++ .../Prototypes/Recipes/Reactions/drinks.yml | 22 +++++++ .../Drinks/icecreamglass.rsi/icon.png | Bin 0 -> 291 bytes .../Drinks/icecreamglass.rsi/meta.json | 1 + .../Consumable/Drinks/rootbeer.rsi/icon.png | Bin 0 -> 396 bytes .../Drinks/rootbeer.rsi/icon_open.png | Bin 0 -> 408 bytes .../Drinks/rootbeer.rsi/inhand-left.png | Bin 0 -> 399 bytes .../Drinks/rootbeer.rsi/inhand-right.png | Bin 0 -> 420 bytes .../Consumable/Drinks/rootbeer.rsi/meta.json | 25 ++++++++ .../Drinks/rootbeerfloatglass.rsi/icon.png | Bin 0 -> 486 bytes .../Drinks/rootbeerfloatglass.rsi/meta.json | 1 + .../Drinks/rootbeerglass.rsi/icon.png | Bin 0 -> 462 bytes .../Drinks/rootbeerglass.rsi/meta.json | 1 + 17 files changed, 151 insertions(+) create mode 100644 Resources/Textures/Objects/Consumable/Drinks/icecreamglass.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/icecreamglass.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/icon_open.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Drinks/rootbeerfloatglass.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/rootbeerfloatglass.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Drinks/rootbeerglass.rsi/icon.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/rootbeerglass.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml b/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml index f2189ce079..99aa6df942 100644 --- a/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml +++ b/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml @@ -12,6 +12,7 @@ - Cola - SpaceMountainWind - DrGibb + - RootBeer - SpaceUp - TonicWater - SodaWater diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml index 303b4e9277..8457b4216f 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml @@ -7,6 +7,7 @@ DrinkColaCan: 10 DrinkEnergyDrinkCan: 10 DrinkGrapeCan: 10 + DrinkRootBeerCan: 10 DrinkIcedTeaCan: 10 DrinkLemonLimeCan: 10 DrinkSpaceMountainWindCan: 10 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml index fb69720392..7726c186df 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml @@ -972,6 +972,24 @@ - type: Sprite sprite: Objects/Consumable/Drinks/iceglass.rsi +- type: entity + parent: DrinkGlassBase + id: DrinkIceCreamGlass + name: ice cream glass + description: A glass full of good old ice cream. Might want a spoon. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: IceCream + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/icecreamglass.rsi + state: icon + - type: entity parent: DrinkGlassBase id: DrinkIrishCarBomb @@ -1446,6 +1464,42 @@ - type: Sprite sprite: Objects/Consumable/Drinks/rewriter.rsi +- type: entity + parent: DrinkGlassBase + id: DrinkRootBeerGlass + name: root beer glass + description: Fizzy, foamy, and full of sweet, non-caffienated goodness. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: RootBeer + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/rootbeerglass.rsi + state: icon + +- type: entity + parent: DrinkGlassBase + id: DrinkRootBeerFloatGlass + name: root beer float glass + description: Fizzy, foamy, and now with ice cream on top! Amazing! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + reagents: + - ReagentId: RootBeerFloat + Quantity: 50 + - type: Drink + - type: Sprite + sprite: Objects/Consumable/Drinks/rootbeerfloatglass.rsi + state: icon + - type: entity parent: DrinkGlassBase id: DrinkRumGlass diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml index ff2463c52c..3dc1b19f24 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml @@ -114,6 +114,24 @@ - type: Item sprite: Objects/Consumable/Drinks/purple_can.rsi +- type: entity + parent: DrinkCanBaseFull + id: DrinkRootBeerCan + name: root beer can + description: Some of that tasty root beer goodness, now in a portable can! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: RootBeer + Quantity: 30 + - type: Sprite + sprite: Objects/Consumable/Drinks/rootbeer.rsi + - type: Item + sprite: Objects/Consumable/Drinks/rootbeer.rsi + - type: entity parent: DrinkGlassBase id: DrinkSodaWaterCan diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml index 4b97e26413..b1fe917bec 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml @@ -38,6 +38,15 @@ physicalDesc: fizzy color: "#ae94a6" +- type: reagent + id: IceCream + name: ice cream + parent: BaseSoda + desc: It was either this or the microwave, and nobody wants ice cream soup! + physicalDesc: creamy + color: "#fffbd6" + spritePath: icecreamglass.rsi + - type: reagent id: LemonLime name: lemon-lime @@ -55,6 +64,24 @@ physicalDesc: fizzy color: "#9385bf" +- type: reagent + id: RootBeer + name: root beer + parent: BaseSoda + desc: A very sweet, carbonated drink reminiscent of sarsparilla. Goes well with ice cream. + physicalDesc: fizzy + color: "#381c07" + spritePath: rootbeerglass.rsi + +- type: reagent + id: RootBeerFloat + name: root beer float + parent: BaseSoda + desc: Root beer, but now with ice cream on top. It truly is the magnum opus of Canadian summertime drinks. + physicalDesc: fizzy and creamy + color: "#4f361f" + spritePath: rootbeerfloatglass.rsi + - type: reagent id: SpaceMountainWind name: Space Mountain Wind diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml index e3a61c1d8d..762891d65a 100644 --- a/Resources/Prototypes/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml @@ -244,6 +244,18 @@ products: Grog: 2 +- type: reaction + id: IceCream + reactants: + Cream: + amount: 1 + Ice: + amount: 1 + Sugar: + amount: 1 + products: + IceCream: 3 + - type: reaction id: IcedCoffee reactants: @@ -440,6 +452,16 @@ products: Rewriter: 2 +- type: reaction + id: RootBeerFloat + reactants: + RootBeer: + amount: 2 + IceCream: + amount: 1 + products: + RootBeerFloat: 3 + - type: reaction id: ScrewdriverCocktail reactants: diff --git a/Resources/Textures/Objects/Consumable/Drinks/icecreamglass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/icecreamglass.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..313ba432ef366de3c0edbf5303ef8dea3fa8a94a GIT binary patch literal 291 zcmV+;0o?wHP)Px#+et)0R9Hu2WEfz;IKcKZj5=U61V%$(=!U@mzwiEo$`D3oA+RUV`NWnlWQD-a z%U8jcV*_qll5j^6;|P)+P_g~Q|8^HXoMu<<`NYuSX+gBPL@R{ZIN%NdIRuv@NcBB9 z4G|Mh=xRnCfGrxx34XGpVAKKVS(4n~rzi?w(ExJ{DTNPmt|BWNA{zk8lH^)WaR|Ud zVL%)J@;Q0|MUF$riUN@3I;t9A`>)@-&7i5I3T9uqeS@Tmh@vPcU9%4(1iC|Px$MoC0LR9Hu2WEfz;IKcKZj5=U61V%$(Xof&kX2*Z@@?+Wb3bH&yvL=w_v0;u3 z`r7I!Zg6l6VYqd556R|{qyc2PnXxj1y0RR@;#K>>4uJ7N4kE`9Bs-v|F@xda)td}A z?>=HUb@ndY0U-Xg{+T3)0!a?AH&psBZIQ+Ras)B}IVeA;nt}D(6^5(#Uyx)bNs2)Z zC~=f$SpMA|qYnFaYAVC+cfaZ5fGbZvfE{rE^%pSx>eCM}O&14L^etz2ckd#@qn*w&dwml#{n(}C@BL#=8;qq!n_W01dRRW!#6OK q)FK$BpDYJZvoA5~fYA^b4FLc?LDwOK&hUW%0000@0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/icon_open.png new file mode 100644 index 0000000000000000000000000000000000000000..df8cfabd4975fa94597ed90043fd52652da4050a GIT binary patch literal 408 zcmV;J0cZY+P)Px$P)S5VR9Hu2WEfz;IKcKZj5=U61V%$(Xof&kX2*Zz^25wn8O$w62_@M>Bx?X! z9vkM!ps%eCwsh5|-C%lJ|4fEkSND)?9!VNNmVEnPaPd1GJ5Tf*@0+8Kt)J=_Vhbth(=P--iEu#Ez^DT}RQcg$0Nt}8$YxMsWF*ecAjZc5E(a(n13>1HR1(6x z4sryH{pQ0rFq70G7^a^r2T-#wG3tQP5Eu;s0G=t@A!0{qQ2+n{07*qoM6N<$f&c)> CvZPM{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..60f5f88404ce8e2aed3b95e7540202fc6bf587d4 GIT binary patch literal 399 zcmV;A0dW3_P)Px$M@d9MRCr$PnxPHCP#A>UEkL4C2!gI;feHcxumMZ}8!!L_(FKsz1c5>$VT+R2 zq)Gkzns9lCL|l%$?|A0Vv&27n;=ez0045;u1U!Mn0q~!oC*TPro`5HiH~@YHJONK2 z@dVHbthUEyQx-Gr(LxE5SsnYqYd`Orjt>#o{!tF_SF;9K9sX2XkH$l?DhU) zx)Kit3sg54z18=IqH1sg$o4z4fr7s$AWR?_rZEkgLuuovsy!+WK&>&_uL+*%N9LY5xmKPi;pdVc?N@70)s`Dj)Ujfz<|KuLt+o7u&SJKo%qK8 z^^HmM=1pP}SNt45vGOk?LxRII76Yc4+zrze+!&N6STgoFJY#yG-5_{?BgL;lw()4y z{WYsL9W7b2{$b6H4b{Jrq$aOkF(cMAbH$3we`V*b@6Yg;7dW=qaq}F$+ZS&CQaly> zML@P<=RGNXwlk+^?$G<#oYE-HyyWikV_l3B;VhIO%@UeT>XH zE80-w5 Lu6{1-oD!M@P)Px$ph-kQR9Hu2WEfz;IKcKZj5=U61V%$(Xof(^sy+W*H6_7C$nNXU8DMO8U2T#* zM6!mgMce*QjkaK5`1b-*hA~ON*`@2BG4zDFkYpxFib3`jY&`tG(antE#O(_hh3NjL z{~0b3pXA4-|b_?!2I_Hh65^gePHPHwj#+)k`#k%EZTJBe}|_w1MAm2 z3=H4CKperv1EwmD{buO&qPYW({_pa!WcdI3Jj375Pf$Xk;kG#Kqo8=x(f=LZIt;e* zqF~Fp*_ar<{`v=IyUshp(ClVLQmB%o7-UJwmZSgMJrNFo1p&w*rc)2lJ_Jg(9{b@AuJRuvU-DTrZYL%KKs z6aqaydSC}2CqR&E=;8oSNq8dL8O8T>jRH_Xbg{q%BLUJa1WL9X`+p?E0iz6{n*++W z9s7T`-i6`m`#Px$h)G02R9Hu2WEfz;IKcKZj5=U61V%$(Xof(^sy+X)l^;D}E+l)1WDQx1w*3!v zFk)cD(8_k#?ZX^Fh(G-@bWNpcv_HTCP|7xHWqF=^1s{1 zih+fR2}5uB)?@!Wy{$+xlO)9;2NZ2O^1s7Vn}PN91&k1=xWLZP=|yt~9R1(rW6ALU z^?8QBpP!&OqT#kU?W3T0)6xGO-Z~6_?;ikL&de(VcS!3!Nrq-OGm=7;B*h>LOST;S z-|nfyU@I?%;(Km3Mh4TV2WTGxC0mdE@9?x>a981C`1%XAIB=MKkoFG9+i>WAzmE=s zwSpu(1VFwAIfgC{$X$Q%f3L4TgPnpnMlPU>13)3rX+dT%-(fNx zvLVP;P)^`tXUC|LNv#P%W|3SHQoAEF>VVM@81N7P046GxAr(tEUjP6A07*qoM6N<$ Eg6>ktBme*a literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/rootbeerglass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/rootbeerglass.rsi/meta.json new file mode 100644 index 0000000000..48aca722d6 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Drinks/rootbeerglass.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "(Edited by jrjr3000) https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]} \ No newline at end of file