From cbac5ec8d290134d3e00a57537a45aeb7cd89b38 Mon Sep 17 00:00:00 2001 From: Sh1ntra Date: Mon, 3 Jun 2024 23:15:28 +0300 Subject: [PATCH 01/43] Add pork ramen --- .../Cooking/JapanFood/meal_recipes.yml | 13 +++++++++ .../Consumable/Food/JapanFood/ramen.yml | 26 ++++++++++++++++++ .../Food/JapanFood/ramen.rsi/meta.json | 14 ++++++++++ .../Food/JapanFood/ramen.rsi/ramen.png | Bin 0 -> 839 bytes 4 files changed, 53 insertions(+) create mode 100644 Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/ramen.yml create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/JapanFood/ramen.rsi/meta.json create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/JapanFood/ramen.rsi/ramen.png diff --git a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml new file mode 100644 index 00000000000..55f8e91e3f2 --- /dev/null +++ b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml @@ -0,0 +1,13 @@ +- type: microwaveMealRecipe + id: Recipeporkramen + name: pork ramen recipe + result: porkramennoodles + time: 15 + solids: + FoodMeatCutlet: 3 + FoodBowlBig: 1 + FoodGarlic: 1 + FoodNoodlesBoiled: 1 + reagents: + Water: 15 + Egg: 6 \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/ramen.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/ramen.yml new file mode 100644 index 00000000000..e81de79bba4 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/ramen.yml @@ -0,0 +1,26 @@ +- type: entity + name: Pork Ramen + parent: FoodBowlBase + id: porkramennoodles + description: Оу, я вижу вы человек Высокой культуры... + components: + - type: Item + - type: Food + - type: Sprite + sprite: Corvax/Objects/Consumable/Food/JapanFood/ramen.rsi + state: ramen + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Protein + Quantity: 3 + - ReagentId: Flavorol + Quantity: 5 + - type: Tag + tags: + - Meat + - Soup diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/JapanFood/ramen.rsi/meta.json b/Resources/Textures/Corvax/Objects/Consumable/Food/JapanFood/ramen.rsi/meta.json new file mode 100644 index 00000000000..0de28872bb0 --- /dev/null +++ b/Resources/Textures/Corvax/Objects/Consumable/Food/JapanFood/ramen.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Chocosasel", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "ramen" + } + ] +} diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/JapanFood/ramen.rsi/ramen.png b/Resources/Textures/Corvax/Objects/Consumable/Food/JapanFood/ramen.rsi/ramen.png new file mode 100644 index 0000000000000000000000000000000000000000..1a08bc5491cc3d2c84307c3256be88146e70ab90 GIT binary patch literal 839 zcmV-N1GxN&P)Px%=Sf6CR9J=Wl1oSwaU91#hN!cXL$3Q^YfTNrM1(NNL#Sjz9n?$E1EV%th)!xr zdGHXV&}%F4Ad*r<7F|R#dK`Kg1a?t+SYpcdSZG#EbJI0DOow%*eT}=-C1Ssqnfdeo z|307j&OjoGBoZSAAx+7(o0b1oVuc>iAf){<&>)F_FB|^W@d_CvQ8DLO;ueV70KmL| zAxWO{5iAkwGZ-XM5se~dt5s_umW-}IxP*GYTvYg^ETh7MWqw;ATmtl42!_mknTwFo zlSq!X=&UHxHg`RInG}#fv1XKI;dIJD&Zk`9A#dU<<&R#w#FnoP8J*S>v&kh_bD9eKZkZdMcy9Q2Q zV|L$mUW_Oj*mw}Ms(E*%l=S=* zguF{grge1GAE4O2f|ADWz=0c&V9yp>w^eB~Dl75<$jJ*_Rf!{ggMzvxskWKa%4quvEPY|KOo@TNOKZl_IUm2m!jsMlqT#xJ{{ay>K)9_I*Ut zQU6SXkfvBO)7e^55VG!SJ4;W?N%-&?dv@|t?a=OUXm4#aTR8LJdC0kuaSy|z9_IZE z5xl4Z!4km<7t+hfxF_UU55BB`Dsgaw5rEqte`xDAlN3{8qu?jYDsbYyK0Ky?Dj^Cf z?9N{aK$cZtwK)v{!76I|{PG+CgRiDFVR_28EIcj&RYJWNg%nmAQlswsHvgSD|DyIB z3m&(Co=nJ~Bv6$2pot`s$Ul{zqg5v?`EC5e0000EWmrjOO-%qQ00008000000002e RQ Date: Tue, 4 Jun 2024 00:46:56 +0400 Subject: [PATCH 02/43] Create 1.txt --- .../Prototypes/_NF/Entities/Objects/Consumable/Food/1/1.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/1/1.txt diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/1/1.txt b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/1/1.txt new file mode 100644 index 00000000000..d00491fd7e5 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/1/1.txt @@ -0,0 +1 @@ +1 From ddb2852c8489533dd8db16fb958df2e0191bd3e9 Mon Sep 17 00:00:00 2001 From: Dmitriy <108795395+Sh1ntra@users.noreply.github.com> Date: Tue, 4 Jun 2024 00:13:52 +0300 Subject: [PATCH 03/43] Delete Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/1 directory --- .../Prototypes/_NF/Entities/Objects/Consumable/Food/1/1.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/1/1.txt diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/1/1.txt b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/1/1.txt deleted file mode 100644 index d00491fd7e5..00000000000 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/1/1.txt +++ /dev/null @@ -1 +0,0 @@ -1 From 18f4069a5f5676f5389cdde3a3d1e4d66ad6d7f0 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Tue, 4 Jun 2024 02:03:16 +0400 Subject: [PATCH 04/43] Add files via upload --- .../Consumable/JapanFood/porkramen.yml | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/JapanFood/porkramen.yml diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/JapanFood/porkramen.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/JapanFood/porkramen.yml new file mode 100644 index 00000000000..6b089e13f4c --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/JapanFood/porkramen.yml @@ -0,0 +1,26 @@ +- type: entity + name: Pork Ramen + parent: FoodBowlBase + id: porkramennoodles + description: Оу, я вижу вы человек Высокой культуры... + components: + - type: Item + - type: Food + - type: Sprite + sprite: Corvax/Objects/Consumable/Food/JapanFood/ramen.rsi + state: ramen + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Protein + Quantity: 3 + - ReagentId: Flavorol + Quantity: 5 + - type: Tag + tags: + - Meat + - Soup From e495ca154c3d0f042d95b56012b3a41fb2a806ce Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Tue, 4 Jun 2024 02:15:35 +0400 Subject: [PATCH 05/43] Delete Resources/Prototypes/_NF/Entities/Objects/Consumable/JapanFood directory --- .../Consumable/JapanFood/porkramen.yml | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/JapanFood/porkramen.yml diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/JapanFood/porkramen.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/JapanFood/porkramen.yml deleted file mode 100644 index 6b089e13f4c..00000000000 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/JapanFood/porkramen.yml +++ /dev/null @@ -1,26 +0,0 @@ -- type: entity - name: Pork Ramen - parent: FoodBowlBase - id: porkramennoodles - description: Оу, я вижу вы человек Высокой культуры... - components: - - type: Item - - type: Food - - type: Sprite - sprite: Corvax/Objects/Consumable/Food/JapanFood/ramen.rsi - state: ramen - - type: SolutionContainerManager - solutions: - food: - maxVol: 20 - reagents: - - ReagentId: Nutriment - Quantity: 10 - - ReagentId: Protein - Quantity: 3 - - ReagentId: Flavorol - Quantity: 5 - - type: Tag - tags: - - Meat - - Soup From 6fd96d9346e733da4d953fe3c892ed4f7c2554a6 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Tue, 4 Jun 2024 02:16:02 +0400 Subject: [PATCH 06/43] Add files via upload --- .../Consumable/JapanFood/hanamidango.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/JapanFood/hanamidango.yml diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/JapanFood/hanamidango.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/JapanFood/hanamidango.yml new file mode 100644 index 00000000000..d76e42e5ecb --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/JapanFood/hanamidango.yml @@ -0,0 +1,18 @@ +- type: entity + name: Tricolor Dango + parent: FoodBakedBase + id: dango + description: Rice sweetness that beckons + components: + - type: Item + storedRotation: -90 + - type: Food + - type: Sprite + state: dango + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 15 \ No newline at end of file From 050fd8bdc82d0792163b28074298d62e67de65f1 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Tue, 4 Jun 2024 02:16:49 +0400 Subject: [PATCH 07/43] Add files via upload --- .../Recipes/Cooking/JapanFood/meal_recipes.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 Resources/Prototypes/Recipes/Cooking/JapanFood/meal_recipes.yml diff --git a/Resources/Prototypes/Recipes/Cooking/JapanFood/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/JapanFood/meal_recipes.yml new file mode 100644 index 00000000000..791adabb5c5 --- /dev/null +++ b/Resources/Prototypes/Recipes/Cooking/JapanFood/meal_recipes.yml @@ -0,0 +1,13 @@ +- type: microwaveMealRecipe + id: Recipeporkramen + name: pork ramen recipe + result: porkramennoodles + time: 15 + solids: + FoodMeatCutlet: 3 + FoodBowlBig: 1 + FoodGarlic: 1 + FoodNoodlesBoiled: 1 + reagents: + Water: 15 + Egg: 6 \ No newline at end of file From 6f605b27691e3f67fec7d878d3643586ff616e41 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Tue, 4 Jun 2024 02:17:25 +0400 Subject: [PATCH 08/43] Delete Resources/Prototypes/Recipes/Cooking/JapanFood directory --- .../Recipes/Cooking/JapanFood/meal_recipes.yml | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 Resources/Prototypes/Recipes/Cooking/JapanFood/meal_recipes.yml diff --git a/Resources/Prototypes/Recipes/Cooking/JapanFood/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/JapanFood/meal_recipes.yml deleted file mode 100644 index 791adabb5c5..00000000000 --- a/Resources/Prototypes/Recipes/Cooking/JapanFood/meal_recipes.yml +++ /dev/null @@ -1,13 +0,0 @@ -- type: microwaveMealRecipe - id: Recipeporkramen - name: pork ramen recipe - result: porkramennoodles - time: 15 - solids: - FoodMeatCutlet: 3 - FoodBowlBig: 1 - FoodGarlic: 1 - FoodNoodlesBoiled: 1 - reagents: - Water: 15 - Egg: 6 \ No newline at end of file From 93ac6e3a279672c8ecc58f997a8c4650bdc63809 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Tue, 4 Jun 2024 02:17:42 +0400 Subject: [PATCH 09/43] Add files via upload --- .../Recipes/Cooking/JapanFood/meal_recipes.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 Resources/Prototypes/Recipes/Cooking/JapanFood/meal_recipes.yml diff --git a/Resources/Prototypes/Recipes/Cooking/JapanFood/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/JapanFood/meal_recipes.yml new file mode 100644 index 00000000000..111c0020e5c --- /dev/null +++ b/Resources/Prototypes/Recipes/Cooking/JapanFood/meal_recipes.yml @@ -0,0 +1,12 @@ +- type: microwaveMealRecipe + id: Recipedango + name: dango recipe + result: dango + time: 10 + solids: + FoodWatermelonSlice: 1 + reagents: + Rice: 15 + Sugar: 5 + Water: 10 + GreenTea: 5 \ No newline at end of file From a2447c051731e81fcc0f9c3df3475eed5693739b Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Tue, 4 Jun 2024 02:20:22 +0400 Subject: [PATCH 10/43] Add files via upload --- .../Consumable/Food/JapanFood.rsi/dango.png | Bin 0 -> 677 bytes .../Consumable/Food/JapanFood.rsi/meta.json | 14 ++++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 Resources/Textures/Objects/Consumable/Food/JapanFood.rsi/dango.png create mode 100644 Resources/Textures/Objects/Consumable/Food/JapanFood.rsi/meta.json diff --git a/Resources/Textures/Objects/Consumable/Food/JapanFood.rsi/dango.png b/Resources/Textures/Objects/Consumable/Food/JapanFood.rsi/dango.png new file mode 100644 index 0000000000000000000000000000000000000000..0bdeee2a7789b7293e3869612894726ec89bd65b GIT binary patch literal 677 zcmV;W0$TlvP)Px%MM*?KR9J=Wlut;LaTv!xi?xH|4%<``Aqkp>Nrz_EN_vIr_68f6froZ5D8h~w zLUs|MU|zaJVRWcV#SRJDK~RV$VGClJG7(12Marf*+8~Oj%l;Jh&b@OY(Z28=-skx} zzvsjE`SCzmW&Q6mXeE@UI>zUB^U zt7|eTDJ6s^fG-d>m=m?)Rl2YoYXNH&)Z6fu7(x@kV{gkf2Z$vgmcVl9EPX4>C4<A6Pp5LAbK0yC9x8PSui&r%;ru% zc*fqAeK=J|CZr3ZAOL{$jAd}3pY_@I+2&5w!O0_5YAQ_Wljn3n6bz7q7?Nw3J-A2x zI8_Jr`zu&nO|iI|0-#gbqYFY8Kn?;~OBn&jhWyj1&${l@y@-B;U@06YvXIQi{pWA; z@y0Ed!tw0|00>P?8s7OP0EjFki7X_EfBQ~PcPl?f?o;R+C>kIGF*f`p`(J(a3b*gQ zLOtGq`*1@+dqMXb_!|U}Z5Eo38UVR)#ttC9KzMsLSS!VQwnur#~`*mf_$2q zj~XnGXLinkvda1=^b4j__CLrZ9UuSz01jnXNoGw=04e|g00;m8000000Mb*F00000 LNkvXXu0mjf Date: Tue, 4 Jun 2024 03:19:19 +0400 Subject: [PATCH 11/43] Delete Resources/Textures/Objects/Consumable/Food/JapanFood.rsi directory --- .../Consumable/Food/JapanFood.rsi/dango.png | Bin 677 -> 0 bytes .../Consumable/Food/JapanFood.rsi/meta.json | 14 -------------- 2 files changed, 14 deletions(-) delete mode 100644 Resources/Textures/Objects/Consumable/Food/JapanFood.rsi/dango.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/JapanFood.rsi/meta.json diff --git a/Resources/Textures/Objects/Consumable/Food/JapanFood.rsi/dango.png b/Resources/Textures/Objects/Consumable/Food/JapanFood.rsi/dango.png deleted file mode 100644 index 0bdeee2a7789b7293e3869612894726ec89bd65b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 677 zcmV;W0$TlvP)Px%MM*?KR9J=Wlut;LaTv!xi?xH|4%<``Aqkp>Nrz_EN_vIr_68f6froZ5D8h~w zLUs|MU|zaJVRWcV#SRJDK~RV$VGClJG7(12Marf*+8~Oj%l;Jh&b@OY(Z28=-skx} zzvsjE`SCzmW&Q6mXeE@UI>zUB^U zt7|eTDJ6s^fG-d>m=m?)Rl2YoYXNH&)Z6fu7(x@kV{gkf2Z$vgmcVl9EPX4>C4<A6Pp5LAbK0yC9x8PSui&r%;ru% zc*fqAeK=J|CZr3ZAOL{$jAd}3pY_@I+2&5w!O0_5YAQ_Wljn3n6bz7q7?Nw3J-A2x zI8_Jr`zu&nO|iI|0-#gbqYFY8Kn?;~OBn&jhWyj1&${l@y@-B;U@06YvXIQi{pWA; z@y0Ed!tw0|00>P?8s7OP0EjFki7X_EfBQ~PcPl?f?o;R+C>kIGF*f`p`(J(a3b*gQ zLOtGq`*1@+dqMXb_!|U}Z5Eo38UVR)#ttC9KzMsLSS!VQwnur#~`*mf_$2q zj~XnGXLinkvda1=^b4j__CLrZ9UuSz01jnXNoGw=04e|g00;m8000000Mb*F00000 LNkvXXu0mjf Date: Tue, 4 Jun 2024 03:25:07 +0400 Subject: [PATCH 12/43] Delete Resources/Prototypes/Recipes/Cooking/JapanFood directory --- .../Recipes/Cooking/JapanFood/meal_recipes.yml | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 Resources/Prototypes/Recipes/Cooking/JapanFood/meal_recipes.yml diff --git a/Resources/Prototypes/Recipes/Cooking/JapanFood/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/JapanFood/meal_recipes.yml deleted file mode 100644 index 111c0020e5c..00000000000 --- a/Resources/Prototypes/Recipes/Cooking/JapanFood/meal_recipes.yml +++ /dev/null @@ -1,12 +0,0 @@ -- type: microwaveMealRecipe - id: Recipedango - name: dango recipe - result: dango - time: 10 - solids: - FoodWatermelonSlice: 1 - reagents: - Rice: 15 - Sugar: 5 - Water: 10 - GreenTea: 5 \ No newline at end of file From 9b2eb95bc99d1861ee9ef2790feddb3bcb977471 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Tue, 4 Jun 2024 04:17:50 +0400 Subject: [PATCH 13/43] Add files via upload --- .../Consumable/Food/JapanFood/hanamidango.yml | 19 ++++++++++++++ .../Food/JapanFood/porkramennoodles.yml | 26 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/porkramennoodles.yml diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml new file mode 100644 index 00000000000..65f2a37c4a8 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml @@ -0,0 +1,19 @@ +- type: entity + name: Tricolor Dango + parent: FoodBakedBase + id: hanamidango + description: Rice sweetness that beckons + components: + - type: Item + storedRotation: -90 + - type: Food + - type: Sprite + sprite: Corvax/Objects/Consumable/Food/japanfood.rsi + state: hanamidango + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 15 \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/porkramennoodles.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/porkramennoodles.yml new file mode 100644 index 00000000000..1e3cd5ade38 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/porkramennoodles.yml @@ -0,0 +1,26 @@ +- type: entity + name: Pork Ramen + parent: FoodBowlBase + id: porkramennoodles + description: Ah, I See You're a Man of Culture As Well... + components: + - type: Item + - type: Food + - type: Sprite + sprite: Corvax/Objects/Consumable/Food/japanfood.rsi + state: porkramen + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Protein + Quantity: 3 + - ReagentId: Flavorol + Quantity: 5 + - type: Tag + tags: + - Meat + - Soup \ No newline at end of file From e94168cc7dfb470a229fb41ce2893a508463f0ab Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Tue, 4 Jun 2024 04:19:42 +0400 Subject: [PATCH 14/43] Add files via upload --- .../Corvax/Recipes/Cooking/meal_recipes.yml | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 Resources/Prototypes/Corvax/Recipes/Cooking/meal_recipes.yml diff --git a/Resources/Prototypes/Corvax/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Corvax/Recipes/Cooking/meal_recipes.yml new file mode 100644 index 00000000000..c393a25a8ff --- /dev/null +++ b/Resources/Prototypes/Corvax/Recipes/Cooking/meal_recipes.yml @@ -0,0 +1,25 @@ +- type: microwaveMealRecipe + id: Recipeporkramen + name: pork ramen recipe + result: porkramennoodles + time: 15 + solids: + FoodMeatCutlet: 3 + FoodBowlBig: 1 + FoodGarlic: 1 + FoodNoodlesBoiled: 1 + reagents: + Water: 15 + Egg: 6 +- type: microwaveMealRecipe + id: Recipedango + name: dango recipe + result: hanamidango + time: 10 + solids: + FoodWatermelonSlice: 1 + reagents: + Rice: 15 + Sugar: 5 + Water: 10 + GreenTea: 5 \ No newline at end of file From b63d819d0df2ad9aa0eb31b3ddf77c3ae6ceb0bc Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Tue, 4 Jun 2024 04:21:08 +0400 Subject: [PATCH 15/43] Add files via upload --- .../Food/japanfood.rsi/hanamidango.png | Bin 0 -> 677 bytes .../Consumable/Food/japanfood.rsi/meta.json | 17 +++++++++++++++++ .../Food/japanfood.rsi/porkramen.png | Bin 0 -> 839 bytes 3 files changed, 17 insertions(+) create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/hanamidango.png create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/meta.json create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/porkramen.png diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/hanamidango.png b/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/hanamidango.png new file mode 100644 index 0000000000000000000000000000000000000000..0bdeee2a7789b7293e3869612894726ec89bd65b GIT binary patch literal 677 zcmV;W0$TlvP)Px%MM*?KR9J=Wlut;LaTv!xi?xH|4%<``Aqkp>Nrz_EN_vIr_68f6froZ5D8h~w zLUs|MU|zaJVRWcV#SRJDK~RV$VGClJG7(12Marf*+8~Oj%l;Jh&b@OY(Z28=-skx} zzvsjE`SCzmW&Q6mXeE@UI>zUB^U zt7|eTDJ6s^fG-d>m=m?)Rl2YoYXNH&)Z6fu7(x@kV{gkf2Z$vgmcVl9EPX4>C4<A6Pp5LAbK0yC9x8PSui&r%;ru% zc*fqAeK=J|CZr3ZAOL{$jAd}3pY_@I+2&5w!O0_5YAQ_Wljn3n6bz7q7?Nw3J-A2x zI8_Jr`zu&nO|iI|0-#gbqYFY8Kn?;~OBn&jhWyj1&${l@y@-B;U@06YvXIQi{pWA; z@y0Ed!tw0|00>P?8s7OP0EjFki7X_EfBQ~PcPl?f?o;R+C>kIGF*f`p`(J(a3b*gQ zLOtGq`*1@+dqMXb_!|U}Z5Eo38UVR)#ttC9KzMsLSS!VQwnur#~`*mf_$2q zj~XnGXLinkvda1=^b4j__CLrZ9UuSz01jnXNoGw=04e|g00;m8000000Mb*F00000 LNkvXXu0mjfPx%=Sf6CR9J=Wl1oSwaU91#hN!cXL$3Q^YfTNrM1(NNL#Sjz9n?$E1EV%th)!xr zdGHXV&}%F4Ad*r<7F|R#dK`Kg1a?t+SYpcdSZG#EbJI0DOow%*eT}=-C1Ssqnfdeo z|307j&OjoGBoZSAAx+7(o0b1oVuc>iAf){<&>)F_FB|^W@d_CvQ8DLO;ueV70KmL| zAxWO{5iAkwGZ-XM5se~dt5s_umW-}IxP*GYTvYg^ETh7MWqw;ATmtl42!_mknTwFo zlSq!X=&UHxHg`RInG}#fv1XKI;dIJD&Zk`9A#dU<<&R#w#FnoP8J*S>v&kh_bD9eKZkZdMcy9Q2Q zV|L$mUW_Oj*mw}Ms(E*%l=S=* zguF{grge1GAE4O2f|ADWz=0c&V9yp>w^eB~Dl75<$jJ*_Rf!{ggMzvxskWKa%4quvEPY|KOo@TNOKZl_IUm2m!jsMlqT#xJ{{ay>K)9_I*Ut zQU6SXkfvBO)7e^55VG!SJ4;W?N%-&?dv@|t?a=OUXm4#aTR8LJdC0kuaSy|z9_IZE z5xl4Z!4km<7t+hfxF_UU55BB`Dsgaw5rEqte`xDAlN3{8qu?jYDsbYyK0Ky?Dj^Cf z?9N{aK$cZtwK)v{!76I|{PG+CgRiDFVR_28EIcj&RYJWNg%nmAQlswsHvgSD|DyIB z3m&(Co=nJ~Bv6$2pot`s$Ul{zqg5v?`EC5e0000EWmrjOO-%qQ00008000000002e RQ Date: Tue, 4 Jun 2024 04:23:15 +0400 Subject: [PATCH 16/43] Delete Resources/Prototypes/_NF/Entities/Objects/Consumable/JapanFood directory --- .../Consumable/JapanFood/hanamidango.yml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/JapanFood/hanamidango.yml diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/JapanFood/hanamidango.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/JapanFood/hanamidango.yml deleted file mode 100644 index d76e42e5ecb..00000000000 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/JapanFood/hanamidango.yml +++ /dev/null @@ -1,18 +0,0 @@ -- type: entity - name: Tricolor Dango - parent: FoodBakedBase - id: dango - description: Rice sweetness that beckons - components: - - type: Item - storedRotation: -90 - - type: Food - - type: Sprite - state: dango - - type: SolutionContainerManager - solutions: - food: - maxVol: 20 - reagents: - - ReagentId: Nutriment - Quantity: 15 \ No newline at end of file From 54dffc62aea4e6c803cbc3f1098ab682fc12253f Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Tue, 4 Jun 2024 04:25:49 +0400 Subject: [PATCH 17/43] Delete Resources/Prototypes/Corvax/Recipes/Cooking/meal_recipes.yml --- .../Corvax/Recipes/Cooking/meal_recipes.yml | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 Resources/Prototypes/Corvax/Recipes/Cooking/meal_recipes.yml diff --git a/Resources/Prototypes/Corvax/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Corvax/Recipes/Cooking/meal_recipes.yml deleted file mode 100644 index c393a25a8ff..00000000000 --- a/Resources/Prototypes/Corvax/Recipes/Cooking/meal_recipes.yml +++ /dev/null @@ -1,25 +0,0 @@ -- type: microwaveMealRecipe - id: Recipeporkramen - name: pork ramen recipe - result: porkramennoodles - time: 15 - solids: - FoodMeatCutlet: 3 - FoodBowlBig: 1 - FoodGarlic: 1 - FoodNoodlesBoiled: 1 - reagents: - Water: 15 - Egg: 6 -- type: microwaveMealRecipe - id: Recipedango - name: dango recipe - result: hanamidango - time: 10 - solids: - FoodWatermelonSlice: 1 - reagents: - Rice: 15 - Sugar: 5 - Water: 10 - GreenTea: 5 \ No newline at end of file From 57410c2ae391b47fde9d0bd86700288aac472a09 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Tue, 4 Jun 2024 04:26:09 +0400 Subject: [PATCH 18/43] Add files via upload --- .../Cooking/JapanFood/meal_recipes.yml | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml diff --git a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml new file mode 100644 index 00000000000..c393a25a8ff --- /dev/null +++ b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml @@ -0,0 +1,25 @@ +- type: microwaveMealRecipe + id: Recipeporkramen + name: pork ramen recipe + result: porkramennoodles + time: 15 + solids: + FoodMeatCutlet: 3 + FoodBowlBig: 1 + FoodGarlic: 1 + FoodNoodlesBoiled: 1 + reagents: + Water: 15 + Egg: 6 +- type: microwaveMealRecipe + id: Recipedango + name: dango recipe + result: hanamidango + time: 10 + solids: + FoodWatermelonSlice: 1 + reagents: + Rice: 15 + Sugar: 5 + Water: 10 + GreenTea: 5 \ No newline at end of file From 7f2619997256a813d682af4d128b53ad3a4126d5 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Tue, 4 Jun 2024 04:43:56 +0400 Subject: [PATCH 19/43] Delete Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/porkramen.png --- .../Consumable/Food/japanfood.rsi/porkramen.png | Bin 839 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/porkramen.png diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/porkramen.png b/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/porkramen.png deleted file mode 100644 index 1a08bc5491cc3d2c84307c3256be88146e70ab90..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 839 zcmV-N1GxN&P)Px%=Sf6CR9J=Wl1oSwaU91#hN!cXL$3Q^YfTNrM1(NNL#Sjz9n?$E1EV%th)!xr zdGHXV&}%F4Ad*r<7F|R#dK`Kg1a?t+SYpcdSZG#EbJI0DOow%*eT}=-C1Ssqnfdeo z|307j&OjoGBoZSAAx+7(o0b1oVuc>iAf){<&>)F_FB|^W@d_CvQ8DLO;ueV70KmL| zAxWO{5iAkwGZ-XM5se~dt5s_umW-}IxP*GYTvYg^ETh7MWqw;ATmtl42!_mknTwFo zlSq!X=&UHxHg`RInG}#fv1XKI;dIJD&Zk`9A#dU<<&R#w#FnoP8J*S>v&kh_bD9eKZkZdMcy9Q2Q zV|L$mUW_Oj*mw}Ms(E*%l=S=* zguF{grge1GAE4O2f|ADWz=0c&V9yp>w^eB~Dl75<$jJ*_Rf!{ggMzvxskWKa%4quvEPY|KOo@TNOKZl_IUm2m!jsMlqT#xJ{{ay>K)9_I*Ut zQU6SXkfvBO)7e^55VG!SJ4;W?N%-&?dv@|t?a=OUXm4#aTR8LJdC0kuaSy|z9_IZE z5xl4Z!4km<7t+hfxF_UU55BB`Dsgaw5rEqte`xDAlN3{8qu?jYDsbYyK0Ky?Dj^Cf z?9N{aK$cZtwK)v{!76I|{PG+CgRiDFVR_28EIcj&RYJWNg%nmAQlswsHvgSD|DyIB z3m&(Co=nJ~Bv6$2pot`s$Ul{zqg5v?`EC5e0000EWmrjOO-%qQ00008000000002e RQ Date: Tue, 4 Jun 2024 05:11:16 +0400 Subject: [PATCH 20/43] Delete Resources/Textures/Corvax/Objects/Consumable/Food/JapanFood/ramen.rsi directory --- .../Consumable/Food/JapanFood/ramen.rsi/meta.json | 14 -------------- .../Consumable/Food/JapanFood/ramen.rsi/ramen.png | Bin 839 -> 0 bytes 2 files changed, 14 deletions(-) delete mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/JapanFood/ramen.rsi/meta.json delete mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/JapanFood/ramen.rsi/ramen.png diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/JapanFood/ramen.rsi/meta.json b/Resources/Textures/Corvax/Objects/Consumable/Food/JapanFood/ramen.rsi/meta.json deleted file mode 100644 index 0de28872bb0..00000000000 --- a/Resources/Textures/Corvax/Objects/Consumable/Food/JapanFood/ramen.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by Chocosasel", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "ramen" - } - ] -} diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/JapanFood/ramen.rsi/ramen.png b/Resources/Textures/Corvax/Objects/Consumable/Food/JapanFood/ramen.rsi/ramen.png deleted file mode 100644 index 1a08bc5491cc3d2c84307c3256be88146e70ab90..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 839 zcmV-N1GxN&P)Px%=Sf6CR9J=Wl1oSwaU91#hN!cXL$3Q^YfTNrM1(NNL#Sjz9n?$E1EV%th)!xr zdGHXV&}%F4Ad*r<7F|R#dK`Kg1a?t+SYpcdSZG#EbJI0DOow%*eT}=-C1Ssqnfdeo z|307j&OjoGBoZSAAx+7(o0b1oVuc>iAf){<&>)F_FB|^W@d_CvQ8DLO;ueV70KmL| zAxWO{5iAkwGZ-XM5se~dt5s_umW-}IxP*GYTvYg^ETh7MWqw;ATmtl42!_mknTwFo zlSq!X=&UHxHg`RInG}#fv1XKI;dIJD&Zk`9A#dU<<&R#w#FnoP8J*S>v&kh_bD9eKZkZdMcy9Q2Q zV|L$mUW_Oj*mw}Ms(E*%l=S=* zguF{grge1GAE4O2f|ADWz=0c&V9yp>w^eB~Dl75<$jJ*_Rf!{ggMzvxskWKa%4quvEPY|KOo@TNOKZl_IUm2m!jsMlqT#xJ{{ay>K)9_I*Ut zQU6SXkfvBO)7e^55VG!SJ4;W?N%-&?dv@|t?a=OUXm4#aTR8LJdC0kuaSy|z9_IZE z5xl4Z!4km<7t+hfxF_UU55BB`Dsgaw5rEqte`xDAlN3{8qu?jYDsbYyK0Ky?Dj^Cf z?9N{aK$cZtwK)v{!76I|{PG+CgRiDFVR_28EIcj&RYJWNg%nmAQlswsHvgSD|DyIB z3m&(Co=nJ~Bv6$2pot`s$Ul{zqg5v?`EC5e0000EWmrjOO-%qQ00008000000002e RQ Date: Tue, 4 Jun 2024 05:19:02 +0400 Subject: [PATCH 21/43] Delete Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/porkramennoodles.yml --- .../Food/JapanFood/porkramennoodles.yml | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/porkramennoodles.yml diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/porkramennoodles.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/porkramennoodles.yml deleted file mode 100644 index 1e3cd5ade38..00000000000 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/porkramennoodles.yml +++ /dev/null @@ -1,26 +0,0 @@ -- type: entity - name: Pork Ramen - parent: FoodBowlBase - id: porkramennoodles - description: Ah, I See You're a Man of Culture As Well... - components: - - type: Item - - type: Food - - type: Sprite - sprite: Corvax/Objects/Consumable/Food/japanfood.rsi - state: porkramen - - type: SolutionContainerManager - solutions: - food: - maxVol: 20 - reagents: - - ReagentId: Nutriment - Quantity: 10 - - ReagentId: Protein - Quantity: 3 - - ReagentId: Flavorol - Quantity: 5 - - type: Tag - tags: - - Meat - - Soup \ No newline at end of file From e2198b8e0eb12ddc08f78f36452fde36a8444b6e Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Tue, 4 Jun 2024 05:20:56 +0400 Subject: [PATCH 22/43] Update meta.json --- .../Corvax/Objects/Consumable/Food/japanfood.rsi/meta.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/meta.json b/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/meta.json index 44bc12002aa..0baa2c4bb92 100644 --- a/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/meta.json +++ b/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/meta.json @@ -8,9 +8,6 @@ }, "states": [ { - "name": "porkramen" - }, - { "name": "hanamidango" } ] From 87321f848d2a04f496b224eb92105d1c231dc450 Mon Sep 17 00:00:00 2001 From: Dmitriy <108795395+Sh1ntra@users.noreply.github.com> Date: Tue, 4 Jun 2024 04:34:44 +0300 Subject: [PATCH 23/43] Delete Resources/Textures/Corvax/Objects/Consumable/Food/JapanFood/ramen.rsi directory --- .../Consumable/Food/JapanFood/ramen.rsi/meta.json | 14 -------------- .../Consumable/Food/JapanFood/ramen.rsi/ramen.png | Bin 839 -> 0 bytes 2 files changed, 14 deletions(-) delete mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/JapanFood/ramen.rsi/meta.json delete mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/JapanFood/ramen.rsi/ramen.png diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/JapanFood/ramen.rsi/meta.json b/Resources/Textures/Corvax/Objects/Consumable/Food/JapanFood/ramen.rsi/meta.json deleted file mode 100644 index 0de28872bb0..00000000000 --- a/Resources/Textures/Corvax/Objects/Consumable/Food/JapanFood/ramen.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by Chocosasel", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "ramen" - } - ] -} diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/JapanFood/ramen.rsi/ramen.png b/Resources/Textures/Corvax/Objects/Consumable/Food/JapanFood/ramen.rsi/ramen.png deleted file mode 100644 index 1a08bc5491cc3d2c84307c3256be88146e70ab90..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 839 zcmV-N1GxN&P)Px%=Sf6CR9J=Wl1oSwaU91#hN!cXL$3Q^YfTNrM1(NNL#Sjz9n?$E1EV%th)!xr zdGHXV&}%F4Ad*r<7F|R#dK`Kg1a?t+SYpcdSZG#EbJI0DOow%*eT}=-C1Ssqnfdeo z|307j&OjoGBoZSAAx+7(o0b1oVuc>iAf){<&>)F_FB|^W@d_CvQ8DLO;ueV70KmL| zAxWO{5iAkwGZ-XM5se~dt5s_umW-}IxP*GYTvYg^ETh7MWqw;ATmtl42!_mknTwFo zlSq!X=&UHxHg`RInG}#fv1XKI;dIJD&Zk`9A#dU<<&R#w#FnoP8J*S>v&kh_bD9eKZkZdMcy9Q2Q zV|L$mUW_Oj*mw}Ms(E*%l=S=* zguF{grge1GAE4O2f|ADWz=0c&V9yp>w^eB~Dl75<$jJ*_Rf!{ggMzvxskWKa%4quvEPY|KOo@TNOKZl_IUm2m!jsMlqT#xJ{{ay>K)9_I*Ut zQU6SXkfvBO)7e^55VG!SJ4;W?N%-&?dv@|t?a=OUXm4#aTR8LJdC0kuaSy|z9_IZE z5xl4Z!4km<7t+hfxF_UU55BB`Dsgaw5rEqte`xDAlN3{8qu?jYDsbYyK0Ky?Dj^Cf z?9N{aK$cZtwK)v{!76I|{PG+CgRiDFVR_28EIcj&RYJWNg%nmAQlswsHvgSD|DyIB z3m&(Co=nJ~Bv6$2pot`s$Ul{zqg5v?`EC5e0000EWmrjOO-%qQ00008000000002e RQ Date: Tue, 4 Jun 2024 04:37:38 +0300 Subject: [PATCH 24/43] Update meal_recipes.yml --- .../Recipes/Cooking/JapanFood/meal_recipes.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml index 55f8e91e3f2..8b137891791 100644 --- a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml +++ b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml @@ -1,13 +1 @@ -- type: microwaveMealRecipe - id: Recipeporkramen - name: pork ramen recipe - result: porkramennoodles - time: 15 - solids: - FoodMeatCutlet: 3 - FoodBowlBig: 1 - FoodGarlic: 1 - FoodNoodlesBoiled: 1 - reagents: - Water: 15 - Egg: 6 \ No newline at end of file + From 81fd985b41c15078af3651cc61a250ce2a10008e Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Tue, 4 Jun 2024 05:38:35 +0400 Subject: [PATCH 25/43] Delete Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/ramen.yml --- .../Consumable/Food/JapanFood/ramen.yml | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/ramen.yml diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/ramen.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/ramen.yml deleted file mode 100644 index e81de79bba4..00000000000 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/ramen.yml +++ /dev/null @@ -1,26 +0,0 @@ -- type: entity - name: Pork Ramen - parent: FoodBowlBase - id: porkramennoodles - description: Оу, я вижу вы человек Высокой культуры... - components: - - type: Item - - type: Food - - type: Sprite - sprite: Corvax/Objects/Consumable/Food/JapanFood/ramen.rsi - state: ramen - - type: SolutionContainerManager - solutions: - food: - maxVol: 20 - reagents: - - ReagentId: Nutriment - Quantity: 10 - - ReagentId: Protein - Quantity: 3 - - ReagentId: Flavorol - Quantity: 5 - - type: Tag - tags: - - Meat - - Soup From 0ee5656db4b8affca451a16939ac4e32c7ff9479 Mon Sep 17 00:00:00 2001 From: Dmitriy <108795395+Sh1ntra@users.noreply.github.com> Date: Tue, 4 Jun 2024 04:38:55 +0300 Subject: [PATCH 26/43] Delete Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/ramen.yml --- .../Consumable/Food/JapanFood/ramen.yml | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/ramen.yml diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/ramen.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/ramen.yml deleted file mode 100644 index e81de79bba4..00000000000 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/ramen.yml +++ /dev/null @@ -1,26 +0,0 @@ -- type: entity - name: Pork Ramen - parent: FoodBowlBase - id: porkramennoodles - description: Оу, я вижу вы человек Высокой культуры... - components: - - type: Item - - type: Food - - type: Sprite - sprite: Corvax/Objects/Consumable/Food/JapanFood/ramen.rsi - state: ramen - - type: SolutionContainerManager - solutions: - food: - maxVol: 20 - reagents: - - ReagentId: Nutriment - Quantity: 10 - - ReagentId: Protein - Quantity: 3 - - ReagentId: Flavorol - Quantity: 5 - - type: Tag - tags: - - Meat - - Soup From 15a8d0f9e801417ff3c8447211cef104806ff6e0 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Fri, 28 Jun 2024 18:46:01 +0400 Subject: [PATCH 27/43] Delete Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood directory --- .../Consumable/Food/JapanFood/hanamidango.yml | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml deleted file mode 100644 index 65f2a37c4a8..00000000000 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml +++ /dev/null @@ -1,19 +0,0 @@ -- type: entity - name: Tricolor Dango - parent: FoodBakedBase - id: hanamidango - description: Rice sweetness that beckons - components: - - type: Item - storedRotation: -90 - - type: Food - - type: Sprite - sprite: Corvax/Objects/Consumable/Food/japanfood.rsi - state: hanamidango - - type: SolutionContainerManager - solutions: - food: - maxVol: 20 - reagents: - - ReagentId: Nutriment - Quantity: 15 \ No newline at end of file From d027d714e45f6a179e785a42ab5e61c24642f658 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Fri, 28 Jun 2024 18:46:28 +0400 Subject: [PATCH 28/43] Add files via upload --- .../Food/JapanFood/Ingredients/dangodough.yml | 12 ++++++++ .../JapanFood/Ingredients/rawramennoodles.yml | 10 +++++++ .../Consumable/Food/JapanFood/hanamidango.yml | 19 ++++++++++++ .../Food/JapanFood/mitarasidango.yml | 19 ++++++++++++ .../Consumable/Food/JapanFood/onigiri.yml | 19 ++++++++++++ .../Food/JapanFood/porkramennoodles.yml | 28 +++++++++++++++++ .../Food/JapanFood/spicyporkramen.yml | 30 +++++++++++++++++++ 7 files changed, 137 insertions(+) create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/dangodough.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/rawramennoodles.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/mitarasidango.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/onigiri.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/porkramennoodles.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/spicyporkramen.yml diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/dangodough.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/dangodough.yml new file mode 100644 index 00000000000..0e1004b9bde --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/dangodough.yml @@ -0,0 +1,12 @@ +- type: entity + name: Dough Dango Ball + parent: FoodBakingBase + id: Doughdangoball + description: A ball of dough. + components: + - type: FlavorProfile + flavors: + - dough + - type: Sprite + sprite: Corvax/Objects/Consumable/Food/japanfood.rsi/ingredients.rsi + state: doughdangoball \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/rawramennoodles.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/rawramennoodles.yml new file mode 100644 index 00000000000..7f4be91292f --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/rawramennoodles.yml @@ -0,0 +1,10 @@ +- type: entity + name: Raw Ramen Noodles + parent: FoodBakingBase + id: rawnoodles + description: A raw ramen. + components: + - type: FlavorProfile + - type: Sprite + sprite: Corvax/Objects/Consumable/Food/japanfood.rsi/ingredients.rsi + state: rawnoodles \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml new file mode 100644 index 00000000000..f0121078605 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml @@ -0,0 +1,19 @@ +- type: entity + name: Tricolor Dango + parent: FoodBakedBase + id: hanamidango + description: You like that colors, don't you? + components: + - type: Item + storedRotation: -90 + - type: Food + - type: Sprite + sprite: Corvax/Objects/Consumable/Food/japanfood.rsi + state: hanamidango + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 15 \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/mitarasidango.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/mitarasidango.yml new file mode 100644 index 00000000000..c57264538cb --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/mitarasidango.yml @@ -0,0 +1,19 @@ +- type: entity + name: Mitarashi Dango + parent: FoodBakedBase + id: mitarashidango + description: Rice sweetness that beckons + components: + - type: Item + storedRotation: -90 + - type: Food + - type: Sprite + sprite: Corvax/Objects/Consumable/Food/japanfood.rsi + state: mitarashidango + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 15 \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/onigiri.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/onigiri.yml new file mode 100644 index 00000000000..c37070ca7fe --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/onigiri.yml @@ -0,0 +1,19 @@ +- type: entity + name: Onigiri + parent: FoodBakedBase + id: onigiri + description: Best fried geometric shape in the galaxy + components: + - type: Item + storedRotation: -90 + - type: Food + - type: Sprite + sprite: Corvax/Objects/Consumable/Food/japanfood.rsi + state: onigiri + - type: SolutionContainerManager + solutions: + food: + maxVol: 25 + reagents: + - ReagentId: Nutriment + Quantity: 20 \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/porkramennoodles.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/porkramennoodles.yml new file mode 100644 index 00000000000..a610145ea8a --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/porkramennoodles.yml @@ -0,0 +1,28 @@ +- type: entity + name: Pork Ramen + parent: FoodBowlBase + id: porkramennoodles + description: Ah, I See You're a Man of Culture As Well... + components: + - type: Item + - type: Food + - type: Sprite + sprite: Corvax/Objects/Consumable/Food/japanfood.rsi + state: porkramen + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Protein + Quantity: 3 + - ReagentId: Flavorol + Quantity: 5 + - ReagentId: Soysauce + Quantity: 2 + - type: Tag + tags: + - Meat + - Soup \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/spicyporkramen.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/spicyporkramen.yml new file mode 100644 index 00000000000..aaf76defda6 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/spicyporkramen.yml @@ -0,0 +1,30 @@ +- type: entity + name: Spicy Ramen + parent: FoodBowlBase + id: spicyporkramennoodles + description: So hot and so cute! + components: + - type: Item + - type: Food + - type: Sprite + sprite: Corvax/Objects/Consumable/Food/japanfood.rsi + state: spicyporkramen + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Protein + Quantity: 3 + - ReagentId: Flavorol + Quantity: 5 + - ReagentId: CapsaicinOil + Quantity: 2 + - ReagentId: Soysauce + Quantity: 2 + - type: Tag + tags: + - Meat + - Soup \ No newline at end of file From 25b53df899703afd5aa3ab526e605b00675d6b75 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Fri, 28 Jun 2024 18:47:48 +0400 Subject: [PATCH 29/43] Delete Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi directory --- .../Consumable/Food/japanfood.rsi/hanamidango.png | Bin 677 -> 0 bytes .../Consumable/Food/japanfood.rsi/meta.json | 14 -------------- 2 files changed, 14 deletions(-) delete mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/hanamidango.png delete mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/meta.json diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/hanamidango.png b/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/hanamidango.png deleted file mode 100644 index 0bdeee2a7789b7293e3869612894726ec89bd65b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 677 zcmV;W0$TlvP)Px%MM*?KR9J=Wlut;LaTv!xi?xH|4%<``Aqkp>Nrz_EN_vIr_68f6froZ5D8h~w zLUs|MU|zaJVRWcV#SRJDK~RV$VGClJG7(12Marf*+8~Oj%l;Jh&b@OY(Z28=-skx} zzvsjE`SCzmW&Q6mXeE@UI>zUB^U zt7|eTDJ6s^fG-d>m=m?)Rl2YoYXNH&)Z6fu7(x@kV{gkf2Z$vgmcVl9EPX4>C4<A6Pp5LAbK0yC9x8PSui&r%;ru% zc*fqAeK=J|CZr3ZAOL{$jAd}3pY_@I+2&5w!O0_5YAQ_Wljn3n6bz7q7?Nw3J-A2x zI8_Jr`zu&nO|iI|0-#gbqYFY8Kn?;~OBn&jhWyj1&${l@y@-B;U@06YvXIQi{pWA; z@y0Ed!tw0|00>P?8s7OP0EjFki7X_EfBQ~PcPl?f?o;R+C>kIGF*f`p`(J(a3b*gQ zLOtGq`*1@+dqMXb_!|U}Z5Eo38UVR)#ttC9KzMsLSS!VQwnur#~`*mf_$2q zj~XnGXLinkvda1=^b4j__CLrZ9UuSz01jnXNoGw=04e|g00;m8000000Mb*F00000 LNkvXXu0mjf Date: Fri, 28 Jun 2024 18:50:11 +0400 Subject: [PATCH 30/43] Add files via upload --- .../Food/japanfood.rsi/hanamidango.png | Bin 0 -> 677 bytes .../ingredients.rsi/doughdangoball.png | Bin 0 -> 270 bytes .../japanfood.rsi/ingredients.rsi/meta.json | 17 +++++++++ .../ingredients.rsi/rawnoodles.png | Bin 0 -> 524 bytes .../Consumable/Food/japanfood.rsi/meta.json | 34 ++++++++++++++++++ .../Food/japanfood.rsi/mitarashidango.png | Bin 0 -> 673 bytes .../Consumable/Food/japanfood.rsi/onigiri.png | Bin 0 -> 338 bytes .../Food/japanfood.rsi/porkramen.png | Bin 0 -> 839 bytes .../Food/japanfood.rsi/spicyporkramen.png | Bin 0 -> 1627 bytes 9 files changed, 51 insertions(+) create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/hanamidango.png create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/ingredients.rsi/doughdangoball.png create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/ingredients.rsi/meta.json create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/ingredients.rsi/rawnoodles.png create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/meta.json create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/mitarashidango.png create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/onigiri.png create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/porkramen.png create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/spicyporkramen.png diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/hanamidango.png b/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/hanamidango.png new file mode 100644 index 0000000000000000000000000000000000000000..0bdeee2a7789b7293e3869612894726ec89bd65b GIT binary patch literal 677 zcmV;W0$TlvP)Px%MM*?KR9J=Wlut;LaTv!xi?xH|4%<``Aqkp>Nrz_EN_vIr_68f6froZ5D8h~w zLUs|MU|zaJVRWcV#SRJDK~RV$VGClJG7(12Marf*+8~Oj%l;Jh&b@OY(Z28=-skx} zzvsjE`SCzmW&Q6mXeE@UI>zUB^U zt7|eTDJ6s^fG-d>m=m?)Rl2YoYXNH&)Z6fu7(x@kV{gkf2Z$vgmcVl9EPX4>C4<A6Pp5LAbK0yC9x8PSui&r%;ru% zc*fqAeK=J|CZr3ZAOL{$jAd}3pY_@I+2&5w!O0_5YAQ_Wljn3n6bz7q7?Nw3J-A2x zI8_Jr`zu&nO|iI|0-#gbqYFY8Kn?;~OBn&jhWyj1&${l@y@-B;U@06YvXIQi{pWA; z@y0Ed!tw0|00>P?8s7OP0EjFki7X_EfBQ~PcPl?f?o;R+C>kIGF*f`p`(J(a3b*gQ zLOtGq`*1@+dqMXb_!|U}Z5Eo38UVR)#ttC9KzMsLSS!VQwnur#~`*mf_$2q zj~XnGXLinkvda1=^b4j__CLrZ9UuSz01jnXNoGw=04e|g00;m8000000Mb*F00000 LNkvXXu0mjfpWc?Ln2y} z6C_v{Cy4Yk1sYspRNg5yJ!I)W`^uke%s_DX$=UXkX6-qr=jY7+{r~aHxBuRlooL-+%8rWmof;}X#2e5nzhX}-P;T0k}j5QD&_;K?A$)78&qol`;+ E0GKgn(*OVf literal 0 HcmV?d00001 diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/ingredients.rsi/meta.json b/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/ingredients.rsi/meta.json new file mode 100644 index 00000000000..e5fa349e863 --- /dev/null +++ b/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/ingredients.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Fills created by potato1234_x", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "doughdangoball" + }, + { + "name": "rawnoodles" + } + ] +} diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/ingredients.rsi/rawnoodles.png b/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/ingredients.rsi/rawnoodles.png new file mode 100644 index 0000000000000000000000000000000000000000..b6c64c07c8116471482c844c1b1fde45007daddd GIT binary patch literal 524 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^TXLn2z= zPTB9xlqhq|-ZfgVv4D5h!W4-VUB@dGr+NPh@_9O62w3e~Se)w^=v@83fyLdKqiM37 zik8|lPFa>zvtyUx{=pKIgeCU~d_owPSLJCzdaZB;L5c_y@` zRLxEB{_XpVGG@348;Y5UCmJ!m&+S<)bJ3+I?CrtLZob)nj~(3kI6X;&dDpa(O~*u+*}Dh+vP)gqx@5Ag^)IiID$Xz7w`;d(NU3GNGP+!xXufuZ)ApbTF8ldT zJ+J3<{q#Qb$j)+Y)~>dfD^HwXoN1z4p8N1$Yj;ug7V8UdzMPP&pPRWoXu-Von>KW6 z|C=osSho5zo5Sy~hr??USdCV8Y~E+`_~-Pf&R{)Lo3~fIWNvS&ta@iCJ&WnV%bnsg zY&I}4Y+k52Wy7OytqTkk1s-`tER4xYD80utnfn+!uT~=K?M<4~rEW}n+tt0~k@hpL z=EGgi2fSx^y8ip}iC0^1A}}-?{59rY&7ZEn{2?$B`BEc1(|mmyw18|5AO?X;!IMFh Mr>mdKI;Vst0EB_yRR910 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/meta.json b/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/meta.json new file mode 100644 index 00000000000..fa66294b28f --- /dev/null +++ b/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Fills created by potato1234_x", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "porkramen" + }, + { + "name": "spicyporkramen", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "hanamidango" + }, + { + "name": "mitarashidango" + }, + { + "name": "onigiri" + } + ] +} diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/mitarashidango.png b/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/mitarashidango.png new file mode 100644 index 0000000000000000000000000000000000000000..f0327a08cb4a2946d3d8d9ee203cb98365452f18 GIT binary patch literal 673 zcmV;S0$%-zP)Px%K}keGR9J=Wl|5(^VHn5%r=|I5{78zBL=v?G2?Xg-3RV)hK}v>XFyNwt4ql-{ zlyq_ER;UmV7YD@>?P3STEJ70OU@--Uuq9N9h67aL(^QUoi1xOLvLO;iXuK&rB6QO;p>Ua@?a_ zlnv2m&T(iGsx1J3orMWB?1n$?<&!J;bS4DjP!1e~j@!{vpjvGJCE#3S81>B^ls}Ok<^EiI#9a zGZj(^dV2LVi7{6*2el0)8X~DyX#v@O)AxqS(PAc?g7w0 zCp16I`OI|h$|+bZeM%;F*SGL`aU1>%CRi-ZZqB|d>yl_0!rwV46PZ;B!AmD#A9KUt zumV8$GZ7634$OoyCx~2{p@h9_2&t+`U_W*$WlpEF?∨6TR@fonsY)b z)d67=0KmO!VCuthNZ*Pu4vn<4v_9lfm#FY*Dx?y` zdY$y*E~{BW^IxFG+**w>&OA^yTgnv~0Ca2oA^=cQ5dY56y`Lj#M>`T7x1beExgukG z$sgSp=+Wb!;3qe_Gg8%_>6ZWi01jnXNoGw=04e|g00;m8000000Mb*F00000NkvXX Hu0mjf#>gJ< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/onigiri.png b/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/onigiri.png new file mode 100644 index 0000000000000000000000000000000000000000..a2631fa7836f507e4b08c44db1b266b883b09836 GIT binary patch literal 338 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}pFCY0Ln2y} z6C_v{Cy4YkF|zeM$(j=q{ZD@8{Ofl-w?(Ez_VKKnYxzt5uA|A;KeuKsF6f@fcviMC z$I{H<@`M9oZ+0+f_9ZACH@tpcF8PAVHm8S|MHc*)3;!@#n9HS|K{5W4j?0FnRVnuu z{g#R3HC%YWX^nHj$GX374B3R$&DUg|dvlvL+*wEA7Nddt42zwH1>A+k9bMgvPwcJx zIqBe$lf4hm?2BC@;Tfmruw7=lM5xS!>vvA>NPny*vhlipe9{VM@!OjVg#*7b2L^&< zEIJz>?(g0&ALl+H%kpGGQ0~uqJ-fU;GxDZh(g1n!1_Q$xS94DPZ(BD5eb1K~;hE;^ a%b*2ha{w_2Tne5HqC8#wT-G@yGywpVC56}k literal 0 HcmV?d00001 diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/porkramen.png b/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/porkramen.png new file mode 100644 index 0000000000000000000000000000000000000000..1a08bc5491cc3d2c84307c3256be88146e70ab90 GIT binary patch literal 839 zcmV-N1GxN&P)Px%=Sf6CR9J=Wl1oSwaU91#hN!cXL$3Q^YfTNrM1(NNL#Sjz9n?$E1EV%th)!xr zdGHXV&}%F4Ad*r<7F|R#dK`Kg1a?t+SYpcdSZG#EbJI0DOow%*eT}=-C1Ssqnfdeo z|307j&OjoGBoZSAAx+7(o0b1oVuc>iAf){<&>)F_FB|^W@d_CvQ8DLO;ueV70KmL| zAxWO{5iAkwGZ-XM5se~dt5s_umW-}IxP*GYTvYg^ETh7MWqw;ATmtl42!_mknTwFo zlSq!X=&UHxHg`RInG}#fv1XKI;dIJD&Zk`9A#dU<<&R#w#FnoP8J*S>v&kh_bD9eKZkZdMcy9Q2Q zV|L$mUW_Oj*mw}Ms(E*%l=S=* zguF{grge1GAE4O2f|ADWz=0c&V9yp>w^eB~Dl75<$jJ*_Rf!{ggMzvxskWKa%4quvEPY|KOo@TNOKZl_IUm2m!jsMlqT#xJ{{ay>K)9_I*Ut zQU6SXkfvBO)7e^55VG!SJ4;W?N%-&?dv@|t?a=OUXm4#aTR8LJdC0kuaSy|z9_IZE z5xl4Z!4km<7t+hfxF_UU55BB`Dsgaw5rEqte`xDAlN3{8qu?jYDsbYyK0Ky?Dj^Cf z?9N{aK$cZtwK)v{!76I|{PG+CgRiDFVR_28EIcj&RYJWNg%nmAQlswsHvgSD|DyIB z3m&(Co=nJ~Bv6$2pot`s$Ul{zqg5v?`EC5e0000EWmrjOO-%qQ00008000000002e RQPx)`$V`O3meLV(Zc@u94Ps+D#6w<^YYjO^ri!pE*8(z)`RZD50TxP_ zsrZh1Z${!979bw-61!+4WhE}%B%MtWAtOq3;5k18Eq^@ZC1b4--Dl?06vF~In<7GV zp9`_!gi3@FL8fGy4JWYa@}zQ|ZbQB8#|lV?oCo?0kDpy@;i&hjibL1*JdLZ>l*bd` z504{!<$)00=Yr?_5Z1o+2jmt%q+kyKn~G$tHG;NRwvub3GbhhY&n!GM@sL*c*_giY zIML@<-wOcOMm-EK3lHj;d*cA1nkiI&!D;e6z7;AGDcA$|sshA@6L7C8z@HyKtz2(E zH;usYvjBk6fiB!^zMvdGO#F@OAD#dJY+D&s6^-}xSW5o7*HgXLa?jZT0Pz00X|%Ra z;`ZT608pw=MI30JeeC7DX^akZVau_j0D$mkofsYH0sxhm&SM9$yZsiTF#mKe1%Er` zZ!A)AsS4l^kE6cMhI_wGq3lWm2b{B)zk9J1jW>n?0M+;IV$YGS7`$-@W4|Y`<=9c2 zI8%k*t9RjhEr5=|1`G@c2pm7Fh}qqK%P8lZ@z3c*E%L}44m(hJR)OaOg8L(w)wfQ004~Kn@V+MhUk;#e^M8U*1+HRq(Te;9f1wNePHLIUc~za z?C6gmx_2XXbVMK(Nhqyci=kM|DDOvy-&0&jYLQ1SI2_~$Uom+T`K0g62ZT%xDgRE@ zJx@HrFq4+2)`7 z8B8Qm8mvJlfWWsm5pdX0d0;_kFaBHsW4YfSuKqs`Kxxz7GH>KY10W z8-l3Ym{hL4aPcnym?dP;7aqjT-v*Umm}bZ(zpfxEf`wL)9{R$As^j@2pKX3aQFhTr z_HRmkH@}YjtDN^d;V>1kMNGo$7V+LU^G`mT{HDU}qK!ymK3-j)`gP`Yi&*VS{TvqE zl5$@%CIbL|{N;fnI5wPEaPryWPy3yuYe~$<3j1>Ied7~TkdqIU>CPOZrjew_w471q&7|ev5E2w6Lvm<=S420Xe`e%y$ck2{=D9r=MEbQFatG7 z%Sv2?_uOI!G`KrpKK?wLu-3ZPBQ+}!JD*^Nbgg$i7|sWn`STRob6S7i$e!kjXXg{* zAupj*D(rpf%psWZ0Ga}@LDTW)d49b1SnoU!>~=PqPv9j)i^7{tFe=O(d)!g)MfvG| z#iI6{A5tu7DcA$K#Xl!VJJ*{}f!fl*?3csny=CVUfZ6{Zr~J`E_MsrzwN97nlsC@VMYVgYa~IQG)s-0000EWmrjOO-%qQ00008 Z000000002eQ Date: Fri, 28 Jun 2024 18:52:21 +0400 Subject: [PATCH 31/43] Delete Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood directory --- .../Recipes/Cooking/JapanFood/meal_recipes.yml | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml diff --git a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml deleted file mode 100644 index 5b7618e94f2..00000000000 --- a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml +++ /dev/null @@ -1,13 +0,0 @@ -- type: microwaveMealRecipe - id: Recipedango - name: dango recipe - result: hanamidango - time: 10 - solids: - FoodWatermelonSlice: 1 - reagents: - Rice: 15 - Sugar: 5 - Water: 10 - GreenTea: 5 - Egg: 6 \ No newline at end of file From b5cfb387347e086b45f4a0c8c6d4aac802e8c969 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Fri, 28 Jun 2024 18:52:35 +0400 Subject: [PATCH 32/43] Add files via upload --- .../Cooking/JapanFood/ingredients/food.yml | 33 ++++++++++ .../Cooking/JapanFood/meal_recipes.yml | 62 +++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml create mode 100644 Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml diff --git a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml new file mode 100644 index 00000000000..a6a9b74b04c --- /dev/null +++ b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/ingredients/food.yml @@ -0,0 +1,33 @@ +- type: reaction + id: CreateDangoDough + impact: Low + quantized: true + conserveEnergy: false + reactants: + Rice: + amount: 5 + Water: + amount: 2 + Sugar: + amount: 2 + effects: + - !type:CreateEntityReactionEffect + entity: Doughdangoball + +- type: reaction + id: CreateRawRamen + impact: Low + quantized: true + conserveEnergy: false + reactants: + Flour: + amount: 10 + TableSalt: + amount: 1 + OilOlive: + amount: 1 + Egg: + amount: 6 + effects: + - !type:CreateEntityReactionEffect + entity: rawnoodles \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml new file mode 100644 index 00000000000..2ab8f03c639 --- /dev/null +++ b/Resources/Prototypes/Corvax/Recipes/Cooking/JapanFood/meal_recipes.yml @@ -0,0 +1,62 @@ +- type: microwaveMealRecipe + id: Recipeporkramen + name: pork ramen recipe + result: porkramennoodles + time: 15 + solids: + FoodMeatCutlet: 3 + FoodBowlBig: 1 + FoodGarlic: 1 + rawnoodles: 1 + reagents: + Water: 15 + Egg: 6 + +- type: microwaveMealRecipe + id: Recipehanamidango + name: dango hanami recipe + result: hanamidango + time: 10 + reagents: + GreenTea: 5 + JuiceWatermelon: 5 + solids: + Doughdangoball: 3 + +- type: microwaveMealRecipe + id: Recipemitarashidango + name: dango mitarashi recipe + result: mitarashidango + time: 10 + reagents: + Soysauce: 5 + Sugar: 5 + solids: + Doughdangoball: 3 + +- type: microwaveMealRecipe + id: Recipeonigiri + name: onigiri recipe + result: onigiri + time: 20 + reagents: + Mayo: 5 + Rice: 10 + solids: + FoodMeatChicken: 1 + +- type: microwaveMealRecipe + id: Recipespicyramen + name: spicy ramen recipe + result: spicyporkramennoodles + time: 20 + solids: + FoodMeatCutlet: 3 + FoodBowlBig: 1 + FoodGarlic: 1 + rawnoodles: 1 + FoodChiliPepper: 1 + reagents: + Water: 15 + Egg: 6 + Hotsauce: 5 From 84bf11fd550cdb19aba76a74dc3069af3070864f Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Fri, 28 Jun 2024 19:32:39 +0400 Subject: [PATCH 33/43] Add files via upload --- .../Consumable/Food/JapanFood/Ingredients/dangodough.yml | 2 +- .../Consumable/Food/JapanFood/Ingredients/rawramennoodles.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/dangodough.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/dangodough.yml index 0e1004b9bde..5ffe3c7b2af 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/dangodough.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/dangodough.yml @@ -8,5 +8,5 @@ flavors: - dough - type: Sprite - sprite: Corvax/Objects/Consumable/Food/japanfood.rsi/ingredients.rsi + sprite: Corvax/Objects/Consumable/Food/ingredients.rsi state: doughdangoball \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/rawramennoodles.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/rawramennoodles.yml index 7f4be91292f..2f0a29fa3e4 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/rawramennoodles.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/rawramennoodles.yml @@ -6,5 +6,5 @@ components: - type: FlavorProfile - type: Sprite - sprite: Corvax/Objects/Consumable/Food/japanfood.rsi/ingredients.rsi + sprite: Corvax/Objects/Consumable/Food/ingredients.rsi state: rawnoodles \ No newline at end of file From 6f4f6456e5608a3b995f1d2d254aa1244e8aa9b2 Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Fri, 28 Jun 2024 19:34:10 +0400 Subject: [PATCH 34/43] Delete Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/ingredients.rsi directory --- .../ingredients.rsi/doughdangoball.png | Bin 270 -> 0 bytes .../japanfood.rsi/ingredients.rsi/meta.json | 17 ----------------- .../ingredients.rsi/rawnoodles.png | Bin 524 -> 0 bytes 3 files changed, 17 deletions(-) delete mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/ingredients.rsi/doughdangoball.png delete mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/ingredients.rsi/meta.json delete mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/ingredients.rsi/rawnoodles.png diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/ingredients.rsi/doughdangoball.png b/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/ingredients.rsi/doughdangoball.png deleted file mode 100644 index 61607a9a45f28ab1c77e512d6646fd81ca9e4b07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}>pWc?Ln2y} z6C_v{Cy4Yk1sYspRNg5yJ!I)W`^uke%s_DX$=UXkX6-qr=jY7+{r~aHxBuRlooL-+%8rWmof;}X#2e5nzhX}-P;T0k}j5QD&_;K?A$)78&qol`;+ E0GKgn(*OVf diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/ingredients.rsi/meta.json b/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/ingredients.rsi/meta.json deleted file mode 100644 index e5fa349e863..00000000000 --- a/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/ingredients.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Fills created by potato1234_x", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "doughdangoball" - }, - { - "name": "rawnoodles" - } - ] -} diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/ingredients.rsi/rawnoodles.png b/Resources/Textures/Corvax/Objects/Consumable/Food/japanfood.rsi/ingredients.rsi/rawnoodles.png deleted file mode 100644 index b6c64c07c8116471482c844c1b1fde45007daddd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 524 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^TXLn2z= zPTB9xlqhq|-ZfgVv4D5h!W4-VUB@dGr+NPh@_9O62w3e~Se)w^=v@83fyLdKqiM37 zik8|lPFa>zvtyUx{=pKIgeCU~d_owPSLJCzdaZB;L5c_y@` zRLxEB{_XpVGG@348;Y5UCmJ!m&+S<)bJ3+I?CrtLZob)nj~(3kI6X;&dDpa(O~*u+*}Dh+vP)gqx@5Ag^)IiID$Xz7w`;d(NU3GNGP+!xXufuZ)ApbTF8ldT zJ+J3<{q#Qb$j)+Y)~>dfD^HwXoN1z4p8N1$Yj;ug7V8UdzMPP&pPRWoXu-Von>KW6 z|C=osSho5zo5Sy~hr??USdCV8Y~E+`_~-Pf&R{)Lo3~fIWNvS&ta@iCJ&WnV%bnsg zY&I}4Y+k52Wy7OytqTkk1s-`tER4xYD80utnfn+!uT~=K?M<4~rEW}n+tt0~k@hpL z=EGgi2fSx^y8ip}iC0^1A}}-?{59rY&7ZEn{2?$B`BEc1(|mmyw18|5AO?X;!IMFh Mr>mdKI;Vst0EB_yRR910 From 8bce73e551f594d108f5b545e64db969ab998aee Mon Sep 17 00:00:00 2001 From: Chocosasel Date: Fri, 28 Jun 2024 19:34:49 +0400 Subject: [PATCH 35/43] Add files via upload --- .../Food/ingredients.rsi/doughdangoball.png | Bin 0 -> 270 bytes .../Consumable/Food/ingredients.rsi/meta.json | 17 +++++++++++++++++ .../Food/ingredients.rsi/rawnoodles.png | Bin 0 -> 524 bytes 3 files changed, 17 insertions(+) create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/doughdangoball.png create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/meta.json create mode 100644 Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/rawnoodles.png diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/doughdangoball.png b/Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/doughdangoball.png new file mode 100644 index 0000000000000000000000000000000000000000..61607a9a45f28ab1c77e512d6646fd81ca9e4b07 GIT binary patch literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}>pWc?Ln2y} z6C_v{Cy4Yk1sYspRNg5yJ!I)W`^uke%s_DX$=UXkX6-qr=jY7+{r~aHxBuRlooL-+%8rWmof;}X#2e5nzhX}-P;T0k}j5QD&_;K?A$)78&qol`;+ E0GKgn(*OVf literal 0 HcmV?d00001 diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/meta.json b/Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/meta.json new file mode 100644 index 00000000000..e5fa349e863 --- /dev/null +++ b/Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Fills created by potato1234_x", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "doughdangoball" + }, + { + "name": "rawnoodles" + } + ] +} diff --git a/Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/rawnoodles.png b/Resources/Textures/Corvax/Objects/Consumable/Food/ingredients.rsi/rawnoodles.png new file mode 100644 index 0000000000000000000000000000000000000000..b6c64c07c8116471482c844c1b1fde45007daddd GIT binary patch literal 524 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^TXLn2z= zPTB9xlqhq|-ZfgVv4D5h!W4-VUB@dGr+NPh@_9O62w3e~Se)w^=v@83fyLdKqiM37 zik8|lPFa>zvtyUx{=pKIgeCU~d_owPSLJCzdaZB;L5c_y@` zRLxEB{_XpVGG@348;Y5UCmJ!m&+S<)bJ3+I?CrtLZob)nj~(3kI6X;&dDpa(O~*u+*}Dh+vP)gqx@5Ag^)IiID$Xz7w`;d(NU3GNGP+!xXufuZ)ApbTF8ldT zJ+J3<{q#Qb$j)+Y)~>dfD^HwXoN1z4p8N1$Yj;ug7V8UdzMPP&pPRWoXu-Von>KW6 z|C=osSho5zo5Sy~hr??USdCV8Y~E+`_~-Pf&R{)Lo3~fIWNvS&ta@iCJ&WnV%bnsg zY&I}4Y+k52Wy7OytqTkk1s-`tER4xYD80utnfn+!uT~=K?M<4~rEW}n+tt0~k@hpL z=EGgi2fSx^y8ip}iC0^1A}}-?{59rY&7ZEn{2?$B`BEc1(|mmyw18|5AO?X;!IMFh Mr>mdKI;Vst0EB_yRR910 literal 0 HcmV?d00001 From 9f588306d6f4c6aec9ae0ca85b9f72055c5d7cd2 Mon Sep 17 00:00:00 2001 From: Dmitriy <108795395+Sh1ntra@users.noreply.github.com> Date: Fri, 28 Jun 2024 19:27:33 +0300 Subject: [PATCH 36/43] Update hanamidango.yml --- .../Objects/Consumable/Food/JapanFood/hanamidango.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml index f0121078605..c0a89d51b79 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml @@ -1,5 +1,5 @@ - type: entity - name: Tricolor Dango + name: трёхцветное данго parent: FoodBakedBase id: hanamidango description: You like that colors, don't you? @@ -16,4 +16,4 @@ maxVol: 20 reagents: - ReagentId: Nutriment - Quantity: 15 \ No newline at end of file + Quantity: 15 From 04af34b2e40736b978952e4ee5cca8962fdbcbb5 Mon Sep 17 00:00:00 2001 From: Dmitriy <108795395+Sh1ntra@users.noreply.github.com> Date: Fri, 28 Jun 2024 19:29:32 +0300 Subject: [PATCH 37/43] Update mitarasidango.yml --- .../Objects/Consumable/Food/JapanFood/mitarasidango.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/mitarasidango.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/mitarasidango.yml index c57264538cb..c152530afa2 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/mitarasidango.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/mitarasidango.yml @@ -1,8 +1,8 @@ - type: entity - name: Mitarashi Dango + name: митараши данго parent: FoodBakedBase id: mitarashidango - description: Rice sweetness that beckons + description: Рисовая сладость, манящая за собой components: - type: Item storedRotation: -90 @@ -16,4 +16,4 @@ maxVol: 20 reagents: - ReagentId: Nutriment - Quantity: 15 \ No newline at end of file + Quantity: 15 From 7c13161dbdae1cde9d4b0554d37a7049e5234e89 Mon Sep 17 00:00:00 2001 From: Dmitriy <108795395+Sh1ntra@users.noreply.github.com> Date: Fri, 28 Jun 2024 19:30:10 +0300 Subject: [PATCH 38/43] Update hanamidango.yml --- .../Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml index c0a89d51b79..7de170df938 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/hanamidango.yml @@ -2,7 +2,7 @@ name: трёхцветное данго parent: FoodBakedBase id: hanamidango - description: You like that colors, don't you? + description: Похоже что тебе нравятся разные цвета, не так ли? components: - type: Item storedRotation: -90 From aa3b6c9de57e7fa8c08a7f4e82c42419ec5a99d7 Mon Sep 17 00:00:00 2001 From: Dmitriy <108795395+Sh1ntra@users.noreply.github.com> Date: Fri, 28 Jun 2024 19:31:45 +0300 Subject: [PATCH 39/43] Update onigiri.yml --- .../Entities/Objects/Consumable/Food/JapanFood/onigiri.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/onigiri.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/onigiri.yml index c37070ca7fe..1dd3317dbc9 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/onigiri.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/onigiri.yml @@ -1,8 +1,8 @@ - type: entity - name: Onigiri + name: онигири parent: FoodBakedBase id: onigiri - description: Best fried geometric shape in the galaxy + description: Лучший рис в галактике! components: - type: Item storedRotation: -90 @@ -16,4 +16,4 @@ maxVol: 25 reagents: - ReagentId: Nutriment - Quantity: 20 \ No newline at end of file + Quantity: 20 From 2343d843a88e171a5c7437d86663050059ab7835 Mon Sep 17 00:00:00 2001 From: Dmitriy <108795395+Sh1ntra@users.noreply.github.com> Date: Fri, 28 Jun 2024 19:32:47 +0300 Subject: [PATCH 40/43] Update porkramennoodles.yml --- .../Objects/Consumable/Food/JapanFood/porkramennoodles.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/porkramennoodles.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/porkramennoodles.yml index a610145ea8a..2baf9251484 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/porkramennoodles.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/porkramennoodles.yml @@ -1,8 +1,8 @@ - type: entity - name: Pork Ramen + name: свиной рамэн parent: FoodBowlBase id: porkramennoodles - description: Ah, I See You're a Man of Culture As Well... + description: Оу, да я вижу вы человек высокой культуры... components: - type: Item - type: Food @@ -25,4 +25,4 @@ - type: Tag tags: - Meat - - Soup \ No newline at end of file + - Soup From d0e34c86cde0be10ce2b68159fbcc514b9eb03a9 Mon Sep 17 00:00:00 2001 From: Dmitriy <108795395+Sh1ntra@users.noreply.github.com> Date: Fri, 28 Jun 2024 19:33:31 +0300 Subject: [PATCH 41/43] Update spicyporkramen.yml --- .../Objects/Consumable/Food/JapanFood/spicyporkramen.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/spicyporkramen.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/spicyporkramen.yml index aaf76defda6..c9498a2da05 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/spicyporkramen.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/spicyporkramen.yml @@ -1,8 +1,8 @@ - type: entity - name: Spicy Ramen + name: острый рамэн parent: FoodBowlBase id: spicyporkramennoodles - description: So hot and so cute! + description: Выглядит так горячо... И так аппетитно! components: - type: Item - type: Food @@ -27,4 +27,4 @@ - type: Tag tags: - Meat - - Soup \ No newline at end of file + - Soup From 6d793761ed69679f1a1458f8c2409dc746bb2a75 Mon Sep 17 00:00:00 2001 From: Dmitriy <108795395+Sh1ntra@users.noreply.github.com> Date: Fri, 28 Jun 2024 19:34:48 +0300 Subject: [PATCH 42/43] Update dangodough.yml --- .../Consumable/Food/JapanFood/Ingredients/dangodough.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/dangodough.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/dangodough.yml index 5ffe3c7b2af..6fec93ae645 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/dangodough.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/dangodough.yml @@ -1,12 +1,12 @@ - type: entity - name: Dough Dango Ball + name: шарик данго parent: FoodBakingBase id: Doughdangoball - description: A ball of dough. + description: Выглядит как шарик из теста. components: - type: FlavorProfile flavors: - dough - type: Sprite sprite: Corvax/Objects/Consumable/Food/ingredients.rsi - state: doughdangoball \ No newline at end of file + state: doughdangoball From 7bbf88501b1386902ee57d10963d851a25d93ade Mon Sep 17 00:00:00 2001 From: Dmitriy <108795395+Sh1ntra@users.noreply.github.com> Date: Fri, 28 Jun 2024 19:35:11 +0300 Subject: [PATCH 43/43] Update rawramennoodles.yml --- .../Food/JapanFood/Ingredients/rawramennoodles.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/rawramennoodles.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/rawramennoodles.yml index 2f0a29fa3e4..ec389ea0e06 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/rawramennoodles.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/JapanFood/Ingredients/rawramennoodles.yml @@ -1,10 +1,10 @@ - type: entity - name: Raw Ramen Noodles + name: сухая лапша для рамэна parent: FoodBakingBase id: rawnoodles - description: A raw ramen. + description: Сухая лапша. components: - type: FlavorProfile - type: Sprite sprite: Corvax/Objects/Consumable/Food/ingredients.rsi - state: rawnoodles \ No newline at end of file + state: rawnoodles