From 5b1564823373fcd089db0e9b4da32eaa4f74832e Mon Sep 17 00:00:00 2001 From: Plutonic rain <170477754+Pluteno@users.noreply.github.com> Date: Tue, 9 Jul 2024 14:55:54 +0300 Subject: [PATCH] Timefall porter beer w/ fixed paths --- .../starshine/flavors/flavor-profiles.ftl | 1 + .../meta/consumable/drink/alcohol.ftl | 2 ++ .../objects/consumable/drinks/drinks_cans.ftl | 2 ++ .../VendingMachines/Inventories/boozeomat.yml | 1 + .../Objects/Consumable/Drinks/drinks_cans.yml | 18 ++++++++++++++++++ .../Prototypes/Starshine/Flavors/flavors.yml | 5 +++++ .../Reagents/Consumable/Drink/alcohol.yml | 16 ++++++++++++++++ .../Drinks/timefallporter_can.rsi/icon.png | Bin 0 -> 4756 bytes .../timefallporter_can.rsi/icon_open.png | Bin 0 -> 917 bytes .../Drinks/timefallporter_can.rsi/meta.json | 17 +++++++++++++++++ 10 files changed, 62 insertions(+) create mode 100644 Resources/Locale/ru-RU/starshine/reagents/meta/consumable/drink/alcohol.ftl create mode 100644 Resources/Locale/ru-RU/starshine/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_cans.ftl create mode 100644 Resources/Prototypes/Starshine/Entities/Objects/Consumable/Drinks/drinks_cans.yml create mode 100644 Resources/Prototypes/Starshine/Reagents/Consumable/Drink/alcohol.yml create mode 100644 Resources/Textures/Starshine/Objects/Consumable/Drinks/timefallporter_can.rsi/icon.png create mode 100644 Resources/Textures/Starshine/Objects/Consumable/Drinks/timefallporter_can.rsi/icon_open.png create mode 100644 Resources/Textures/Starshine/Objects/Consumable/Drinks/timefallporter_can.rsi/meta.json diff --git a/Resources/Locale/ru-RU/starshine/flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/starshine/flavors/flavor-profiles.ftl index 370fc3e39b01bc..9eea2eb8b5ef2a 100644 --- a/Resources/Locale/ru-RU/starshine/flavors/flavor-profiles.ftl +++ b/Resources/Locale/ru-RU/starshine/flavors/flavor-profiles.ftl @@ -1,3 +1,4 @@ ## Generic flavors. flavor-buzz = как бззз +flavor-complex-timefallPorter = как ускоряющий время дождь \ No newline at end of file diff --git a/Resources/Locale/ru-RU/starshine/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/ru-RU/starshine/reagents/meta/consumable/drink/alcohol.ftl new file mode 100644 index 00000000000000..2a07d592bdf889 --- /dev/null +++ b/Resources/Locale/ru-RU/starshine/reagents/meta/consumable/drink/alcohol.ftl @@ -0,0 +1,2 @@ +reagent-name-timefallPorter = темпоральный портер +reagent-desc-timefallPorter = Натуральный вкус природных садов с добавлением темпоральных осадков и крови МУЛов. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/starshine/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_cans.ftl b/Resources/Locale/ru-RU/starshine/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_cans.ftl new file mode 100644 index 00000000000000..12028f71e8d6be --- /dev/null +++ b/Resources/Locale/ru-RU/starshine/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_cans.ftl @@ -0,0 +1,2 @@ +ent-DrinkTimefalllPorterBeerCan = банка темпорального портера + .desc = Натуральный вкус природных садов с добавлением темпоральных осадков и крови МУЛов. \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml index 6cd80fcc498861..f16294568d469e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml @@ -55,6 +55,7 @@ DrinkJuiceWatermelonCarton: 3 DrinkJuiceWehCarton: 1 DrinkJuiceMoffCarton: 1 + DrinkTimefalllPorterBeerCan: 4 # Starshine-end emaggedInventory: DrinkPoisonWinebottleFull: 2 diff --git a/Resources/Prototypes/Starshine/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Starshine/Entities/Objects/Consumable/Drinks/drinks_cans.yml new file mode 100644 index 00000000000000..0346b4fab71844 --- /dev/null +++ b/Resources/Prototypes/Starshine/Entities/Objects/Consumable/Drinks/drinks_cans.yml @@ -0,0 +1,18 @@ +- type: entity + parent: DrinkCanBaseFull + id: DrinkTimefalllPorterBeerCan + name: timefall porter can + description: A true taste of natural gardens, with the addition of timefall precipitation and the blood of MULEs. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: TimefallBeer + Quantity: 30 + - type: Drink + - type: Sprite + sprite: Starshine/Objects/Consumable/Drinks/timefallporter_can.rsi + - type: Item + sprite: Starshine/Objects/Consumable/Drinks/timefallporter_can.rsi \ No newline at end of file diff --git a/Resources/Prototypes/Starshine/Flavors/flavors.yml b/Resources/Prototypes/Starshine/Flavors/flavors.yml index 05f4f19efa9aba..943c706d309814 100644 --- a/Resources/Prototypes/Starshine/Flavors/flavors.yml +++ b/Resources/Prototypes/Starshine/Flavors/flavors.yml @@ -2,3 +2,8 @@ id: buzz flavorType: Base description: flavor-buzz + +- type: flavor + id: timefallPorter + flavorType: Complex + description: flavor-complex-timefallPorter \ No newline at end of file diff --git a/Resources/Prototypes/Starshine/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Starshine/Reagents/Consumable/Drink/alcohol.yml new file mode 100644 index 00000000000000..0afaea40bfeac8 --- /dev/null +++ b/Resources/Prototypes/Starshine/Reagents/Consumable/Drink/alcohol.yml @@ -0,0 +1,16 @@ +- type: reagent + id: TimefallBeer + name: reagent-name-timefallPorter + parent: BaseAlcohol + desc: reagent-desc-timefallPorter + physicalDesc: reagent-physical-desc-bubbly + flavor: timefallPorter + color: "#c8cc61" + recognizable: true + metamorphicSprite: + sprite: Objects/Consumable/Drinks/beerglass.rsi + state: icon_empty + metamorphicMaxFillLevels: 6 + metamorphicFillBaseName: fill- + metamorphicChangeColor: true + fizziness: 0.6 \ No newline at end of file diff --git a/Resources/Textures/Starshine/Objects/Consumable/Drinks/timefallporter_can.rsi/icon.png b/Resources/Textures/Starshine/Objects/Consumable/Drinks/timefallporter_can.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a5d50c34b485a90b0575acace993c602d28bdf52 GIT binary patch literal 4756 zcmeHLYj6|S6<)_+6Jw|;G{`&`8Hfm7X?L~ON*fDsEMpsx5w_w7LyA|sSMq}OK)bdi zPXnaJ1`Oe0COjO1Lm^Pwfq~&sUNv@QhXBP)36O$$8R8@z%&TDv1qXUpey5q~FfIRl zN2}d??m6E*=R4=z(Q3IRJ!L@DuqXsU2Bf8$GT>4h$j@q}pLiJ|TSGh~??){;< z>cOy2$0m9&o}adSF(q6WlutdnwnKI7T4MT`6BmMsG1H>Yt)KVsdG5@mi;t{QRV{gR zx6V7R@^JO_C9QFz27fpqYv??69dGh};F@25{=k;(oJ0Q7EB%9>gBN#xVcbxDXLoG! z_$&GaOF-7}#V6O*j7%g}d|nqz1XrKl+$S<{^h?u|@aw+Zp=15pHxMMOR7gs)q$MSF z!~>(){Qg>FYH*68?8c6H$!`tJiWzju@=42Ym8(80Pu^>}61AJzIOl1kd054ep((Wo zZ{9p-yI5PFn;n^*7}FZIpvaRUt^N6l=~0;N`0c|>A6GwazW4T&eCx(}Mag0B?q6w5 z7;hK*$ti z2c(8)bz`zBhTIZwrIn~tTfZp0+)OtlFYUV}mLzutZpG}&X~{cMl6%Us+_5ZJ{`*agu>xD4JZIks4Bu;i5^>~q?s+9 z7BU46!RZNEL9%;jN`k$MtRB9}E1__@I|9u+aeHWY#2!+HT4pn2a&v{Udub-4Qr@58 z-JHNPp+}Nt0cj^`%s|<+7)8a~Fc$Ct(*csQ(Ykm$U~S!?(p;j%x;P+1L2$JIaY((^ z9*tta%1t;qO8js5nT96565-n*)C8@@{B$fhJ zvO@#d1A>cp`^2s#tKbBg5-amb&;+fcX+Kjl45Wj{8)*2MoTa_ zH4)b`csG4FFW3YBOz0JdL5kFX_}7bNDlVWkI4I9!qZ`06`|`0FF_+8h#kpH(ELZb+Z4K;ppcd} z89bTcL9gjN>D&2|&(v2q+RN+}?f{{CH+d<3d+F+>>!lcYDdpbk>ZR+Y7^pO&75-N+H_eo2%?WaOioVcmJpZG1;fG@;`I@Jft#7zH_T!VLJ1s8wu~%U7V~B}97*28`Xuv_Zx>ZE zNNmEBO{pJIQ!2t+R?gLqU?!fffg^AC;kAjgr!8wbd+h!L)q}lY+~u%eZdW}&n^~Xd zxEkT>6MeN>EUgW$|EMW4WmI^0aQqbm@=d>yw>2u;`SSaUg==E_jy2r;euF0ZMpb;x zzcyzKkRNal`cSBh@CW<~{b$1zIhz*MVz+OzW%~nA@?AxLy}{5_kacO1YU?{+sunNp zGkS9HZPmvmnQJ~+r(Hei@&kxBEX>4Tx04R}tkv&MmKp2MKrfNkh4ptBm$xxl_q9Tr^ibb$c+6t{Ym|Xe?O&XFE z7e~Rh;NZ_<)xpJCR|i)?5c~mgc5qU3krKa43N2#1e3JS*_Gq>z@3D!MwJT<~prW#Ib|~k`N)IhB7L!5TRWo#YBqEV;=qy$DbsZOs+B* zITlcb3d!+<|H1FxnuX~pHz^ncx?gPjV;l(V0?oQ@e;?a+^91le16NwxUu^($pQP8@ zTKEVU*aj}H+nT%wT=sk6XTCIA2c24YJ`L;%D9v;a=F<_CX>@2HM@dakSAh-}0004ONkl(x$6PA#pC=MB+Sq0EkJA^)~VaDo5eCD)=p=2wC5_s$PG3YwnriOz-*FiF5 ziy}0HX~sYe2PE;qgJoEP>oj9(6W}MOlxsphBUMp;5dlCtGYRioC+QR@tx6{l7oCA| zo{yctsMH>QP8`-Utq@9p8V*RW4gg3Ewj(R))up}yAqx3Q;C4E}&BfxMYtga;<-g-X rz7ovY)-V6r=@l;BRty@AMkB}<%#3-`1m(ba00000NkvXXu0mjfm+6|@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Starshine/Objects/Consumable/Drinks/timefallporter_can.rsi/meta.json b/Resources/Textures/Starshine/Objects/Consumable/Drinks/timefallporter_can.rsi/meta.json new file mode 100644 index 00000000000000..66658bb861af41 --- /dev/null +++ b/Resources/Textures/Starshine/Objects/Consumable/Drinks/timefallporter_can.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Modified version of Github #DrMelon, resprited by Pluteno, referenced on beer from Death Stranding", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_open" + } + ] +}