From 5a58fee893169bf3c5cd34a1c20df3672444035d Mon Sep 17 00:00:00 2001 From: Kip Date: Mon, 10 Feb 2025 18:28:19 +1100 Subject: [PATCH 1/3] yea --- .../_Impstation/flavors/flavor-profiles.ftl | 2 + .../reagents/meta/consumable/drink/drinks.ftl | 5 ++- .../Objects/Consumable/Drinks/drinks.yml | 16 ++++++++ .../_Impstation/Flavors/flavors.yml | 5 +++ .../Reagents/Consumable/Drink/drinks.yml | 27 +++++++++++++- .../_Impstation/Recipes/Reactions/drinks.yml | 12 ++++++ .../Drinks/orangecoffee.rsi/fill-1.png | Bin 0 -> 116 bytes .../Drinks/orangecoffee.rsi/fill-2.png | Bin 0 -> 175 bytes .../Drinks/orangecoffee.rsi/fill-3.png | Bin 0 -> 230 bytes .../Drinks/orangecoffee.rsi/fill-4.png | Bin 0 -> 258 bytes .../Drinks/orangecoffee.rsi/fill-5.png | Bin 0 -> 283 bytes .../Drinks/orangecoffee.rsi/fill-6.png | Bin 0 -> 333 bytes .../Drinks/orangecoffee.rsi/icon.png | Bin 0 -> 364 bytes .../Drinks/orangecoffee.rsi/icon_empty.png | Bin 0 -> 280 bytes .../Drinks/orangecoffee.rsi/meta.json | 35 ++++++++++++++++++ 15 files changed, 100 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/fill-1.png create mode 100644 Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/fill-2.png create mode 100644 Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/fill-3.png create mode 100644 Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/fill-4.png create mode 100644 Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/fill-5.png create mode 100644 Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/fill-6.png create mode 100644 Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/icon.png create mode 100644 Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/icon_empty.png create mode 100644 Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/meta.json diff --git a/Resources/Locale/en-US/_Impstation/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_Impstation/flavors/flavor-profiles.ftl index d731eeee04cb..285d05325d0a 100644 --- a/Resources/Locale/en-US/_Impstation/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/_Impstation/flavors/flavor-profiles.ftl @@ -28,3 +28,5 @@ flavor-complex-secticket = like rotten eggs flavor-complex-medium = like your vision expanded flavor-complex-rodent = like rodents + +flavor-complex-orangecoffee = excitingly acidic \ No newline at end of file diff --git a/Resources/Locale/en-US/_Impstation/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/_Impstation/reagents/meta/consumable/drink/drinks.ftl index 36ebcb4ceeb2..f6b99944b2ac 100644 --- a/Resources/Locale/en-US/_Impstation/reagents/meta/consumable/drink/drinks.ftl +++ b/Resources/Locale/en-US/_Impstation/reagents/meta/consumable/drink/drinks.ftl @@ -5,4 +5,7 @@ reagent-name-horsepussy = the horsepussy reagent-desc-horsepussy = Two-thirds apple martini Crystal Lite™, one-third methadone. They are going to drink this after me when I die. reagent-name-raktaccino = raktaccino -reagent-desc-raktaccino = Piping hot, achingly bitter, and absolutely delicious. \ No newline at end of file +reagent-desc-raktaccino = Piping hot, achingly bitter, and absolutely delicious. + +reagent-name-orangecoffee = orange coffee +reagent-desc-orangecoffee = Slide me a drink, Barfriend. \ No newline at end of file diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Consumable/Drinks/drinks.yml index 45501b159add..7bb658c5a54a 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Consumable/Drinks/drinks.yml @@ -431,3 +431,19 @@ - type: Icon sprite: _Impstation/Objects/Consumable/Drinks/lovepotion.rsi state: icon + +- type: entity + parent: DrinkGlass + id: DrinkOrangeCoffeeGlass + suffix: orange coffee + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: OrangeCoffee + Quantity: 30 + - type: Icon + sprite: _Impstation/Objects/Consumable/Drinks/orangecoffee.rsi + state: icon diff --git a/Resources/Prototypes/_Impstation/Flavors/flavors.yml b/Resources/Prototypes/_Impstation/Flavors/flavors.yml index 56d0ea1f0c42..6a4f430b9c79 100644 --- a/Resources/Prototypes/_Impstation/Flavors/flavors.yml +++ b/Resources/Prototypes/_Impstation/Flavors/flavors.yml @@ -122,3 +122,8 @@ id: lovepotion flavorType: Complex description: flavor-complex-lovepotion + +- type: flavor + id: orangecoffee + flavorType: Complex + description: flavor-complex-orangecoffee diff --git a/Resources/Prototypes/_Impstation/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/_Impstation/Reagents/Consumable/Drink/drinks.yml index 16fa2f8d499d..4f852966cb6d 100644 --- a/Resources/Prototypes/_Impstation/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/_Impstation/Reagents/Consumable/Drink/drinks.yml @@ -44,4 +44,29 @@ - !type:AdjustReagent reagent: Theobromine amount: 0.1 - fizziness: 0.1 \ No newline at end of file + fizziness: 0.1 + +- type: reagent + id: OrangeCoffee + name: reagent-name-orangecoffee + parent: BaseDrink + desc: reagent-desc-orangecoffee + physicalDesc: reagent-physical-desc-citric + flavor: orangecoffee + color: "#f8af41" + metamorphicSprite: + sprite: _Impstation/Objects/Consumable/Drinks/orangecoffee.rsi + state: icon_empty + metamorphicMaxFillLevels: 6 + metamorphicFillBaseName: fill- + metamorphicChangeColor: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:GenericStatusEffect + key: Drowsiness + time: 2.0 + type: Remove + fizziness: 0.1 diff --git a/Resources/Prototypes/_Impstation/Recipes/Reactions/drinks.yml b/Resources/Prototypes/_Impstation/Recipes/Reactions/drinks.yml index 2a781bbba6be..ecc067cb8335 100644 --- a/Resources/Prototypes/_Impstation/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/_Impstation/Recipes/Reactions/drinks.yml @@ -403,3 +403,15 @@ amount: 1 products: LovePotion: 4 + +- type: reaction + id: OrangeCoffee + requiredMixerCategories: + - Shake + reactants: + JuiceOrange: + amount: 1 + Coffee: + amount: 1 + products: + OrangeCoffee: 2 diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/fill-1.png b/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..f1149277511c92d46623b1f7545972575ae8dbe6 GIT binary patch literal 116 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}dY&$hArY-_ z&u!#nP!M1__KH2l_y?nz?y*YFEZho~Ap8(X! N;OXk;vd$@?2>?o(Cqw`M literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/fill-2.png b/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/fill-2.png new file mode 100644 index 0000000000000000000000000000000000000000..4da9f3db3804fb3852ec8f4475c9c3e4244fe8d0 GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}nVv3=ArY-_ z&lz$x81S%OxPM{gl)igQ%s-s6ZT)`Yf!f?`Src}RMNNO$8+jD}GrIu67en)+HLH%6 zy|3N2_j}*9TTBd^OJ$Ph$Z001x}(2i2(h$6;FI)am W@pkpnT^vA589ZJ6T-G@yGywq9j6p^K literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/fill-3.png b/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/fill-3.png new file mode 100644 index 0000000000000000000000000000000000000000..1787d0692e4bc0cbb1e0f0434de3e88778af0c45 GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}3p`yMLn2z= zUa;k3QWRi)U~X_#XRG-`w(6&E_cVTAu)$a*L_y5MY2nF9rn6@J6q5S)>@0(q=F%xa z_HNbsZ31S3ku!hVyqg}Bu-4V(bJm_SeF0FXpn1~Y0L0rj{f7BTdxTVx}=mB zGCY{cko-`NB_novP?f^}PYGade+Rmi!PC{xWt~$(69BO7SkM3f literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/fill-4.png b/Resources/Textures/_Impstation/Objects/Consumable/Drinks/orangecoffee.rsi/fill-4.png new file mode 100644 index 0000000000000000000000000000000000000000..86198caf29ef46cbcb4cf58c2faadf5b22fb8d8c GIT binary patch literal 258 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}dpunnLn2z= zPPFAZY{1hxU)5i2M|A!p=`W`&UEe)i82wSC;}u`0QyW_jm##={!iV+uE*mFEv?WR$ z>n~g@UVJXO$1wM_=XY0@GkeZIuk=%7;W=E8yVBb>FEqx*?M0 z%N$(HMX&AXPx#)k#D_R9J=WlR;|3Fc3wbG+qhg?s^m5AXm;Qd=D+M3j%||Q*{w55lIUXY3ODi z2m~7G|M`r-Fbu;m{u$R(oKiYY({w1MoSkz3Gk~fhBDE}zPx$2T4RhR9J=Wlrd_=Fc3w*G_HiL6oK4Cb(%fiUT06?d#KpXmN6JSQHs?#Vw1qi zc+*4=492qb|DRz5R4SFqe@E@zI8D)@Y;19{fPnZ{l!}A#&JC7->tRp09@O) zZ%;Fj#7_VQ;Feyg?TDV4K}1C+ni2zo2rH#}07$|hD(`}R^hZe_V;oZIUea_?;dS=G5EDqQv<9Gw>y1oEkB`2aSbuL~~f#NA>n#LtF zeZEFSPALUr44yg#A}mILTWV$&L+;0ozp(2f(psNHSjw%nhB0O+y@+<>y}yJIKGO5> f*i|Z(O68tU%L0C?IRoPx$CP_p=R9J=Wm9a|1KoEw%WDhxV!A6l-i-nz~jSt`>*!T{5&7q}@m5T2m_y+d? zf?O$B1T5_Blc2%PTCJ|j2|E!Gj=45|YBt#@&HeZxSFIVep6Z3XmOe=t5H3Q)A`8)^U{;`yZ z2)+WhxXtO#pwjOn?D}@=vGvRUp!XEit;*bDX37*toY;E9GgON!GUm~Zr}h8;{Y%x@WSXFK z)Mk>?f~4P_``67Xn*9IY&*GZ@bDy7hi18$=;F+Wp z?vI_qOex|nJFZ+ Date: Mon, 10 Feb 2025 21:41:29 +1100 Subject: [PATCH 2/3] whitespace --- .../en-US/_Impstation/reagents/meta/consumable/drink/drinks.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/_Impstation/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/_Impstation/reagents/meta/consumable/drink/drinks.ftl index f6b99944b2ac..9bfb74b116f9 100644 --- a/Resources/Locale/en-US/_Impstation/reagents/meta/consumable/drink/drinks.ftl +++ b/Resources/Locale/en-US/_Impstation/reagents/meta/consumable/drink/drinks.ftl @@ -8,4 +8,4 @@ reagent-name-raktaccino = raktaccino reagent-desc-raktaccino = Piping hot, achingly bitter, and absolutely delicious. reagent-name-orangecoffee = orange coffee -reagent-desc-orangecoffee = Slide me a drink, Barfriend. \ No newline at end of file +reagent-desc-orangecoffee = Slide me a drink, Barfriend. From ed257a43229bb25681d1d5926804e99f65218871 Mon Sep 17 00:00:00 2001 From: Dark Date: Mon, 10 Feb 2025 21:13:08 +0000 Subject: [PATCH 3/3] newline --- Resources/Locale/en-US/_Impstation/flavors/flavor-profiles.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/_Impstation/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_Impstation/flavors/flavor-profiles.ftl index 285d05325d0a..5c0bf101ea79 100644 --- a/Resources/Locale/en-US/_Impstation/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/_Impstation/flavors/flavor-profiles.ftl @@ -29,4 +29,4 @@ flavor-complex-medium = like your vision expanded flavor-complex-rodent = like rodents -flavor-complex-orangecoffee = excitingly acidic \ No newline at end of file +flavor-complex-orangecoffee = excitingly acidic