From 0d78b6d72d3fcd3931fa3280e38f42265424f0e0 Mon Sep 17 00:00:00 2001 From: Ady4ik Date: Wed, 16 Oct 2024 10:57:45 +0300 Subject: [PATCH 1/4] The first of all father soup --- .../Objects/Consumable/Food/produce.yml | 15 +++++++++- .../Entities/Objects/Consumable/Food/soup.yml | 30 +++++++++++++++++-- .../Objects/Specific/foodcontainers.yml | 13 ++++++++ .../Prototypes/SS220/Flavors/flavors.yml | 7 ++++- .../SS220/Recipes/Cooking/meal_recipes.yml | 23 ++++++++++++-- .../Consumable/Food/cauldron.rsi/meta.json | 0 6 files changed, 80 insertions(+), 8 deletions(-) create mode 100644 Resources/Prototypes/SS220/Entities/Objects/Specific/foodcontainers.yml create mode 100644 Resources/Textures/SS220/Objects/Consumable/Food/cauldron.rsi/meta.json diff --git a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/produce.yml index 0bd82b6112ab0b..ceb79ce5cfdd21 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/produce.yml @@ -25,7 +25,7 @@ reagents: - ReagentId: JuiceBeet Quantity: 10 - + - type: entity name: сноп мясопшеницы description: Эх... мясопшеница... стоп, что? @@ -52,3 +52,16 @@ - type: Tag tags: - Meatwheat + +- type: entity + name: Призрачный чили перец + description: Призрачный чили перец? А как мне из него готовить, если я его не вижу? + id: GhostChiliPepper + parent: ProduceBase + components: + - type: Sprite + sprite: SS220/Objects/Specific/Hydroponics/ghostchilipepper.rsi + - type: SolutionContainerManager + solutions: + - ReagentId: Nutriment + Quantity: 5 diff --git a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/soup.yml index 1eef2f907ed683..e15bd51550f51f 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/soup.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/soup.yml @@ -68,13 +68,13 @@ - ReagentId: Nutriment Quantity: 10 - ReagentId: Vitamin - Quantity: 5 + Quantity: 5 - type: entity name: винегрет parent: FoodBowlBase id: FoodSaladVinaigrette - description: Кладезь витаминов и микроэлементов. А почему тут нет вина? + description: Кладезь витаминов и микроэлементов. А почему тут нет вина? components: - type: FlavorProfile flavors: @@ -92,4 +92,28 @@ - ReagentId: Nutriment Quantity: 10 - ReagentId: Vitamin - Quantity: 5 + Quantity: 5 + +- type: entity + name: Суп космического отца + id: FoodFatherSoup + parent: FoodBowlBase + description: Суп придает настолько много сил, что его пришлось поместить в чан. Наверное мне стоит его съесть? + components: + - type: FlavorProfile + flavors: + - fatherSoup + - type: Sprite + sprite: SS220/Objects/Consumable/Food/cauldron.rsi + layers: + - state: cauldron + - state: fathersoup + - type: SolutionContainerManager + solutions: + food: + maxVol: 25 + reagents: + - ReagentId: Nutriment + Quantity: 15 + - ReagentId: Protein + Quantity: 10 diff --git a/Resources/Prototypes/SS220/Entities/Objects/Specific/foodcontainers.yml b/Resources/Prototypes/SS220/Entities/Objects/Specific/foodcontainers.yml new file mode 100644 index 00000000000000..97b58120ff7b3e --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Objects/Specific/foodcontainers.yml @@ -0,0 +1,13 @@ +- type: entity + parent: FoodBowlBig + id: FoodCauldron + name: Чан + description: Большой чан для готовки. Поместится много еды, осталось только приготовить. + components: + - type: Sprite + sprite: SS220/Objects/Consumable/Food/cauldron.rsi + layers: + - state: cauldron + - map: ["enum.SolutionContainerLayers.Fill"] + state: fill-1 + visible: false diff --git a/Resources/Prototypes/SS220/Flavors/flavors.yml b/Resources/Prototypes/SS220/Flavors/flavors.yml index 34995c6757be16..3e67985adfd2a1 100644 --- a/Resources/Prototypes/SS220/Flavors/flavors.yml +++ b/Resources/Prototypes/SS220/Flavors/flavors.yml @@ -41,4 +41,9 @@ - type: flavor id: french75 flavorType: Complex - description: терпко-сладко \ No newline at end of file + description: терпко-сладко + +- type: flavor + id: fatherSoup + flavorType: Complex + description: diff --git a/Resources/Prototypes/SS220/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/SS220/Recipes/Cooking/meal_recipes.yml index 87d9a673e8b274..bae3c13dee2dfa 100644 --- a/Resources/Prototypes/SS220/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/SS220/Recipes/Cooking/meal_recipes.yml @@ -4,7 +4,7 @@ result: FoodCheburek time: 15 reagents: - TableSalt: 5 + TableSalt: 5 solids: FoodDough: 1 FoodMeatCutlet: 1 @@ -16,7 +16,7 @@ result: FoodShawarma time: 15 reagents: - Mayo: 5 + Mayo: 5 solids: FoodDough: 1 FoodMeatChicken: 1 @@ -70,7 +70,7 @@ result: FoodSoupOkroshkaKvass time: 10 reagents: - Kvass: 10 + Kvass: 10 solids: FoodBowlBig: 1 FoodMeatChicken: 1 @@ -154,3 +154,20 @@ FoodChiliPepper: 1 FoodCheeseSlice: 1 #SS220 Nachos-recipe end + +- type: microwaveMealRecipe + id: RecipeFatherSoup + name: father soup recipe + result: FoodFatherSoup + time: 30 + reagents: + Blackpepper: 5 + Flour: 10 + solids: + FoodSoupTomato: 1 + FoodGarlic: 1 + FoodOnion: 1 + FoodTomato: 1 +# GhostChiliPepper: 2 +# Сauldron: 1 + diff --git a/Resources/Textures/SS220/Objects/Consumable/Food/cauldron.rsi/meta.json b/Resources/Textures/SS220/Objects/Consumable/Food/cauldron.rsi/meta.json new file mode 100644 index 00000000000000..e69de29bb2d1d6 From 28048d7f87d182b3b5297d24106908400b400eca Mon Sep 17 00:00:00 2001 From: Ady4ik Date: Thu, 21 Nov 2024 14:12:18 +0300 Subject: [PATCH 2/4] few changes --- .../Entities/Objects/Consumable/Food/soup.yml | 2 +- .../Objects/Specific/foodcontainers.yml | 6 ++--- .../Consumable/Food/cauldron.rsi/cauldron.png | Bin 0 -> 680 bytes .../Food/cauldron.rsi/father_soup.png | Bin 0 -> 1596 bytes .../Consumable/Food/cauldron.rsi/meta.json | 25 ++++++++++++++++++ 5 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 Resources/Textures/SS220/Objects/Consumable/Food/cauldron.rsi/cauldron.png create mode 100644 Resources/Textures/SS220/Objects/Consumable/Food/cauldron.rsi/father_soup.png diff --git a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/soup.yml index e15bd51550f51f..bd17f75e4dd1ff 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/soup.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/soup.yml @@ -107,7 +107,7 @@ sprite: SS220/Objects/Consumable/Food/cauldron.rsi layers: - state: cauldron - - state: fathersoup + - state: father_soup - type: SolutionContainerManager solutions: food: diff --git a/Resources/Prototypes/SS220/Entities/Objects/Specific/foodcontainers.yml b/Resources/Prototypes/SS220/Entities/Objects/Specific/foodcontainers.yml index 97b58120ff7b3e..c565923d9f0bb0 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Specific/foodcontainers.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Specific/foodcontainers.yml @@ -8,6 +8,6 @@ sprite: SS220/Objects/Consumable/Food/cauldron.rsi layers: - state: cauldron - - map: ["enum.SolutionContainerLayers.Fill"] - state: fill-1 - visible: false +# - map: ["enum.SolutionContainerLayers.Fill"] +# state: fill-1 +# visible: false diff --git a/Resources/Textures/SS220/Objects/Consumable/Food/cauldron.rsi/cauldron.png b/Resources/Textures/SS220/Objects/Consumable/Food/cauldron.rsi/cauldron.png new file mode 100644 index 0000000000000000000000000000000000000000..bda008c452ee26abc05ed3e935b4d39c80956663 GIT binary patch literal 680 zcmV;Z0$2TsP)Px%NJ&INR9J=Wl`(7EKp2MKtK}#@+Xt2#7lVjWPukPafPY1y&?yke(yc>(M}}-! z3Wfd_7X{P(mQt>$1X3)Ovm|gV=Q`LDvgEi{ap~e`k#wK#dtZI`-3i#SW5<7ntMtYsL)_q-(& zse!C`S+O#v@+O{SU-*~ez`Tn2>T1c&5BEE&)hfBZx?H)|Z{NKyC3byvxpLfk-XqiL zG<_xjVB0n*rHGznBv_TO3_^%B zhY&)wj5YxlJ&+X_-@X>M=C%lekaW5xPEPyqy^#VkJ<#cz2*+}1eYVYmQn;T?$S?0_ z+Gpu5xVv>x-P2K{6uPdHvTME$Ap~??Cl9k2)B6cJT{DfP20C36d%CXL?WZVp17|7x_Y#D7bbOuQusDp!NHk9INDOH$_SbP18sm z$M|alc@t#}Y$Cp6#|{Aa4fFpTYt{sn6#xJL4rN$LW=%~1DgXcg2mk;800000(o>TF O0000Px)+(|@1RCt{2nonpHR~*N`v)N>lF&UFhlQePJNrTia=9WZ+kQ7QwNwJ3#q4f|I z6msav9)n;lHHAX4mx3v^)Z}02^Qur1JOdLO98K}8MMkcKpmJSzP$z1_~-~KuZ02mj?g*jYw zeeP-VP2QL|egbWQ08+`M1$N-lMI3^FYcOz#d5qL=&Ynl8H;m5FG3@_fw+TKjjspPN z0s$eFOk(akdneR_Pe)?mpIrKu-f(mFJO+=RvP||G47@!1B?gb4GEL&x4p;6{8bcnZHi!WD-s*#7+W$VCR5Z@J(Cb?Xh zD2ifvFdmQF4(KGeF(gS6bX`X*7DKK1zO4r6x^5_nf}w-MCfL%{C>>By6r^V+Jj+gS z(x>aX(H3Z@eQtc#AofZm5=bNxj`dRcJ^&Qn*&Rgu{vW1ysegLj^p z%4D)aXLk@o2ZxbLu0A=SxbWT7)F>emi8$6v;nQ9dCP-KQ==wF^iR*@ z*5SR6JMTTft;2g!|7s6)0=c(Xj|>AFxty?;{MWM2-S|#=xUK^LHJa3&WXJcB!pgFW z`UVkAk_1r{1@<*$S2xcX%wDA3&iHsd4p9_^N1FxYH*)Cg4qEPU<2z|jPmo?`&R)Qo zvlpnqS4;|672ql$*L2Bi$&VWn^C+43;?0tK4dfYCps@a zt4Jh*Jw0Y8elzna0N~{0Y3dZ#5l(zR0JH_#h3Mh}*@s3)N0;#H;x86(;EOo^dG|GH zFsuB%2LOPst9P(8Gl7=LIr^)rDh39J(AXpyjZG4wiwkHAw9~y_DxXy{nY6Th{@F*S zdQ+nW0Iqx=0Hl(ukR*w|cK$lSc<=E0P*oKGke->Kzg<`FpzG=#*mRunbUK zCo#8?krCTE5s4O)`25yH3^p{j9e%lT;(O)?5F_kj{$BC<;!t_D^8?D29p4lkc8bsU zPtRKtB>?C6JaJa>GbBF0vTTj{Z6`mVT-ovIL1<-JMQfk~O_BsXn-SvixS=SDDFei0 z(3m+yeRA?NfX89#zsJr!ZX6lG($pwgCg&{i`Qkn8#IJ_z@&gFpGe3YB&aQlF>|Dw5 z`P7y(s+k|K9aWScK!Tv`npG=4UkblcRh%EdhPr2Y5|@=LhiofahEP1DDVC uaEr!ovj6}94rN$LW=%~1DgXcg2mk;800000(o>TF0000 Date: Fri, 6 Dec 2024 22:51:44 +0300 Subject: [PATCH 3/4] Edited version --- .../Entities/Objects/Consumable/Food/soup.yml | 32 +++++++++++++++- .../Objects/Specific/foodcontainers.yml | 3 -- .../Prototypes/SS220/Flavors/flavors.yml | 7 +++- .../SS220/Recipes/Cooking/meal_recipes.yml | 4 +- .../Consumable/Food/cauldron.rsi/cauldron.png | Bin 680 -> 513 bytes .../Consumable/Food/cauldron.rsi/father.png | Bin 0 -> 355 bytes .../Food/cauldron.rsi/father_soup.png | Bin 1596 -> 0 bytes .../Consumable/Food/cauldron.rsi/meta.json | 36 +++++++----------- .../Hydroponics/ghost_peppers.rsi/meta.json | 14 +++++++ .../Hydroponics/ghost_peppers.rsi/produce.png | Bin 0 -> 397 bytes .../Specific/ghost_peppers.rsi/meta.json | 14 +++++++ .../Specific/ghost_peppers.rsi/produce.png | Bin 0 -> 397 bytes 12 files changed, 80 insertions(+), 30 deletions(-) create mode 100644 Resources/Textures/SS220/Objects/Consumable/Food/cauldron.rsi/father.png delete mode 100644 Resources/Textures/SS220/Objects/Consumable/Food/cauldron.rsi/father_soup.png create mode 100644 Resources/Textures/SS220/Objects/Specific/Hydroponics/ghost_peppers.rsi/meta.json create mode 100644 Resources/Textures/SS220/Objects/Specific/Hydroponics/ghost_peppers.rsi/produce.png create mode 100644 Resources/Textures/SS220/Objects/Specific/ghost_peppers.rsi/meta.json create mode 100644 Resources/Textures/SS220/Objects/Specific/ghost_peppers.rsi/produce.png diff --git a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/soup.yml index bd17f75e4dd1ff..be8ffe4396628d 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/soup.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/soup.yml @@ -95,7 +95,7 @@ Quantity: 5 - type: entity - name: Суп космического отца + name: cуп Космического Отца id: FoodFatherSoup parent: FoodBowlBase description: Суп придает настолько много сил, что его пришлось поместить в чан. Наверное мне стоит его съесть? @@ -107,7 +107,7 @@ sprite: SS220/Objects/Consumable/Food/cauldron.rsi layers: - state: cauldron - - state: father_soup + - state: father - type: SolutionContainerManager solutions: food: @@ -117,3 +117,31 @@ Quantity: 15 - ReagentId: Protein Quantity: 10 + - type: Food + trash: + - FoodCauldron + - type: Tag + tags: + - Meat + +- type: entity + name: Призрачный чили перец + description: Призрачный чили перец? А как мне из него готовить, если я его не вижу? + id: GhostChiliPepper + parent: FoodProduceBase + components: + - type: Sprite + sprite: SS220/Objects/Specific/Hydroponics/ghost_peppers.rsi + state: produce + - type: FlavorProfile + flavors: + - ghostChili + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 5 + - type: StaticPrice + price: 500 #It has so much Omnizin in it + diff --git a/Resources/Prototypes/SS220/Entities/Objects/Specific/foodcontainers.yml b/Resources/Prototypes/SS220/Entities/Objects/Specific/foodcontainers.yml index c565923d9f0bb0..5ba1c481f1a11c 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Specific/foodcontainers.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Specific/foodcontainers.yml @@ -8,6 +8,3 @@ sprite: SS220/Objects/Consumable/Food/cauldron.rsi layers: - state: cauldron -# - map: ["enum.SolutionContainerLayers.Fill"] -# state: fill-1 -# visible: false diff --git a/Resources/Prototypes/SS220/Flavors/flavors.yml b/Resources/Prototypes/SS220/Flavors/flavors.yml index 3e67985adfd2a1..d0618676a4f6aa 100644 --- a/Resources/Prototypes/SS220/Flavors/flavors.yml +++ b/Resources/Prototypes/SS220/Flavors/flavors.yml @@ -46,4 +46,9 @@ - type: flavor id: fatherSoup flavorType: Complex - description: + description: умопомрачительно, ослепительно, бурно, мощно + +- type: flavor + id: ghostChili + flavorType: Complex + description: призрачно остро diff --git a/Resources/Prototypes/SS220/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/SS220/Recipes/Cooking/meal_recipes.yml index bae3c13dee2dfa..7117e830ff9dcb 100644 --- a/Resources/Prototypes/SS220/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/SS220/Recipes/Cooking/meal_recipes.yml @@ -168,6 +168,6 @@ FoodGarlic: 1 FoodOnion: 1 FoodTomato: 1 -# GhostChiliPepper: 2 -# Сauldron: 1 + GhostChiliPepper: 2 + Сauldron: 1 diff --git a/Resources/Textures/SS220/Objects/Consumable/Food/cauldron.rsi/cauldron.png b/Resources/Textures/SS220/Objects/Consumable/Food/cauldron.rsi/cauldron.png index bda008c452ee26abc05ed3e935b4d39c80956663..9aa38b8261117734c97a52c06d4412181cec6b3f 100644 GIT binary patch delta 475 zcmV<10VMvY1%U*RFn1wtQwSD<*eq-lSxExx6)D6@JB9PG zNaxvTmnxMYSQrICu(A;>)J97SvC+yCh`I2 znV3~$-$_IrXxmu{(AWPBfZd(VNOQGC6`q+Z)PLSHDbjsuEX$Mt%f*F; zj5O5QwzKkkZVUh+TrA53Ad~9F&ZKZkWmc9}ah&te^M>xI#E%cp05FoqI|HS1ML#!U zq9uy>XYB3&VrH(OOZ6oNptiDR5NKd0^t!=uxO@>AWcz)_AR;yPFej1}eq@ml@7cu^0_`^9-ef$W_0dMVvaP{`?Y^-u|d4W?ZYjcX+)TAEk zSEf(~-qNjZ9hJB;Y&$De><01okkqB2Xa5BrDd7=0#c$XD^5=jns*(0nJvysZ|F2C91|0xcm=yMv%Di% RsYL()002ovPDHLkV1kpT;#L3v delta 643 zcmV-}0(|{}1gHg&FnBjE7>3`gEdURbf4~fUw!x8 z3D~h?$A5<82hPqf3NJO948d5cGKm{aMuM>{jDPz0;c)|J=YJPy83ugMD~KJxJT0S- zFE>tMtYsL)_q-(&se!C`S+O#v@+O{SU-*~ez`Tn2>T1c&5BEE&)hfBZx?H)|Z{NKy zC3byvxpLfk-XqiLG<_xjVB0n*rHGznBv_TO41Yq1G=~sEwTw0a7Cn#^7vH`Xw&u17f{=8&CQeTK@V$`&GCk1gnh3{o zX??cMgHpJkOvo?qXWD1!F1WjOQQgx~qZGQXld@~R4j}||T_+E-7}NU+I$bl3r3N}( z6MMR@+U=((b>wY`0&sZLLm0^7Hf$MfGIRz>AE<+aXMg0z`Mfo8*L89H;spCOs`hIX zLuY`cCiJ}#D5YuHwF*(MUcZ6sx?2(N_xm_J>Z!Y1Hx>82(Oe4vIOni!JFNtOrFGf{ zLuUYBeg^p72%K{OnI7PrW8sQ486(MrEK(N#ZkxoCCIpZkKnW}NylvZ%QerlnAq+!h znkJ-_V0?@fu6gln%ynJV>vdA8RKOTp5?*T{q0wjnfMSfLiSt6MNMegP34-8JjXxUD zG!1batK@4pMM?=x(?}f0_-g}s6J-o+BEDnC4gmNK^Zy)c)&!Lm0000EWmrjOO-%qQ d00008000000002eQ0xc^d-hAdi`Z=76Y-&0XY-5`8!NuIaQ;uV+iWD^ z=buoKt$6f7egEXd{c|7u*IcFZ-_x{TCEPzS^{4#a|BQz>?=F{&yUJ$pXL3SvzyzU$ zgpK7%2|!@*|M;m5HII_mjyu2aG@JfJz#?POsSWl=XF9GlXmWJ)YDoNjZ8y*NU*QH3 zt2~T#=I@x{c+R6o<+Df80cB;+HfFj1k~O=7B+vZcXcQCovBNQX(sV_uJyRaO{*=#C z&~ZokQ3Wq8~+EnE`Gv+kNXY7`kt6LOmzOSdeuLW u;C^$TIdx+FO@RhnZU;4hq0w-QfnkDD*z@-;adUv7#^CAd=d#Wzp$PzE5Sp0) literal 0 HcmV?d00001 diff --git a/Resources/Textures/SS220/Objects/Consumable/Food/cauldron.rsi/father_soup.png b/Resources/Textures/SS220/Objects/Consumable/Food/cauldron.rsi/father_soup.png deleted file mode 100644 index 45a0875bad8973d759250786f36c1001d89dcd97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1596 zcmV-C2E+M@P)Px)+(|@1RCt{2nonpHR~*N`v)N>lF&UFhlQePJNrTia=9WZ+kQ7QwNwJ3#q4f|I z6msav9)n;lHHAX4mx3v^)Z}02^Qur1JOdLO98K}8MMkcKpmJSzP$z1_~-~KuZ02mj?g*jYw zeeP-VP2QL|egbWQ08+`M1$N-lMI3^FYcOz#d5qL=&Ynl8H;m5FG3@_fw+TKjjspPN z0s$eFOk(akdneR_Pe)?mpIrKu-f(mFJO+=RvP||G47@!1B?gb4GEL&x4p;6{8bcnZHi!WD-s*#7+W$VCR5Z@J(Cb?Xh zD2ifvFdmQF4(KGeF(gS6bX`X*7DKK1zO4r6x^5_nf}w-MCfL%{C>>By6r^V+Jj+gS z(x>aX(H3Z@eQtc#AofZm5=bNxj`dRcJ^&Qn*&Rgu{vW1ysegLj^p z%4D)aXLk@o2ZxbLu0A=SxbWT7)F>emi8$6v;nQ9dCP-KQ==wF^iR*@ z*5SR6JMTTft;2g!|7s6)0=c(Xj|>AFxty?;{MWM2-S|#=xUK^LHJa3&WXJcB!pgFW z`UVkAk_1r{1@<*$S2xcX%wDA3&iHsd4p9_^N1FxYH*)Cg4qEPU<2z|jPmo?`&R)Qo zvlpnqS4;|672ql$*L2Bi$&VWn^C+43;?0tK4dfYCps@a zt4Jh*Jw0Y8elzna0N~{0Y3dZ#5l(zR0JH_#h3Mh}*@s3)N0;#H;x86(;EOo^dG|GH zFsuB%2LOPst9P(8Gl7=LIr^)rDh39J(AXpyjZG4wiwkHAw9~y_DxXy{nY6Th{@F*S zdQ+nW0Iqx=0Hl(ukR*w|cK$lSc<=E0P*oKGke->Kzg<`FpzG=#*mRunbUK zCo#8?krCTE5s4O)`25yH3^p{j9e%lT;(O)?5F_kj{$BC<;!t_D^8?D29p4lkc8bsU zPtRKtB>?C6JaJa>GbBF0vTTj{Z6`mVT-ovIL1<-JMQfk~O_BsXn-SvixS=SDDFei0 z(3m+yeRA?NfX89#zsJr!ZX6lG($pwgCg&{i`Qkn8#IJ_z@&gFpGe3YB&aQlF>|Dw5 z`P7y(s+k|K9aWScK!Tv`npG=4UkblcRh%EdhPr2Y5|@=LhiofahEP1DDVC uaEr!ovj6}94rN$LW=%~1DgXcg2mk;800000(o>TF0000Px$M@d9MR9J=Wlf6sBP!z>aY7t650#Zup+g(x%;wGlx;@}#=MOVk-BIrdBLFy`k z|Ak2$+>1?C2~?^ygIh#GCuy7{&nX>Td}-<;?>F5G_ug~v`v4>oiR3?0H#@v;cDP7w z{x1yVmTM?9nOJRBvBuK{|Ctw>43Xst^=Cc-?uSzo$=08ihj-&z5$P8y`VEzcNB+pI zovm&Fz}w2H@Z8K-pc3&SEA?xeYjJq)xv?Ln>d$PT$V&Z|rjL_+A?3(S22>*6()96Q z=v1R%(guLQxKfyTDD(w0p%U?f=NG$i(|u5hcz(xlW|@=v5voKS0CxBG@9ul{QWQ+u zkw0?3ZcTme1}b#IKf0Gn5(B{c*0u!zgP~ImdylzUg@p_NK$(ttnN`rz^rPx$M@d9MR9J=Wlf6sBP!z>aY7t650#Zup+g(x%;wGlx;@}#=MOVk-BIrdBLFy`k z|Ak2$+>1?C2~?^ygIh#GCuy7{&nX>Td}-<;?>F5G_ug~v`v4>oiR3?0H#@v;cDP7w z{x1yVmTM?9nOJRBvBuK{|Ctw>43Xst^=Cc-?uSzo$=08ihj-&z5$P8y`VEzcNB+pI zovm&Fz}w2H@Z8K-pc3&SEA?xeYjJq)xv?Ln>d$PT$V&Z|rjL_+A?3(S22>*6()96Q z=v1R%(guLQxKfyTDD(w0p%U?f=NG$i(|u5hcz(xlW|@=v5voKS0CxBG@9ul{QWQ+u zkw0?3ZcTme1}b#IKf0Gn5(B{c*0u!zgP~ImdylzUg@p_NK$(ttnN`rz^r Date: Fri, 6 Dec 2024 23:02:31 +0300 Subject: [PATCH 4/4] Remove smth add smth --- .../VendingMachines/Inventories/dinnerware.yml | 1 + .../Entities/Objects/Consumable/Food/soup.yml | 2 ++ .../SS220/Recipes/Cooking/meal_recipes.yml | 2 +- .../Objects/Specific/ghost_peppers.rsi/meta.json | 14 -------------- .../Specific/ghost_peppers.rsi/produce.png | Bin 397 -> 0 bytes 5 files changed, 4 insertions(+), 15 deletions(-) delete mode 100644 Resources/Textures/SS220/Objects/Specific/ghost_peppers.rsi/meta.json delete mode 100644 Resources/Textures/SS220/Objects/Specific/ghost_peppers.rsi/produce.png diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml index 046607f21aa216..2c0abb77c27df5 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml @@ -27,3 +27,4 @@ DrinkMugOne: 1 DrinkMugRainbow: 2 DrinkMugRed: 2 + FoodCauldron: 2 # SS220 Fist of all FatherSoup diff --git a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/soup.yml index be8ffe4396628d..01f45876dbf0d6 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/soup.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/soup.yml @@ -142,6 +142,8 @@ reagents: - ReagentId: Nutriment Quantity: 5 + - type: Produce + seedId: chili - type: StaticPrice price: 500 #It has so much Omnizin in it diff --git a/Resources/Prototypes/SS220/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/SS220/Recipes/Cooking/meal_recipes.yml index d2e26bc846dc25..576883597c82c0 100644 --- a/Resources/Prototypes/SS220/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/SS220/Recipes/Cooking/meal_recipes.yml @@ -168,7 +168,7 @@ FoodGarlic: 1 FoodOnion: 1 FoodTomato: 1 - GhostChiliPepper: 2 + FoodChiliPepper: 2 Сauldron: 1 #SS220 Spicy UPD start diff --git a/Resources/Textures/SS220/Objects/Specific/ghost_peppers.rsi/meta.json b/Resources/Textures/SS220/Objects/Specific/ghost_peppers.rsi/meta.json deleted file mode 100644 index 2aa53da3dd4466..00000000000000 --- a/Resources/Textures/SS220/Objects/Specific/ghost_peppers.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 1, - "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", - "copyright": "Sprited by Estkemran (Github) for SS220", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "produce" - } - ] -} diff --git a/Resources/Textures/SS220/Objects/Specific/ghost_peppers.rsi/produce.png b/Resources/Textures/SS220/Objects/Specific/ghost_peppers.rsi/produce.png deleted file mode 100644 index 9491c2d92759156924b48926adcfa9efe332b1bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 397 zcmV;80doF{P)Px$M@d9MR9J=Wlf6sBP!z>aY7t650#Zup+g(x%;wGlx;@}#=MOVk-BIrdBLFy`k z|Ak2$+>1?C2~?^ygIh#GCuy7{&nX>Td}-<;?>F5G_ug~v`v4>oiR3?0H#@v;cDP7w z{x1yVmTM?9nOJRBvBuK{|Ctw>43Xst^=Cc-?uSzo$=08ihj-&z5$P8y`VEzcNB+pI zovm&Fz}w2H@Z8K-pc3&SEA?xeYjJq)xv?Ln>d$PT$V&Z|rjL_+A?3(S22>*6()96Q z=v1R%(guLQxKfyTDD(w0p%U?f=NG$i(|u5hcz(xlW|@=v5voKS0CxBG@9ul{QWQ+u zkw0?3ZcTme1}b#IKf0Gn5(B{c*0u!zgP~ImdylzUg@p_NK$(ttnN`rz^r