From ba8691465f9d945f39816aedca3b2f6f1556a326 Mon Sep 17 00:00:00 2001 From: 1Stepka1 Date: Sat, 20 Jan 2024 12:20:13 +0300 Subject: [PATCH 1/6] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=BD=D0=BE=D0=B2=D1=8B=D0=B5=20=D0=B2=D0=B8?= =?UTF-8?q?=D0=B4=D1=8B=20=D0=B2=D1=80=D0=B5=D0=B4=D0=BD=D0=BE=D0=B9=20?= =?UTF-8?q?=D0=B5=D0=B4=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Objects/Consumable/Drinks/cans.ftl | 2 + .../ADT/Objects/Consumable/Food/snacks.ftl | 53 ++++ .../Objects/Consumable/Drinks/cans.yml | 15 ++ .../Objects/Consumable/Food/snacks.yml | 233 ++++++++++++++++++ .../Drinks/nostop.rsi/icon-open.png | Bin 0 -> 600 bytes .../Consumable/Drinks/nostop.rsi/icon.png | Bin 0 -> 572 bytes .../Consumable/Drinks/nostop.rsi/meta.json | 17 ++ .../Food/Snacks/Chips/chips.rsi/meta.json | 23 ++ .../Chips/chips.rsi/onion-and-sourcream.png | Bin 0 -> 527 bytes .../Food/Snacks/Chips/chips.rsi/shrimp.png | Bin 0 -> 467 bytes .../Food/Snacks/Chips/chips.rsi/space.png | Bin 0 -> 456 bytes .../Food/Snacks/Chips/chips.rsi/spicy.png | Bin 0 -> 569 bytes .../Food/Snacks/Chips/trash.rsi/meta.json | 23 ++ .../trash.rsi/onion-and-sourcream-trash.png | Bin 0 -> 643 bytes .../Snacks/Chips/trash.rsi/shrimp-trash.png | Bin 0 -> 592 bytes .../Snacks/Chips/trash.rsi/space-trash.png | Bin 0 -> 585 bytes .../Snacks/Chips/trash.rsi/spicy-trash.png | Bin 0 -> 697 bytes .../Food/Snacks/Dried/meat.rsi/beef.png | Bin 0 -> 408 bytes .../Food/Snacks/Dried/meat.rsi/chicken.png | Bin 0 -> 398 bytes .../Food/Snacks/Dried/meat.rsi/horse.png | Bin 0 -> 459 bytes .../Food/Snacks/Dried/meat.rsi/meta.json | 23 ++ .../Food/Snacks/Dried/meat.rsi/pig.png | Bin 0 -> 459 bytes .../Snacks/Dried/trash.rsi/beef-trash.png | Bin 0 -> 279 bytes .../Snacks/Dried/trash.rsi/chicken-trash.png | Bin 0 -> 280 bytes .../Snacks/Dried/trash.rsi/horse-trash.png | Bin 0 -> 324 bytes .../Food/Snacks/Dried/trash.rsi/meta.json | 23 ++ .../Food/Snacks/Dried/trash.rsi/pig-trash.png | Bin 0 -> 609 bytes 27 files changed, 412 insertions(+) create mode 100644 Resources/Locale/ru-RU/ADT/Objects/Consumable/Drinks/cans.ftl create mode 100644 Resources/Locale/ru-RU/ADT/Objects/Consumable/Food/snacks.ftl create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/cans.yml create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/nostop.rsi/icon-open.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/nostop.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Drinks/nostop.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Chips/chips.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Chips/chips.rsi/onion-and-sourcream.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Chips/chips.rsi/shrimp.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Chips/chips.rsi/space.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Chips/chips.rsi/spicy.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Chips/trash.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Chips/trash.rsi/onion-and-sourcream-trash.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Chips/trash.rsi/shrimp-trash.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Chips/trash.rsi/space-trash.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Chips/trash.rsi/spicy-trash.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Dried/meat.rsi/beef.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Dried/meat.rsi/chicken.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Dried/meat.rsi/horse.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Dried/meat.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Dried/meat.rsi/pig.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Dried/trash.rsi/beef-trash.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Dried/trash.rsi/chicken-trash.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Dried/trash.rsi/horse-trash.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Dried/trash.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Dried/trash.rsi/pig-trash.png diff --git a/Resources/Locale/ru-RU/ADT/Objects/Consumable/Drinks/cans.ftl b/Resources/Locale/ru-RU/ADT/Objects/Consumable/Drinks/cans.ftl new file mode 100644 index 00000000000..b312112aa3a --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Objects/Consumable/Drinks/cans.ftl @@ -0,0 +1,2 @@ +ent-ADTDrinkNoStopCan = Банка энергетика NoStop + .desc = Натуральный энергетический напиток, в нем нет сахара! \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/Objects/Consumable/Food/snacks.ftl b/Resources/Locale/ru-RU/ADT/Objects/Consumable/Food/snacks.ftl new file mode 100644 index 00000000000..a4463f0da29 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Objects/Consumable/Food/snacks.ftl @@ -0,0 +1,53 @@ +#Чипсеки + +ent-ADTFoodSnackChipsOnionAndSourcream = чипсы со вкусом зелёного лука и сметана + .desc = Золотая классика. + +ent-ADTFoodSnackChipsShrimp = чипсы со вкусом креветки + .desc = Для тех, кто любит вкус креветок, но не может позволить себе их купить. + +ent-ADTFoodSnackChipsSpace = космомические Чипсы + .desc = Кукурузные чипсы в форме треугольника со вкусом сыра чеддер - идеальная закуска для игр. + +ent-ADTFoodSnackChipsSpicy = чипсы ФлеймиХат + .desc = Эти чипсы очень хороши, если вы хотите превратить свой желудок в Адское пекло. Тем, у кого проблемы с желудком, лучше их не есть... + +#Сушеное мясо + +ent-ADTFoodSnackDriedBeef = вяленая говядина + .desc = Толстые куски вяленой говядины. Очень долго хранится, а в мясе много белка, хороший вещь для похода + +ent-ADTFoodSnackDriedChicken = сушеное куриное мясо + .desc = Хорошая закуска для охоты. + +ent-ADTFoodSnackDriedHorse = сушеная конина + .desc = Конина - самое вкусное мясо, в ней низкое содержание жира и богатое содержание белка. + +ent-ADTFoodSnackDriedPig = вяленая свинина + .desc = Впринципе хорошая закуска. + +#Мусор + +ent-ADTFoodPacketChipsOnionAndSourcreamTrash = пустая упаковка от чипсов со вкусом зелёного лука и сметана + .desc = Мусор + +ent-ADTFoodPacketChipsShrimpTrash = пустая упаковка от чипсов со вкусом креветки + .desc = Мусор + +ent-ADTFoodPacketChipsSpaceTrash = пустая упаковка от Космомических чипсов + .desc = Мусор + +ent-ADTFoodPacketSpicyTrash = пустая упаковка от чипсов ФлеймиХат + .desc = Мусор + +ent-ADTFoodPacketBeefTrash = пустая упаковка от вяленой говядины + .desc = Мусор + +ent-ADTFoodPacketChickenTrash = пустая упаковка от сушеного куриного мяся + .desc = Мусор + +ent-ADTFoodPacketHorseTrash = пустая упаковка от сушеной конины + .desc = Мусор + +ent-ADTFoodPacketPigTrash = пустая упаковка от вяленой свинины + .desc = Мусор diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/cans.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/cans.yml new file mode 100644 index 00000000000..1d17e418785 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/cans.yml @@ -0,0 +1,15 @@ +- type: entity + parent: DrinkCanBaseFull + id: ADTDrinkNoStopCan + name: No Stop Can + description: No Stop Can + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: EnergyDrink + Quantity: 30 + - type: Sprite + sprite: ADT/Objects/Consumable/Drinks/nostop.rsi diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml new file mode 100644 index 00000000000..5b294ac68f4 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml @@ -0,0 +1,233 @@ +# Чипсеки + +- type: entity + name: chips + parent: FoodSnackBase + id: ADTFoodSnackChipsBase + description: chips + abstract: true + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Snacks/Chips/chips.rsi + state: onion-and-sourcream + - type: Item + - type: Food + trash: ADTFoodPacketChipsTrash + +- type: entity + name: chips + parent: ADTFoodSnackChipsBase + id: ADTFoodSnackChipsOnionAndSourcream + description: chips + components: + - type: Sprite + state: onion-and-sourcream + - type: Food + trash: ADTFoodPacketChipsOnionAndSourcreamTrash + +- type: entity + name: chips + parent: ADTFoodSnackChipsBase + id: ADTFoodSnackChipsShrimp + description: chips + components: + - type: Sprite + state: shrimp + - type: Food + trash: ADTFoodPacketChipsShrimpTrash + +- type: entity + name: chips + parent: ADTFoodSnackChipsBase + id: ADTFoodSnackChipsSpace + description: chips + components: + - type: Sprite + state: space + - type: Food + trash: ADTFoodPacketChipsSpaceTrash + +- type: entity + name: chips + parent: ADTFoodSnackChipsBase + id: ADTFoodSnackChipsSpicy + description: chips + components: + - type: Sprite + state: spicy + - type: Food + trash: ADTFoodPacketSpicyTrash + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: CapsaicinOil + Quantity: 5 + +# Сушеное мясо + +- type: entity + name: Dried meat + parent: FoodSnackBase + id: ADTFoodSnackDriedBase + description: Dried meat + abstract: true + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Snacks/Dried/meat.rsi + state: beef + - type: Item + - type: Food + trash: ADTFoodPacketBeefTrash +# Я однако не знаю какое им делать наполнение,по дефолту у них 10 питательных веществ, если нужно то заполните в base свои значения + +- type: entity + name: Dried meat + parent: ADTFoodSnackDriedBase + id: ADTFoodSnackDriedBeef + description: Dried meat + components: + - type: Sprite + state: beef + - type: Item + - type: Food + trash: ADTFoodPacketBeefTrash + +- type: entity + name: Dried meat + parent: ADTFoodSnackDriedBase + id: ADTFoodSnackDriedChicken + description: Dried meat + components: + - type: Sprite + state: chicken + - type: Item + - type: Food + trash: ADTFoodPacketChickenTrash + +- type: entity + name: Dried meat + parent: ADTFoodSnackDriedBase + id: ADTFoodSnackDriedHorse + description: Dried meat + components: + - type: Sprite + state: horse + - type: Item + - type: Food + trash: ADTFoodPacketHorseTrash + +- type: entity + name: Dried meat + parent: ADTFoodSnackDriedBase + id: ADTFoodSnackDriedPig + description: Dried meat + components: + - type: Sprite + state: pig + - type: Item + - type: Food + trash: ADTFoodPacketPigTrash + +# Мусор + +- type: entity + noSpawn: true + parent: FoodPacketTrash + id: ADTFoodPacketChipsTrashBase + description: This is rubbish. + abstract: true + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Snacks/Chips/trash.rsi + state: onion-and-sourcream-trash + - type: Item + +- type: entity + noSpawn: true + parent: FoodPacketTrash + id: ADTFoodDriedPacketTrashBase + description: This is rubbish. + abstract: true + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Snacks/Dried/trash.rsi + state: beef-trash + - type: Item + +- type: entity + noSpawn: true + parent: ADTFoodPacketChipsTrashBase + id: ADTFoodPacketChipsOnionAndSourcreamTrash + description: This is rubbish. + components: + - type: Sprite + state: onion-and-sourcream-trash + +- type: entity + noSpawn: true + parent: ADTFoodPacketChipsTrashBase + id: ADTFoodPacketChipsShrimpTrash + description: This is rubbish. + components: + - type: Sprite + state: shrimp-trash + +- type: entity + noSpawn: true + parent: ADTFoodPacketChipsTrashBase + id: ADTFoodPacketChipsSpaceTrash + description: This is rubbish. + components: + - type: Sprite + state: space-trash + +- type: entity + noSpawn: true + parent: ADTFoodPacketChipsTrashBase + id: ADTFoodPacketSpicyTrash + description: This is rubbish. + components: + - type: Sprite + state: spicy-trash + +# разделитель + +- type: entity + noSpawn: true + parent: ADTFoodDriedPacketTrashBase + id: ADTFoodPacketBeefTrash + description: This is rubbish. + components: + - type: Sprite + state: beef-trash + +- type: entity + noSpawn: true + parent: ADTFoodDriedPacketTrashBase + id: ADTFoodPacketChickenTrash + description: This is rubbish. + components: + - type: Sprite + state: chicken-trash + +- type: entity + noSpawn: true + parent: ADTFoodDriedPacketTrashBase + id: ADTFoodPacketHorseTrash + description: This is rubbish. + components: + - type: Sprite + state: horse-trash + +- type: entity + noSpawn: true + parent: ADTFoodDriedPacketTrashBase + id: ADTFoodPacketPigTrash + description: This is rubbish. + components: + - type: Sprite + state: pig-trash \ No newline at end of file diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/nostop.rsi/icon-open.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/nostop.rsi/icon-open.png new file mode 100644 index 0000000000000000000000000000000000000000..5136a73081415da586e0f2d549e699360ce29202 GIT binary patch literal 600 zcmV-e0;m0nP)Px%5=lfsR9Hu2WEfz;IKcKZj5=U61SkrDf|8d16MAYWGJ`D5_6}kH4NdeI&Y!u& z0HY5cSVfjuBx?d$o}3ZKaPG_n1|t&#I6Zg9A_j6CL6QStmV?R;kcA+Jz-X8lsg5Ao z0h6XSFqrg-k{kd^bp6d4443Y`VbIss zfES_{uigN&=g(gQau7*olBAfycG>>|^Lq>+M}PpxAus^8{G<{C!{I2B%p^%MgJ$Xf z(9m`U>2DnvRmj4RjtuXQY+zux-c6F3Bq;_tK+q!vU-JuVP?$bDs7NxVAcp z;dgruh6C>S=PU>L)Jh#ZERrb?1Rl_bSJ zOnm>3CU0jr@U4!)fvXAb0FdQ2;@u2BM>80<{QE?bnItKOIpB8w5r(ffcEBBAka3ye zz2+qPIY97WBE$Q4?-(x3&}A?$xXtkM#}E2C02Bf`9+SZq!yNHKv5P(-&~@n~I2WL& zftSrw80JUD(>4u&%7G()moZr1e8O-YTKvKi!gecrhGOY>+GaygT>vWaK)GPg=F4Ea z%_UgDG$k}@P)Px$_DMuRR9Hu2WEfz;IKcKZj5=U61cqh^*gJ&%N6$S653C}~GbC#QS)QB`$1r!s zA_jDt97mAk0GQ<<-=8~kfx*bc08WF%K#n5S5hOcc($pq~ipMrm2#oP$fyR4-?=2qsiMD4t%R)aNuf!I{;+4jd(YM&(REq zE&o1|WF|?9VGg*Re}v)djU8|Y7-U>#c&|B$ehv^kn8@({-8+U0Gjtiu3vM&~{PBan z4giIKj>lxM#V|*_Q0$^l2y|UK3C;!RY2an^6o&bc@w80?pmN~I-(?KeH=i(Ezj^~D z7i_n(XDF7Ar)@R_)dipu50ne`Y`zS3fVl)KmGQ7X> z5G4f2u^eOoN!bu)BghdjHmq7E)#ot%WI2GEotaSwjE2B~hX4R}`spD8*FnYr0000< KMNUMnLSTZIuJ*71 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/nostop.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Drinks/nostop.rsi/meta.json new file mode 100644 index 00000000000..cde51f8f5ad --- /dev/null +++ b/Resources/Textures/ADT/Objects/Consumable/Drinks/nostop.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "states": [ + { + "name": "icon" + }, + { + "name": "icon-open" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Chips/chips.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Chips/chips.rsi/meta.json new file mode 100644 index 00000000000..877fc40c596 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Chips/chips.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "onion-and-sourcream" + }, + { + "name": "shrimp" + }, + { + "name": "space" + }, + { + "name": "spicy" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Chips/chips.rsi/onion-and-sourcream.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Chips/chips.rsi/onion-and-sourcream.png new file mode 100644 index 0000000000000000000000000000000000000000..8b23593c943b7e623e1676bb29fea0f70db81623 GIT binary patch literal 527 zcmV+q0`UEbP)Px$$w@>(R9Hu2WEfz;IKcKZj5=U61V%$(=!Agu=EnbjZ+>EkPj_Kha^Mt0jDs0Y zdg07H49x0$3{QRQ33`yA0$4#M(Np{%WGKiHAQ~5d$%E(@CA|dAC#V3~BA6pUzQ+YX zp+l_YATvmE04N$jmdmjTGGymxq{#}9ehJHU=dnZbKoJHxYgPv8!a5|Uw%{-*$rf0~EDk*HDzn`PY$ppf{W$jcyb z|1$%(ye`-=baBAN>^cVhsZA&u0hIdb;sD*%TNpUF*%)g0e=_ij@-fUyD`oH~$Y*%_ z<_p8yH(wd*15;=p1)vZ>cEq!5PZ)09c*zhxv4KJ3z!Ta#AZb=NL;l6j3@h@Y81AfD z%D^ke&meB+!@y-M%kb^&V+NHOS81CKL2+Gq^9I<$`~A~VEC-26rS71O17Jllp@u9? zielu-h>!zdl@?ViBaxJp|128(-~>hpz|;{_ACOcR5VDvY`B4XqhQMeD0019$_aWyn Rynp}z002ovPDHLkV1f=fPx$jY&j7R9Hu2WEfz;IKcKZj5=U61V%$(=!C$%#>oF4KfGm7)-h&y^W*`8h>QYG z`tFsp4EzGZ3`+IO33`yA0$4$HzR>MI$WV|YKr}7@lLyg;{ksU7Pf!7}MKDKze2)u& zLWfw(L1vKT08li5EazosXIR#~62lF?c>!Rt^T+lv*v~yll-Wcng4qOfz_j))3~8qh zGHiFWX7Jp96i&}FvuAMkm1Owz=_73&kY2lyL7$5m>!Fv~vKgC`Na{?p@o!(I78p49^L~)B_|H#mJQrwh%aV>LfV$K>${1 z5#tD=i{gXH=KuNl_`$(T2*A`4Qy&oR0790MD?jRh(GVC70Ra3e^dUColYsyL002ov JPDHLkV1gC9%5wk! literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Chips/chips.rsi/space.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Chips/chips.rsi/space.png new file mode 100644 index 0000000000000000000000000000000000000000..27bd02d7e19c56575c89efb9f8a77bf5fafb5e69 GIT binary patch literal 456 zcmV;(0XP1MP)Px$f=NU{R9Hu2WEfz;IKcKZj5=U61V%$(=!8HLck%x#U+*(`Na`^>`Sh7VhL0B~ zz2o^M1|4oihIwCm33`yA0$4$1#t`%$WGKiHAQ~5d$%E)q4C@G*Pf!7}MKDKze9y(b zmLaZQf?nBc*+eOVg#ye0Am2N$TmrTbM1uf~oo(F6@Py$ZZ5?34 z=fp7oa|S$i`m0$O3S0j$aDMaz2R~gLaOBfIumiGc)-im4_nYDCo1YAQa{}q>0GQ>R zLaYqWPJUou6J%jXnrJ}Z5P-!4DD{H?U7{c{Yb687*Px&W(bHOjz}b&(4iIORVem@r zg*#&Yv~c=6;N|Zp46u-(dk7$xjvz=G`P)Px$^GQTOR9Hu2WEfz;IKcKZj5=U61V%$(=!C!nZtnlLn3xz`KYwO;$j!|l|Me?Q zdN(gGgWA7;3<_Vr67(QJ1+ao@7ccLBkf9()fM{F*CJ&%3bB@h^pNBLP&B|S*K0e&u-(xbY_ZzB6%4nMA{e~qrhy$X zmxqTT<;xeM%qB_^EEHf4nC!^FApA~~!E^snhP(G4gDnTKe{2nBxRP~(;nDy9v~>W3 ztu4c3mcw9o>8UG0Lcv;@;aA2naPZT`0St#B4gi7QSzHXy7D57(?hXK1{@a|L;dRz8 z2C4Y}3?^gEfi$nihmFGImmK$D_4e}$997qLAMb2mU0CgbFqo-7U|>D@ zlfh5PjG?IUEPX-%DOb1MT?kd;{aGu406Qkqw-*%BP@Tx;PmSeI6Km$C`PV~K#9*G_Af?#1j>ToLJ3-F zQMEFf!^87mj*$_Zzz6}DI%4VrlIj9N7Ly}C>VVM@7!3gcv|br7>5OiH00000NkvXX Hu0mjfEUx>e literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Chips/trash.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Chips/trash.rsi/meta.json new file mode 100644 index 00000000000..8e881246d79 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Chips/trash.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "onion-and-sourcream-trash" + }, + { + "name": "shrimp-trash" + }, + { + "name": "space-trash" + }, + { + "name": "spicy-trash" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Chips/trash.rsi/onion-and-sourcream-trash.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Chips/trash.rsi/onion-and-sourcream-trash.png new file mode 100644 index 0000000000000000000000000000000000000000..151887cea9dc86abbb82fc878f46f54503b4b655 GIT binary patch literal 643 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Dried/meat.rsi/beef.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Dried/meat.rsi/beef.png new file mode 100644 index 0000000000000000000000000000000000000000..97f7777cf02f82b17a3b5854c49fdb887fc09c1d GIT binary patch literal 408 zcmV;J0cZY+P)Px$Qb|NXR9Hu2WEfz;IKcKZj5=U61V%%Eq7W!9Y%GRl~Y@(;&yt#Q}xhHa&{s++d4gj(}NC7Y8hwGO_3U_SFn9M}T|}0ww5WhDG3L> zCA6l3kZfi845-nFd71*Apihu_|YM;O0(hs0000Px$NJ&INR9Hu2WEfz;IKcKZj5=U61V%$(Gz7>B0Syg}|F{aU8#iu{WF|?9VV3gp z^8R;rcE)hS-o1MnK7am9l9?naMs|R-v^0hTo<4m_KL_B70=k62+Lh~jG_*7@+;HRC z4Tj+Gz!Fj_IFh3P+4ApacNB9Pd-Q@VPx$g-Jv~R9Hu2WEfz;IKcKZj5=U61cq)1oIZQ;zp|n%!`=Ij8DO-ju|CNjB3T0{ z+upi$HwahuRZ~-5M@rTv*#RKSg@pKV+VSq)M+Q^c1c938LTeq|67=4M#D?nE%nqrlx> zcP+>=Pzc<4@|oe(l~-WPL5|pY@G|Wk07`_Q5HQmbV^ERdWmvZ3F4zHE4_ptXYZ?Fr zJt!1F(E#%O>C2Dk>i`8wZiWZXzk<^M$oF(lgs^llARz$D1;~kzE@=Q(2jD6SL3INu zbppvHAvOmXYs-Lh!S+Kp!IcwT9N=lEjuHqU%RzwV4(R0*{ckS82DYr2?H5DuFE%(0 z5Px$g-Jv~R9Hu2WEfz;IKcKZj5=U61V%%EL&6_t2#5jU12dr4JgyHO!dklB(++zq2 zZ~?Q8b(Fw#cS{}Eku-GxF~LAn2h=HiW#AVOW+=Y!1MZey0}h6dAKo%FJ>aH&2owlC zW8mZChdTmh`KM1G8791wqOAj9zQ+{}uuz~`6o7mS10pgCaQ2%g58!N2)KJ|4y?kQ- z%_UeFq@wM>7J)36E||jbbV3fChB@Nd(nAaQ4+KvD2@>s8u0;IFL=JOQFd0myPtLS#Ptgmw<_eEx}HOPChe5g^N80LJ%Ob&X-W zBp>Y@0J0F|2wVVUIS9}!4G>cb(!>FvYPdDhlvw*2s+XT;Af{R-Iv2p&0mQlh)Lx*f z13(so96_uDh_M`G7SSO4ZLn7Rh zQzQ}&SRD9f++&qs!s5Z#SmAy3KX?CqwMhAONBl&aH3~&SWg6aC2gy2bWA@nEp%vJ0 zKB!36rHmtBHH+#=#-pvhN87}fvAngbe`MmEUtg>5*viARMD(b4Se|xR@HC~2cWZZ_ zmq~J<47KVq5 W3KXwQvM2|7j=|H_&t;ucLK6VU4`Ap3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Dried/trash.rsi/chicken-trash.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Dried/trash.rsi/chicken-trash.png new file mode 100644 index 0000000000000000000000000000000000000000..e55cff7266539014199ca91fe5bd8d138f724b25 GIT binary patch literal 280 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}mpok@Ln7Rh zQzQ}&SRD9f++&qs!s6x(B-+wALRfGA%a5*>cvF#LX1Vm$1s=v3{(pV0{?E6noxEs* zf;P(pT{ZO^6TeP))38fg35jZ;T=!D-0MB1{TrZ#XrExK9veHJIPHh-tRICnsx{jDwGWaFFq7I4aZ5s22NH=r#JG)BFJv=((-vrL+ zcbs;(#xF}_f(+9Mz6MLCn~d-8)usdl2di0WX_PTk&FKf3l_AHp{CwP>^=mY`H}Bb5 z{ok;80=E9)Iee{teuvrg zjMfu;1&Px%8%ab#R9Hvtmdh(daTLeTkRn`SlGkF`kjMyGjUp*EYBorgcCr{*SSSl+Ihln& zfyhcBC8f+t67qxYOwr!6T7~Z3V1*I1mW|#2ZElm^Of=rFq&vxukITk_LQT;<&lKTKEb72)q19 zgk6E?HvCovRDhGc5&#BJ_IJwlP6dUR)GzGw_jUn7L^aRo7&Dwmw6nyzA}$*7j|g({);$o z#e@MMUg4jko8YMF0ihzUG=$iUDs&FJMenWI%hUmY7QC;YroI9aprxjVVEq{(yd@)>QEY3T!iARz1v;;@ttAwI)1gRLU?>)v^cetv7M zScivAF7B~D%j~BB0Qdocb@evH0Bo%ui*xwSShT3Mp);FD?f%( vP=Z(iAc%FYu)J5P0=AQv#D#x={|fv7xVa`U2lT4800000NkvXXu0mjfmi`n2 literal 0 HcmV?d00001 From d5168ee59e95269b959d821db71500267c80ba65 Mon Sep 17 00:00:00 2001 From: 1Stepka1 <131589665+1Stepka1@users.noreply.github.com> Date: Sat, 20 Jan 2024 12:29:39 +0300 Subject: [PATCH 2/6] Update snacks.ftl --- Resources/Locale/ru-RU/ADT/Objects/Consumable/Food/snacks.ftl | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Locale/ru-RU/ADT/Objects/Consumable/Food/snacks.ftl b/Resources/Locale/ru-RU/ADT/Objects/Consumable/Food/snacks.ftl index a4463f0da29..710091b4223 100644 --- a/Resources/Locale/ru-RU/ADT/Objects/Consumable/Food/snacks.ftl +++ b/Resources/Locale/ru-RU/ADT/Objects/Consumable/Food/snacks.ftl @@ -1,3 +1,4 @@ + #Чипсеки ent-ADTFoodSnackChipsOnionAndSourcream = чипсы со вкусом зелёного лука и сметана From 1ab1d62eb0a744046facd1dc707f310fa2de8dc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Schr=C3=B6dinger?= <132720404+Schrodinger71@users.noreply.github.com> Date: Wed, 31 Jul 2024 10:51:28 +0300 Subject: [PATCH 3/6] Rename Resources/Locale/ru-RU/ADT/Objects/Consumable/Drinks/cans.ftl to Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.ftl --- .../Entities/Objects/Consumable/Drinks/drinks_cans.ftl} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename Resources/Locale/ru-RU/ADT/{Objects/Consumable/Drinks/cans.ftl => prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.ftl} (73%) diff --git a/Resources/Locale/ru-RU/ADT/Objects/Consumable/Drinks/cans.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.ftl similarity index 73% rename from Resources/Locale/ru-RU/ADT/Objects/Consumable/Drinks/cans.ftl rename to Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.ftl index b312112aa3a..240f89260a2 100644 --- a/Resources/Locale/ru-RU/ADT/Objects/Consumable/Drinks/cans.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.ftl @@ -1,2 +1,2 @@ ent-ADTDrinkNoStopCan = Банка энергетика NoStop - .desc = Натуральный энергетический напиток, в нем нет сахара! \ No newline at end of file + .desc = Натуральный энергетический напиток, в нем нет сахара! From 5f1f5361b6593bc23a4d900275b9b22edefdd690 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Schr=C3=B6dinger?= <132720404+Schrodinger71@users.noreply.github.com> Date: Wed, 31 Jul 2024 10:56:02 +0300 Subject: [PATCH 4/6] Rename Resources/Locale/ru-RU/ADT/Objects/Consumable/Food/snacks.ftl to Resources/Locale/ru-RU/ADT/Entities/Objects/Consumable/Food/snacks.ftl --- .../ru-RU/ADT/{ => Entities}/Objects/Consumable/Food/snacks.ftl | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Resources/Locale/ru-RU/ADT/{ => Entities}/Objects/Consumable/Food/snacks.ftl (100%) diff --git a/Resources/Locale/ru-RU/ADT/Objects/Consumable/Food/snacks.ftl b/Resources/Locale/ru-RU/ADT/Entities/Objects/Consumable/Food/snacks.ftl similarity index 100% rename from Resources/Locale/ru-RU/ADT/Objects/Consumable/Food/snacks.ftl rename to Resources/Locale/ru-RU/ADT/Entities/Objects/Consumable/Food/snacks.ftl From 26b497a3d921d4074eac9d23eb3e8333b81edd6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Schr=C3=B6dinger?= <132720404+Schrodinger71@users.noreply.github.com> Date: Wed, 31 Jul 2024 11:03:44 +0300 Subject: [PATCH 5/6] Rename Resources/Locale/ru-RU/ADT/Entities/Objects/Consumable/Food/snacks.ftl to Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/snacks.ftl --- .../{ => prototypes}/Entities/Objects/Consumable/Food/snacks.ftl | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Resources/Locale/ru-RU/ADT/{ => prototypes}/Entities/Objects/Consumable/Food/snacks.ftl (100%) diff --git a/Resources/Locale/ru-RU/ADT/Entities/Objects/Consumable/Food/snacks.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/snacks.ftl similarity index 100% rename from Resources/Locale/ru-RU/ADT/Entities/Objects/Consumable/Food/snacks.ftl rename to Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/snacks.ftl From cb70e7cf94bdc9c5a8fbcd0deffb8c81265469cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Schr=C3=B6dinger?= <132720404+Schrodinger71@users.noreply.github.com> Date: Wed, 31 Jul 2024 11:04:45 +0300 Subject: [PATCH 6/6] Rename cans.yml to drinks_cans.yml --- .../Objects/Consumable/Drinks/{cans.yml => drinks_cans.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/{cans.yml => drinks_cans.yml} (100%) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/cans.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks_cans.yml similarity index 100% rename from Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/cans.yml rename to Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks_cans.yml