From 80f22a9fe47ee68510a0f961ce72bec9e07902ae Mon Sep 17 00:00:00 2001 From: ne4t02 Date: Sat, 24 Aug 2024 00:33:44 +0500 Subject: [PATCH] =?UTF-8?q?=D1=81=D0=B3=D1=83=D1=89=D0=B5=D0=BD=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=B8=20=D0=BE=D1=87=D0=B5=D1=80=D0=B5=D0=B4=D0=B8=20?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BC=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Objects/Consumable/Food/snacks.ftl | 12 +++-- .../Objects/Consumable/Food/snacks.yml | 50 ++++++++++++++++-- .../ADT/Reagents/Consumable/Food/food.yml | 18 +++++++ .../Food/condensed_milk.rsi/icon-open.png | Bin 0 -> 938 bytes .../Food/condensed_milk.rsi/icon.png | Bin 0 -> 667 bytes .../Food/condensed_milk.rsi/meta.json | 20 +++++++ .../Food/condensed_milk.rsi/trash.png | Bin 0 -> 920 bytes 7 files changed, 94 insertions(+), 6 deletions(-) create mode 100644 Resources/Prototypes/ADT/Reagents/Consumable/Food/food.yml create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/condensed_milk.rsi/icon-open.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/condensed_milk.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/condensed_milk.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/condensed_milk.rsi/trash.png diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/snacks.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/snacks.ftl index 5d2bbb53894..61703ae77c0 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/snacks.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/snacks.ftl @@ -7,7 +7,7 @@ ent-ADTFoodSnackChipsOnionAndSourcream = чипсы со вкусом зелён ent-ADTFoodSnackChipsShrimp = чипсы со вкусом креветки .desc = Для тех, кто любит вкус креветок, но не может позволить себе их купить. -ent-ADTFoodSnackChipsSpace = космомические Чипсы +ent-ADTFoodSnackChipsSpace = космомические Чипсы .desc = Кукурузные чипсы в форме треугольника со вкусом сыра чеддер - идеальная закуска для игр. ent-ADTFoodSnackChipsSpicy = чипсы ФлеймиХат @@ -19,9 +19,9 @@ ent-ADTFoodSnackDriedBeef = вяленая говядина .desc = Толстые куски вяленой говядины. Очень долго хранится, а в мясе много белка, хороший вещь для похода ent-ADTFoodSnackDriedChicken = сушеное куриное мясо - .desc = Хорошая закуска для охоты. + .desc = Хорошая закуска для охоты. -ent-ADTFoodSnackDriedHorse = сушеная конина +ent-ADTFoodSnackDriedHorse = сушеная конина .desc = Конина - самое вкусное мясо, в ней низкое содержание жира и богатое содержание белка. ent-ADTFoodSnackDriedPig = вяленая свинина @@ -110,3 +110,9 @@ ent-ADTFoodSnackChocolateTrashPink = обертка от Розовый шоко ent-ADTFoodSnackChocolateTrashTwo = обертка от Двойного батончика .desc = Мусор + +ent-ADTFoodTinCondensedMilkTrash = сгущеное молоко (пусто) + .desc = Пустая консервная банка. Из неё можно получить немного металла. + +ent-ADTFoodTinCondensedMilk = сгущеное молоко + .desc = Стандартная банка сгущенки с удобным язычком. diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml index bfe77f28954..8e1389dbd01 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml @@ -1,4 +1,4 @@ -# Чипсеки +# Чипсеки - type: entity name: chips @@ -423,7 +423,7 @@ - type: Sprite state: bar-two -#Trash +#Trash - type: entity categories: [ HideSpawnMenu ] @@ -489,4 +489,48 @@ name: chocolate wrapper components: - type: Sprite - state: two-trash \ No newline at end of file + state: two-trash + +#Сгущенка + +- type: entity + parent: FoodTinBase + id: ADTFoodTinCondensedMilk + name: condensed milk + description: A standard issue tin of condensed milk with a convenient pull tab. + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/condensed_milk.rsi + # the convenient pull tab + - type: Item + sprite: ADT/Objects/Consumable/Food/condensed_milk.rsi + size: Small + shape: + - 0,0,0,1 + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: ADTCondensedMilk + Quantity: 30 + - type: Openable + openableByHand: true + sound: + path: /Audio/Items/can_open3.ogg + - type: Food + trash: ADTFoodTinCondensedMilkTrash + +- type: entity + parent: FoodTinBaseTrash + id: ADTFoodTinCondensedMilkTrash + name: condensed milk + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/condensed_milk.rsi + - type: Item + sprite: ADT/Objects/Consumable/Food/condensed_milk.rsi + size: Small + shape: + - 0,0,0,1 + diff --git a/Resources/Prototypes/ADT/Reagents/Consumable/Food/food.yml b/Resources/Prototypes/ADT/Reagents/Consumable/Food/food.yml new file mode 100644 index 00000000000..0cc31f8e402 --- /dev/null +++ b/Resources/Prototypes/ADT/Reagents/Consumable/Food/food.yml @@ -0,0 +1,18 @@ +- type: reagent + id: ADTCondensedMilk + name: reagent-name-condensedmilk + group: Foods + desc: reagent-desc-condensedmilk + physicalDesc: reagent-physical-desc-gloopy + flavor: adtconsideredmilk + color: "#fcfcf2" + recognizable: true + metabolisms: + Food: + effects: + - !type:AdjustReagent + reagent: Sugar + amount: 0.5 + - !type:AdjustReagent + reagent: Nutriment + amount: 0.2 diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/condensed_milk.rsi/icon-open.png b/Resources/Textures/ADT/Objects/Consumable/Food/condensed_milk.rsi/icon-open.png new file mode 100644 index 0000000000000000000000000000000000000000..4bc173fc9a1bb0018f2ace1de4576b8040f88295 GIT binary patch literal 938 zcmV;b16BNqP)Px&WJyFpR9HvFlwC+uVHkj4lOtuTGhv9WhE_*KFZ3ejjr4(;zT?qNcbo_NV0`E2 z+xI;0&v&xmKaVUme4EV{&&kOFyWOs8y_!AQnpHRK=;(-Z90z6PWwd^JYMN#(MN$eN z7(wPLGXecS{WSA>p61b!QJS4j=ejeJv;o2^Dk}&eg(RBi=H?(0i9lgtp`6`7AOK#k zcij>z3LrchjY23C0-;!d;IANfJRUF_jUswfiZ>+1cCV?q}t&TCKF^+oAKozjkORFi_bAr;6fGv)cfh z+)oMO^ZDdYK{yM8qChao9RLucdf*G)~2*V@5e@}d( zH5G8rAC@;(N+_E_3CA^6Ti$Ayfn!~F;Ij4Q5{ZjFb<}LwoHx3czPr{}2QRKzv=g}d zV1RHKE?I}yU05@b3c#R@T2^KlR5sX7E9M`H6U=ld9 zY%mEHIg1+CsEM4FPqhI117<^6d*$_7z!?jy1kd#Onlq3oXr=%C15Bd-FsYB)^Z)<= M07*qoM6N<$g2pPIF#rGn literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/condensed_milk.rsi/icon.png b/Resources/Textures/ADT/Objects/Consumable/Food/condensed_milk.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3908b70bb125bccf22cfc0295ea599e9a52707d2 GIT binary patch literal 667 zcmV;M0%ZM(P)Px%RY^oaR9Hu2WEfz;IKcKZj5=U61V%$(=!HN+Qv82hWygYf3rY46(HdYDOG--O zEW4gRe-4%-#UVsF0AxAHVo_0127P^fhKm<3;w?ZgUAjcHBM3SGX1R-t3)oVa<*#4A zhC2e}FmynyBgk?9$Z}*$(fJ_9(A)vYAwp9Jq@*SPmy?la;Njy2$3H9@@I?Vg4ut2- znoBT*2`WfSOZ)%PznVe&>_V{R$PPh{cTn1ZIqIHOCIkP*R)$%#W)U=>paPHs=IGZj zgev@Ja8eXuc)6w*ZtwS>-%!$?LUb*|zWZ+&RzF~5NV(WT9S0;PCjS2x(g3#HUV@cD zYxxVDS@2q<1jE4>zrl{6S_ps~z%S^{kWu3YxBOeWG{eGMKj03DSL0ydn)wvW2RUL! z%O-|5uQo6&S+ay+2oqEQa=?{qnhe&~N(_^f&ES?O@G-+3@Zi&5xa0Efo?Luzr0A$-o87YQ4PIhodz+3=}7L|R682Fz&0}E5t0Y^VM!wp7u1ae|Pwj89!jB^L| zLcq6X3PVNNdK5<#HwS_f8z^!1)}qRFbOkc3t52t%1E$ZO1NN+5_;L(Kpj&=vWh7W_ zN+J=%!VKXVU7T?K@LH71kC3k%Rv@{0I`;X)DqPx&Qb|NXR9HvFm0w6xVHCj67TdI?cflTPYiM;{=z~7Qd=V?JWsV^L^HtIa=CcePDnY&Xu4?{aOMyPG#VAm81+ z=YGH6cfRvoHSnK9qlE8vyG6ZT4<3(4QNEHnS1G-OdO4a1A{brz20?KBy9qO*VNV!K!^%7&dkg}JRXPg@^Y!Vkw^qW zq0qV|vI-zPkw`!^8U?#u2A0!rdtpmD6n&%=3m^#h zzPPAZVqz6Aj7B4kvvafmrUDL!14c(j0r#F&07+V{mhQ2@(qqJ8F*?3VPKBZh2uCl& z!O&ZpeE7p~#v_O~OSY8Ivmg7<0r%>fdICMQ9dNutgoYhv(E6VcBpeP)B8!WQbj>?G z(EmLG&n7g``mtLb0jJX`#*cXjzOPIN)qRs$D-dWZgLjh&l2EMzD8Ow!1ZO&qNbq=@ z6?(reOCrtoBG`QY7yU+wd)==gGW`;KK3~o)&Y6G$p8{1-U%wM>@2Zm^6{VXbfr*8r zBzJ!NJ^20KV0Yz+x&lZOwp(DVVXq{?4A{2t{R6=LT=~zbs(^ptfHbjOLf#B=IOfz9 zzfrFOhdb`TrHe0CNnGe^q-MkByxF<>+4UQZ@cc@fdIEPJ^w45!PV}Wo{0$#@+C;gn zEzRl)xNmvEX4Ixh$hQE?&fvjV3a*}Ysw2>Hx>C&Cd-4d@HQ zso_p|^sqPQDa)CF6EX?BMiIFLTRFlJjG+{cxrzjs1dgm4OoFYPtr~NbtekD1VgdF7 uRztq`^6PxS1q)<@7kWSM3KR;;_TC?Ip~f&gIrxqM0000