From 2f778334e35f200379c6de5781e32a82b6a82e7b Mon Sep 17 00:00:00 2001 From: Burenov Date: Thu, 12 Dec 2024 18:52:16 +0500 Subject: [PATCH 1/4] food --- .../Objects/Consumable/Food/ingridients.yml | 31 ++++++++++++++++++ .../SS220/Recipes/Cooking/meal_recipes.yml | 12 ++++++- .../Food/ingredients.rsi/caramel.png | Bin 0 -> 445 bytes .../Food/ingredients.rsi/caramel_base.png | Bin 0 -> 386 bytes 4 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/ingridients.yml create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/caramel.png create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/caramel_base.png diff --git a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/ingridients.yml b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/ingridients.yml new file mode 100644 index 00000000000000..7a10b471875e35 --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/ingridients.yml @@ -0,0 +1,31 @@ +- type: entity + name: карамелька + parent: FoodBakingBase + id: CaramelFood + description: Съешь меня + components: + - type: Sprite + state: caramel + +- type: entity + name: Заготовка карамельной трости + parent: FoodBakingBase + id: caramel_based + description: Залей меня + components: + - type: Sprite + state: caramel_base + +- type: constructionGraph + id: caramel_base + start: start + graph: + - node: start + entity: Caramel + edges: + - to: flat + steps: + - tool: Rolling + doAfter: 1 + - node: flat + entity: caramel_based \ No newline at end of file diff --git a/Resources/Prototypes/SS220/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/SS220/Recipes/Cooking/meal_recipes.yml index 1a9631313e7653..f930fa6f6a771b 100644 --- a/Resources/Prototypes/SS220/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/SS220/Recipes/Cooking/meal_recipes.yml @@ -168,4 +168,14 @@ FoodMeat: 3 FoodCheeseSlice: 1 FoodTomato: 1 -#SS220 Spicy UPD end \ No newline at end of file +#SS220 Spicy UPD end + +#SS220 caramel candy start +- type: microwaveMealRecipe + id: Caramel + name: карамелька + result: CaramelFood + time: 15 + reagents: + Sugar: 10 + Water: 10 diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/caramel.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/caramel.png new file mode 100644 index 0000000000000000000000000000000000000000..bf2f613ceda849661eeb1ccb4e7c3cbafb21c461 GIT binary patch literal 445 zcmV;u0Yd(XP)Px$T}ebiR9J=Wl|6EUFc5{GnRw{c@iXpFV|prFy3Y6p?sI{hfMfUuzCSc<1f40gF0V;c>~?86|!$9sgPtw%M2A#6`wXiZ zD007_7Txp-0C__mnCL)>htIEXV|=qkKoymK&0!E>zsp8NdB`^ECghoy7|=y^6I05H zt7ovqXh81*Tf!g$B_3?1q*Y{7?@wvk+WL&K3r^SjiW1(ZNsOkg$J1|Mx^^Dg&t?!= z%>gDlV5s;r~BfBD4wp_Y2 z-*aE<4VHiJKi*OZ`1oGp3jdtmoN2MrK75BPmoROfcy`y_xGdd0Z5HugxBT5$H+s0tqL{6q0C8TZu5&rD{O(9b_q zyReq4Zt3)!6I!)Sc&~SQXsd9!R+DMh^SI~+=ZSHV4V!*DF)_q`KgD$At~Pgp#$|8r zDHr!nVsN;>cZ);h-QuGCtpDsf)?azK^kdBA%5^_KmhWEF)TC}}a-ZX4$nQPCpyNx8 d@J#ddWzYh$Ie-`hE(K2pQJ$`TF6*2UngD>^p-BJ$ literal 0 HcmV?d00001 From 089e7c393efc63c472072c46384831a976d84c14 Mon Sep 17 00:00:00 2001 From: Burenov Date: Fri, 13 Dec 2024 10:40:17 +0500 Subject: [PATCH 2/4] Konfetka gotova --- .../Objects/Consumable/Food/ingridients.yml | 135 +++++++++++++++--- .../Construction/Graphs/food/Candybased.yml | 13 ++ .../SS220/Recipes/Cooking/meal_recipes.yml | 45 +++++- .../Food/caramel.rsi/caramel-base.png} | Bin .../Food/caramel.rsi/caramel-green-red.png | Bin 0 -> 591 bytes .../Food/caramel.rsi/caramel-green.png | Bin 0 -> 592 bytes .../Food/caramel.rsi/caramel-red.png | Bin 0 -> 587 bytes .../Consumable/Food/caramel.rsi}/caramel.png | Bin .../Food/caramel.rsi/double-caramel.png | Bin 0 -> 768 bytes .../Consumable/Food/caramel.rsi/meta.json | 29 ++++ 10 files changed, 203 insertions(+), 19 deletions(-) create mode 100644 Resources/Prototypes/SS220/Recipes/Construction/Graphs/food/Candybased.yml rename Resources/Textures/{Objects/Consumable/Food/ingredients.rsi/caramel_base.png => SS220/Objects/Consumable/Food/caramel.rsi/caramel-base.png} (100%) create mode 100644 Resources/Textures/SS220/Objects/Consumable/Food/caramel.rsi/caramel-green-red.png create mode 100644 Resources/Textures/SS220/Objects/Consumable/Food/caramel.rsi/caramel-green.png create mode 100644 Resources/Textures/SS220/Objects/Consumable/Food/caramel.rsi/caramel-red.png rename Resources/Textures/{Objects/Consumable/Food/ingredients.rsi => SS220/Objects/Consumable/Food/caramel.rsi}/caramel.png (100%) create mode 100644 Resources/Textures/SS220/Objects/Consumable/Food/caramel.rsi/double-caramel.png create mode 100644 Resources/Textures/SS220/Objects/Consumable/Food/caramel.rsi/meta.json diff --git a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/ingridients.yml b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/ingridients.yml index 7a10b471875e35..0e0355543b0434 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/ingridients.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/ingridients.yml @@ -2,30 +2,129 @@ name: карамелька parent: FoodBakingBase id: CaramelFood - description: Съешь меня + description: Сладкая, хрустящая, вкусная, ломающая зубы components: - type: Sprite + sprite: SS220/Objects/Consumable/Food/caramel.rsi/ state: caramel + - type: Construction + graph: CandyBased + node: start + defaultTarget: caramel - type: entity - name: Заготовка карамельной трости + name: заготовка карамельной трости parent: FoodBakingBase - id: caramel_based - description: Залей меня + id: CaramelBasedFood + description: Всё будет, но не сразу components: - type: Sprite - state: caramel_base + sprite: SS220/Objects/Consumable/Food/caramel.rsi/ + state: caramel-base + - type: Construction + graph: CandyBased + node: caramel + - type: SolutionContainerManager -- type: constructionGraph - id: caramel_base - start: start - graph: - - node: start - entity: Caramel - edges: - - to: flat - steps: - - tool: Rolling - doAfter: 1 - - node: flat - entity: caramel_based \ No newline at end of file +- type: entity + name: красная карамельная трость + parent: FoodBakingBase + id: RedCaramelCaneFood + description: Точно не выдержит ваш вес + components: + - type: Sprite + sprite: SS220/Objects/Consumable/Food/caramel.rsi/ + state: caramel-red + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: Vitamin + Quantity: 1 + - type: MeleeWeapon + wideAnimationRotation: 0 + damage: + types: + Piercing: 1 + angle: 0 + animation: WeaponArcThrust + soundHit: + path: /Audio/Weapons/bladeslice.ogg + +- type: entity + name: зелёная карамельная трость + parent: FoodBakingBase + id: GreenCaramelCaneFood + description: Даже не пытайте опереться на неё + components: + - type: Sprite + sprite: SS220/Objects/Consumable/Food/caramel.rsi/ + state: caramel-green + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: Vitamin + Quantity: 1 + - type: MeleeWeapon + wideAnimationRotation: 0 + damage: + types: + Piercing: 1 + angle: 0 + animation: WeaponArcThrust + soundHit: + path: /Audio/Weapons/bladeslice.ogg + +- type: entity + name: красно-зелёная карамельная трость + parent: FoodBakingBase + id: CaramelCaneGreenRedFood + description: Трость, украшенная цветными полосками и узорами. + components: + - type: Sprite + sprite: SS220/Objects/Consumable/Food/caramel.rsi/ + state: caramel-green-red + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: Vitamin + Quantity: 1 + - type: MeleeWeapon + wideAnimationRotation: 0 + damage: + types: + Piercing: 1 + angle: 0 + animation: WeaponArcThrust + soundHit: + path: /Audio/Weapons/bladeslice.ogg + +- type: entity + name: двойная карамельная трость + parent: FoodBakingBase + id: DoubleCaramelCaneFood + description: Устройте дуель на тростях! + components: + - type: Sprite + sprite: SS220/Objects/Consumable/Food/caramel.rsi/ + state: double-caramel + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Vitamin + Quantity: 2 \ No newline at end of file diff --git a/Resources/Prototypes/SS220/Recipes/Construction/Graphs/food/Candybased.yml b/Resources/Prototypes/SS220/Recipes/Construction/Graphs/food/Candybased.yml new file mode 100644 index 00000000000000..306c1eebac30fb --- /dev/null +++ b/Resources/Prototypes/SS220/Recipes/Construction/Graphs/food/Candybased.yml @@ -0,0 +1,13 @@ +- type: constructionGraph + id: CandyBased + start: start + graph: + - node: start + entity: CaramelFood + edges: + - to: caramel + steps: + - tool: Rolling + doAfter: 1 + - node: caramel + entity: CaramelBasedFood \ No newline at end of file diff --git a/Resources/Prototypes/SS220/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/SS220/Recipes/Cooking/meal_recipes.yml index f930fa6f6a771b..45b09cc1f158a2 100644 --- a/Resources/Prototypes/SS220/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/SS220/Recipes/Cooking/meal_recipes.yml @@ -170,7 +170,7 @@ FoodTomato: 1 #SS220 Spicy UPD end -#SS220 caramel candy start +#SS220 caramel cane start - type: microwaveMealRecipe id: Caramel name: карамелька @@ -179,3 +179,46 @@ reagents: Sugar: 10 Water: 10 + +- type: microwaveMealRecipe + id: CaramelRed + name: карамелька красная + result: RedCaramelCaneFood + time: 15 + reagents: + Grenadine: 5 + solids: + CaramelBasedFood: 1 + +- type: microwaveMealRecipe + id: CaramelGreen + name: карамелька зелёная + result: GreenCaramelCaneFood + time: 15 + reagents: + JuiceLime: 5 + solids: + CaramelBasedFood: 1 + +- type: microwaveMealRecipe + id: CaramelGreenRed + name: карамелька зелёная + result: CaramelCaneGreenRedFood + time: 15 + reagents: + Grenadine: 5 + JuiceLime: 5 + solids: + CaramelBasedFood: 1 + +- type: microwaveMealRecipe + id: double Caramel + name: двойная карамелька + result: DoubleCaramelCaneFood + time: 20 + reagents: + Grenadine: 10 + JuiceLime: 10 + solids: + CaramelBasedFood: 2 +#SS220 caramel cane end \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/caramel_base.png b/Resources/Textures/SS220/Objects/Consumable/Food/caramel.rsi/caramel-base.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Food/ingredients.rsi/caramel_base.png rename to Resources/Textures/SS220/Objects/Consumable/Food/caramel.rsi/caramel-base.png diff --git a/Resources/Textures/SS220/Objects/Consumable/Food/caramel.rsi/caramel-green-red.png b/Resources/Textures/SS220/Objects/Consumable/Food/caramel.rsi/caramel-green-red.png new file mode 100644 index 0000000000000000000000000000000000000000..fc84b9b62d0216f894fbb240a7ebb17b95de746a GIT binary patch literal 591 zcmV-V0Px$?@2^KR9J=WmOn_tKorJ5|AGc;hd4#BP^z1PlZ%3gle8F+ZbG3TxCoU>H-`>_ zAh;ZR05Ip7!Rp$Qbf2o`j4@J^Zc>wOVvG@EjI2;UDqT^zp)1x)u2?UB zPP)CMD{93M%_3$-7-WROH`EoC{B2#xn+4>}0$#4#G5Z`w-Yj6nGa!1V>c-{E5S1@O zJVZ1Sr=;6UF;~xrlj@2}r)TGK%3wFnr8LT=G#-L6_Ql)^W(81mU&R2ewS>4kNh6yn z+TNrA0G;;>m_9zl^62=7^&7Wa*fbJo?|%Z&U2#vxJrGQwDVr%Gn0P~XXhcIcQ$%1f zgu9b8%=JO+l^!{6iteM9zUO!IHyrBrPx$@JU2LR9J=WmN9GFKp2J}#kHDpU}ex)hzVGpJ9I69%q|gxY=J_d5XjxG3n8cP6%Ldato6vWB@4ffl$H4>t zJ6cjft=d$dEBoL? zkHhT)+MO<&?{^3sUjx`=N9C*#y*#XG(ZCj_s^pE~LV*Hsf~!4dJq;k$!Tb9d0k9rUT>4Jvtqv~Emv0KhukAao6)OZ~>bi`{chH=YCF4*Gae4*)Of zVdYlS^aiFl5bs(q{~>3EW9J<>zV_k8)@aAqn>xXj=0&~PkDztb&|dv~i?{uYi{10F zW4Mj-%44kDDz-3H+UBXKRhtvK>+4H^#GK3xVV7=XAuX9W0K>Te;{$AA0%plVW)8rTW+77t;O<$-RKR_* zkhue}WLcPt1Mn{kNlbl^+?T-dwUgqRf(1U|A6Q!c0!w5Ehpl>R3;+NC4rN$LW=%~1 eDgXcg2mk;800000(o>TF0000Px$>q$gGR9J=Wma$9YP#nj(H_C;D$mQNPoAOTzc3N<2wiKXA60G-|zcLi39Aq4rRo?=dxIAtJ$5zjoM%mFgs_!0B|6Z#89W1Bh@TdHjtM0IAu}nBnsWHY^P@jQ9`z0000EWmrjOO-%qQ00008 Z000000002eQPx%ph-kQR9J=WRXs>sQ5627t!=sR`Y3NpAb~Wx73$Q*p_EQV@q%QNrUU{mg2nPS z2RBg=3Z+o+HBc8rK@xBZ;@~2L2%%6UKc)~fwLIt$2tqg=?7b#0?-s)=;U|@L={Q+(d9@(CpoZ@?5diL@S;^rCP&A=!w$h z0bHjrmoIeOmhlK_W{?a^cTMN&$~swkm`p9uaZ}C=%H<2{Wnera1vnjq2q&2k?F=q# zLV#NdTm=}GPMR6)syE{iN!D%?wa?`XT|qcA$kYPrJs?JIV(K@>Coend-PkYr_IA@9 zz0h9!z1=kS8^7eZac0ou_s&aojD@2E%%A7*{mtu}?*eBJq~f4d9K?8p%1J*p&tjB{gPLbC;>;jn z@5eI`L?97V2q-80R8IQIX;i~f04t(O4Le%3}-FJQStUJk|aHdqGTkHiJtF zz6HI4i@9G4EyB4MZe4&_Chc=C_JZ5a7%IGWzSkQuba?Ijf9VC~67<^nZg0fU1-RAT ziCgQ1UhjQ72I&Rm3{I6SjL;W< y0PB7bu4r#Tx&QzG4rN$LW=%~1DgXcg2mk;800000(o>TF0000 Date: Fri, 13 Dec 2024 10:53:30 +0500 Subject: [PATCH 3/4] time to eat --- .../Objects/Consumable/Food/ingridients.yml | 33 ++++++++++++------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/ingridients.yml b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/ingridients.yml index 0e0355543b0434..66280b91c0aaf9 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/ingridients.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/ingridients.yml @@ -11,6 +11,15 @@ graph: CandyBased node: start defaultTarget: caramel + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: Vitamin + Quantity: 1 - type: entity name: заготовка карамельной трости @@ -38,12 +47,12 @@ - type: SolutionContainerManager solutions: food: - maxVol: 5 + maxVol: 10 reagents: - ReagentId: Nutriment - Quantity: 4 + Quantity: 8 - ReagentId: Vitamin - Quantity: 1 + Quantity: 2 - type: MeleeWeapon wideAnimationRotation: 0 damage: @@ -66,12 +75,12 @@ - type: SolutionContainerManager solutions: food: - maxVol: 5 + maxVol: 10 reagents: - ReagentId: Nutriment - Quantity: 4 + Quantity: 8 - ReagentId: Vitamin - Quantity: 1 + Quantity: 2 - type: MeleeWeapon wideAnimationRotation: 0 damage: @@ -94,12 +103,12 @@ - type: SolutionContainerManager solutions: food: - maxVol: 5 + maxVol: 10 reagents: - ReagentId: Nutriment - Quantity: 4 + Quantity: 8 - ReagentId: Vitamin - Quantity: 1 + Quantity: 2 - type: MeleeWeapon wideAnimationRotation: 0 damage: @@ -122,9 +131,9 @@ - type: SolutionContainerManager solutions: food: - maxVol: 10 + maxVol: 20 reagents: - ReagentId: Nutriment - Quantity: 8 + Quantity: 16 - ReagentId: Vitamin - Quantity: 2 \ No newline at end of file + Quantity: 4 \ No newline at end of file From 7d5209ffc83eb62aeffd9926734189e154308119 Mon Sep 17 00:00:00 2001 From: Burenov Date: Mon, 16 Dec 2024 12:28:47 +0500 Subject: [PATCH 4/4] translation --- .../ru-RU/ss220/ingridients/caramel.ftl | 17 +++++++++++++ .../Objects/Consumable/Food/ingridients.yml | 24 +++++++++---------- .../SS220/Recipes/Cooking/meal_recipes.yml | 10 ++++---- .../Consumable/Food/caramel.rsi/meta.json | 2 +- 4 files changed, 35 insertions(+), 18 deletions(-) create mode 100644 Resources/Locale/ru-RU/ss220/ingridients/caramel.ftl diff --git a/Resources/Locale/ru-RU/ss220/ingridients/caramel.ftl b/Resources/Locale/ru-RU/ss220/ingridients/caramel.ftl new file mode 100644 index 00000000000000..d3ad03ffa9595b --- /dev/null +++ b/Resources/Locale/ru-RU/ss220/ingridients/caramel.ftl @@ -0,0 +1,17 @@ +ent-CaramelFood = карамелька + .desc = Ммм... вкусно! + +ent-CaramelBasedFood = заготовка карамельной трости + .desc = Всё будет, но не сразу + +ent-RedCaramelCaneFood = красная карамельная трость + .desc = Точно не выдержит ваш вес + +ent-GreenCaramelCaneFood = зелёная карамельная трость + .desc = Даже не пытайте опереться на неё + +ent-CaramelCaneGreenRedFood = красно-зелёная карамельная трость + .desc = Трость, украшенная цветными полосками и узорами. + +ent-DoubleCaramelCaneFood = двойная карамельная трость + .desc = Устройте дуель! \ No newline at end of file diff --git a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/ingridients.yml b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/ingridients.yml index 66280b91c0aaf9..e35b244d8563dc 100644 --- a/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/ingridients.yml +++ b/Resources/Prototypes/SS220/Entities/Objects/Consumable/Food/ingridients.yml @@ -1,8 +1,8 @@ - type: entity - name: карамелька + name: caramel parent: FoodBakingBase id: CaramelFood - description: Сладкая, хрустящая, вкусная, ломающая зубы + description: Mmm... yummy! components: - type: Sprite sprite: SS220/Objects/Consumable/Food/caramel.rsi/ @@ -22,10 +22,10 @@ Quantity: 1 - type: entity - name: заготовка карамельной трости + name: preparation of a caramel cane parent: FoodBakingBase id: CaramelBasedFood - description: Всё будет, но не сразу + description: Everything will happen, but not immediately components: - type: Sprite sprite: SS220/Objects/Consumable/Food/caramel.rsi/ @@ -36,10 +36,10 @@ - type: SolutionContainerManager - type: entity - name: красная карамельная трость + name: red caramel cane parent: FoodBakingBase id: RedCaramelCaneFood - description: Точно не выдержит ваш вес + description: It definitely won't hold your weight components: - type: Sprite sprite: SS220/Objects/Consumable/Food/caramel.rsi/ @@ -64,10 +64,10 @@ path: /Audio/Weapons/bladeslice.ogg - type: entity - name: зелёная карамельная трость + name: green caramel cane parent: FoodBakingBase id: GreenCaramelCaneFood - description: Даже не пытайте опереться на неё + description: Don't even try to lean on it components: - type: Sprite sprite: SS220/Objects/Consumable/Food/caramel.rsi/ @@ -92,10 +92,10 @@ path: /Audio/Weapons/bladeslice.ogg - type: entity - name: красно-зелёная карамельная трость + name: red and green caramel cane parent: FoodBakingBase id: CaramelCaneGreenRedFood - description: Трость, украшенная цветными полосками и узорами. + description: A cane decorated with colored stripes and patterns. components: - type: Sprite sprite: SS220/Objects/Consumable/Food/caramel.rsi/ @@ -120,10 +120,10 @@ path: /Audio/Weapons/bladeslice.ogg - type: entity - name: двойная карамельная трость + name: double caramel cane parent: FoodBakingBase id: DoubleCaramelCaneFood - description: Устройте дуель на тростях! + description: Arrange a duel! components: - type: Sprite sprite: SS220/Objects/Consumable/Food/caramel.rsi/ diff --git a/Resources/Prototypes/SS220/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/SS220/Recipes/Cooking/meal_recipes.yml index 45b09cc1f158a2..4bb5a9cdb0d0c9 100644 --- a/Resources/Prototypes/SS220/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/SS220/Recipes/Cooking/meal_recipes.yml @@ -173,7 +173,7 @@ #SS220 caramel cane start - type: microwaveMealRecipe id: Caramel - name: карамелька + name: caramelka result: CaramelFood time: 15 reagents: @@ -182,7 +182,7 @@ - type: microwaveMealRecipe id: CaramelRed - name: карамелька красная + name: red caramelka result: RedCaramelCaneFood time: 15 reagents: @@ -192,7 +192,7 @@ - type: microwaveMealRecipe id: CaramelGreen - name: карамелька зелёная + name: green caramelka result: GreenCaramelCaneFood time: 15 reagents: @@ -202,7 +202,7 @@ - type: microwaveMealRecipe id: CaramelGreenRed - name: карамелька зелёная + name: greenred caramelka result: CaramelCaneGreenRedFood time: 15 reagents: @@ -213,7 +213,7 @@ - type: microwaveMealRecipe id: double Caramel - name: двойная карамелька + name: double caramelka result: DoubleCaramelCaneFood time: 20 reagents: diff --git a/Resources/Textures/SS220/Objects/Consumable/Food/caramel.rsi/meta.json b/Resources/Textures/SS220/Objects/Consumable/Food/caramel.rsi/meta.json index 00fa4448263949..e533c2578c79c7 100644 --- a/Resources/Textures/SS220/Objects/Consumable/Food/caramel.rsi/meta.json +++ b/Resources/Textures/SS220/Objects/Consumable/Food/caramel.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", - "copyright": "sprite by dinazewwr (Discord) for SS220", + "copyright": "sprited by dinazewwr (Discord) for SS220", "size": { "x": 32, "y": 32