From 870372a042404503a8f2d0b24572603de1842244 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 12:58:09 +0300 Subject: [PATCH] =?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=D1=88=D0=BE=D0=BA=D0=BE=D0=BB=D0=B0=D0=B4=D0=BD?= =?UTF-8?q?=D1=8B=D0=B5=20=D0=B1=D0=B0=D1=82=D0=BE=D0=BD=D1=87=D0=B8=D0=BA?= =?UTF-8?q?=D0=B8=20(#153)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Описание PR Перенос https://github.com/AdventureTimeSS14/space_station/pull/332 **Проверки** - [x] PR полностью завершён и мне не нужна помощь чтобы его закончить. - [x] Я внимательно просмотрел все свои изменения и багов в них не нашёл. - [x] Я запускал локальный сервер со своими изменениями и всё протестировал. - [x] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR этого не требует. --------- Co-authored-by: 1Stepka1 Co-authored-by: 1Stepka1 <131589665+1Stepka1@users.noreply.github.com> --- .../Objects/Consumable/Food/snacks.ftl | 58 ++++ .../Objects/Consumable/Food/snacks.yml | 261 +++++++++++++++++- .../Food/Chocolate/bars.rsi/bar-choco.png | Bin 0 -> 235 bytes .../Food/Chocolate/bars.rsi/bar-coconut.png | Bin 0 -> 282 bytes .../Food/Chocolate/bars.rsi/bar-energy.png | Bin 0 -> 329 bytes .../Food/Chocolate/bars.rsi/bar-nuts.png | Bin 0 -> 327 bytes .../Food/Chocolate/bars.rsi/bar-pink.png | Bin 0 -> 227 bytes .../Food/Chocolate/bars.rsi/bar-two.png | Bin 0 -> 321 bytes .../Food/Chocolate/bars.rsi/meta.json | 29 ++ .../Chocolate/packing.rsi/choco-packed.png | Bin 0 -> 436 bytes .../Chocolate/packing.rsi/coconut-packed.png | Bin 0 -> 332 bytes .../Chocolate/packing.rsi/energy-packed.png | Bin 0 -> 394 bytes .../Food/Chocolate/packing.rsi/meta.json | 29 ++ .../Chocolate/packing.rsi/nuts-packed.png | Bin 0 -> 435 bytes .../Chocolate/packing.rsi/pink-packed.png | Bin 0 -> 430 bytes .../Food/Chocolate/packing.rsi/two-packed.png | Bin 0 -> 425 bytes .../Food/Chocolate/trash.rsi/choco-trash.png | Bin 0 -> 533 bytes .../Chocolate/trash.rsi/coconut-trash.png | Bin 0 -> 487 bytes .../Food/Chocolate/trash.rsi/energy-trash.png | Bin 0 -> 513 bytes .../Food/Chocolate/trash.rsi/meta.json | 29 ++ .../Food/Chocolate/trash.rsi/nuts-trash.png | Bin 0 -> 574 bytes .../Food/Chocolate/trash.rsi/pink-trash.png | Bin 0 -> 563 bytes .../Food/Chocolate/trash.rsi/two-trash.png | Bin 0 -> 583 bytes 23 files changed, 405 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/bars.rsi/bar-choco.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/bars.rsi/bar-coconut.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/bars.rsi/bar-energy.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/bars.rsi/bar-nuts.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/bars.rsi/bar-pink.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/bars.rsi/bar-two.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/bars.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/packing.rsi/choco-packed.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/packing.rsi/coconut-packed.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/packing.rsi/energy-packed.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/packing.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/packing.rsi/nuts-packed.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/packing.rsi/pink-packed.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/packing.rsi/two-packed.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/trash.rsi/choco-trash.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/trash.rsi/coconut-trash.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/trash.rsi/energy-trash.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/trash.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/trash.rsi/nuts-trash.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/trash.rsi/pink-trash.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/trash.rsi/two-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 710091b4223..5d2bbb53894 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 @@ -52,3 +52,61 @@ ent-ADTFoodPacketHorseTrash = пустая упаковка от сушеной ent-ADTFoodPacketPigTrash = пустая упаковка от вяленой свинины .desc = Мусор + +# Батончики упакованный + +ent-ADTFoodSnackChocolateBarChocoPack = шоколадный батончик + .desc = Батончик с начинкой из молочного крема, покрытый шоколадом. + +ent-ADTFoodSnackChocolateBarCoconutPack = кокосовый батончик + .desc = Батончик с мякотью кокоса, покрытая лёгким молочным шоколадом. + +ent-ADTFoodSnackChocolateBarEnergyPack = энергетический батончик + .desc = Питательный батончик, из смеси злаков, фруктов и орехов, хороший перекус для спорта. НЕ ТОРМОЗИ! + +ent-ADTFoodSnackChocolateBarNutsPack = шоколадный батончик с орехами + .desc = Батончик с начинкой из молочного крема с арахисом, покрытый шоколадом. + +ent-ADTFoodSnackChocolateBarPinkPack = розовый шоколадный батончик + .desc = Белый молочный шоколад со вкусом клубники обволакивает легкое молочное кремовое наполнение. + +ent-ADTFoodSnackChocolateBarTwoPack = двойной батончик + .desc = Выбирай, на чьей ты стороне? + +# Батончики +ent-ADTFoodSnackChocolateBarChoco = шоколадный батончик + .desc = Батончик с начинкой из молочного крема, покрытый шоколадом. + +ent-ADTFoodSnackChocolateBarCoconut = кокосовый батончик + .desc = Батончик с мякотью кокоса, покрытая лёгким молочным шоколадом. + +ent-ADTFoodSnackChocolateBarEnergy = энергетический батончик + .desc = Питательный батончик, из смеси злаков, фруктов и орехов, хороший перекус для спорта. НЕ ТОРМОЗИ! + +ent-ADTFoodSnackChocolateBarNuts = шоколадный батончик с орехами + .desc = Батончик с начинкой из молочного крема с арахисом, покрытый шоколадом. + +ent-ADTFoodSnackChocolateBarPink = розовый шоколадный батончик + .desc = Белый молочный шоколад со вкусом клубники обволакивает легкое молочное кремовое наполнение. + +ent-ADTFoodSnackChocolateBarTwo = двойной батончик + .desc = Выбирай, на чьей ты стороне? + +# Обертки +ent-ADTFoodSnackChocolateTrashChoco = обертка от шоколадного батончика + .desc = Мусор + +ent-ADTFoodSnackChocolateTrashCoconut = обертка от Кокосового батончика + .desc = Мусор + +ent-ADTFoodSnackChocolateTrashEnergy = обертка от Энергетического батончика + .desc = Мусор + +ent-ADTFoodSnackChocolateTrashNuts = обертка от Шоколадного батончика с орехами + .desc = Мусор + +ent-ADTFoodSnackChocolateTrashPink = обертка от Розовый шоколадного батончика + .desc = Мусор + +ent-ADTFoodSnackChocolateTrashTwo = обертка от Двойного батончика + .desc = Мусор diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml index 5b294ac68f4..fd78b688f86 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml @@ -230,4 +230,263 @@ description: This is rubbish. components: - type: Sprite - state: pig-trash \ No newline at end of file + state: pig-trash + +#Chocolate packing + +- type: entity + name: chocolate bar + parent: FoodSnackChocolate + id: ADTFoodSnackChocolateBarsBase + description: Tastes like cardboard. + abstract: true + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Chocolate/packing.rsi + state: choco-packed + - type: Item + heldPrefix: chocolatebar + size: Tiny + - type: Tag + tags: + - FoodSnack + - type: SpawnItemsOnUse + items: + - id: FoodPacketChocolateTrash + - id: FoodSnackChocolateBar + sound: + path: /Audio/Effects/unwrap.ogg + +- type: entity + name: chocolate bar + parent: ADTFoodSnackChocolateBarsBase + id: ADTFoodSnackChocolateBarChocoPack + description: Tastes like cardboard. + components: + - type: Sprite + state: choco-packed + - type: Tag + - type: SpawnItemsOnUse + items: + - id: ADTFoodPacketChocolateTrashChoco + - id: ADTFoodSnackChocolateBarCoconut + +- type: entity + name: chocolate bar + parent: ADTFoodSnackChocolateBarsBase + id: ADTFoodSnackChocolateBarCoconutPack + description: Tastes like cardboard. + components: + - type: Sprite + state: coconut-packed + - type: Tag + - type: SpawnItemsOnUse + items: + - id: ADTFoodPacketChocolateTrashCoconut + - id: ADTFoodSnackChocolateBarCoconut + +- type: entity + name: chocolate bar + parent: ADTFoodSnackChocolateBarsBase + id: ADTFoodSnackChocolateBarEnergyPack + description: Tastes like cardboard. + components: + - type: Sprite + state: energy-packed + - type: Tag + - type: SpawnItemsOnUse + items: + - id: ADTFoodPacketChocolateTrashEnergy + - id: ADTFoodSnackChocolateBarEnergy + +- type: entity + name: chocolate bar + parent: ADTFoodSnackChocolateBarsBase + id: ADTFoodSnackChocolateBarNutsPack + description: Tastes like cardboard. + components: + - type: Sprite + state: nuts-packed + - type: Tag + - type: SpawnItemsOnUse + items: + - id: ADTFoodPacketChocolateTrashNuts + - id: ADTFoodSnackChocolateBarNuts + +- type: entity + name: chocolate bar + parent: ADTFoodSnackChocolateBarsBase + id: ADTFoodSnackChocolateBarPinkPack + description: Tastes like cardboard. + components: + - type: Sprite + state: pink-packed + - type: Tag + - type: SpawnItemsOnUse + items: + - id: ADTFoodPacketChocolateTrashPink + - id: ADTFoodSnackChocolateBarPink + +- type: entity + name: chocolate bar + parent: ADTFoodSnackChocolateBarsBase + id: ADTFoodSnackChocolateBarTwoPack + description: Tastes like cardboard. + components: + - type: Sprite + state: two-packed + - type: Tag + - type: SpawnItemsOnUse + items: + - id: ADTFoodPacketChocolateTrashTwo + - id: ADTFoodSnackChocolateBarTwo +#Chocolate bars +- type: entity + name: chocolate bar + parent: FoodSnackChocolateBar + id: ADTFoodSnackChocolateBarBase + description: Tastes like cardboard. + abstract: true + components: + - type: FlavorProfile + flavors: + - chocolate + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Chocolate/bars.rsi + state: bar-choco + - type: Item + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Theobromine + Quantity: 3 + - ReagentId: CocoaPowder + Quantity: 1 + - type: Extractable + grindableSolutionName: food + +- type: entity + name: chocolate bar + parent: ADTFoodSnackChocolateBarBase + id: ADTFoodSnackChocolateBarChoco + description: Tastes like cardboard. + components: + - type: Sprite + state: bar-choco + +- type: entity + name: chocolate bar + parent: ADTFoodSnackChocolateBarBase + id: ADTFoodSnackChocolateBarCoconut + description: Tastes like cardboard. + components: + - type: Sprite + state: bar-coconut + +- type: entity + name: chocolate bar + parent: ADTFoodSnackChocolateBarBase + id: ADTFoodSnackChocolateBarEnergy + description: Tastes like cardboard. + components: + - type: Sprite + state: bar-energy + +- type: entity + name: chocolate bar + parent: ADTFoodSnackChocolateBarBase + id: ADTFoodSnackChocolateBarNuts + description: Tastes like cardboard. + components: + - type: Sprite + state: bar-nuts + +- type: entity + name: chocolate bar + parent: ADTFoodSnackChocolateBarBase + id: ADTFoodSnackChocolateBarPink + description: Tastes like cardboard. + components: + - type: Sprite + state: bar-pink + +- type: entity + name: chocolate bar + parent: ADTFoodSnackChocolateBarBase + id: ADTFoodSnackChocolateBarTwo + description: Tastes like cardboard. + components: + - type: Sprite + state: bar-two + +#Trash + +- type: entity + noSpawn: true + parent: FoodPacketChocolateTrash + id: ADTFoodPacketChocolateTrash + name: chocolate wrapper + abstract: true + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Chocolate/trash.rsi + state: choco-trash + - type: Item + +- type: entity + noSpawn: true + parent: ADTFoodPacketChocolateTrash + id: ADTFoodPacketChocolateTrashChoco + name: chocolate wrapper + components: + - type: Sprite + state: choco-trash + +- type: entity + noSpawn: true + parent: ADTFoodPacketChocolateTrash + id: ADTFoodPacketChocolateTrashCoconut + name: chocolate wrapper + components: + - type: Sprite + state: coconut-trash + +- type: entity + noSpawn: true + parent: ADTFoodPacketChocolateTrash + id: ADTFoodPacketChocolateTrashEnergy + name: chocolate wrapper + components: + - type: Sprite + state: energy-trash + +- type: entity + noSpawn: true + parent: ADTFoodPacketChocolateTrash + id: ADTFoodPacketChocolateTrashNuts + name: chocolate wrapper + components: + - type: Sprite + state: nuts-trash + +- type: entity + noSpawn: true + parent: ADTFoodPacketChocolateTrash + id: ADTFoodPacketChocolateTrashPink + name: chocolate wrapper + components: + - type: Sprite + state: pink-trash + +- type: entity + noSpawn: true + parent: ADTFoodPacketChocolateTrash + id: ADTFoodPacketChocolateTrashTwo + name: chocolate wrapper + components: + - type: Sprite + state: two-trash \ No newline at end of file diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/bars.rsi/bar-choco.png b/Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/bars.rsi/bar-choco.png new file mode 100644 index 0000000000000000000000000000000000000000..54397ac537413145ee3bbf1d904e429bac37e3e0 GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}OFdm2Ln7Rh zQzQ}&SRD9f++&qs!s6x(AwIM>?AmgoUQsV>)2g2G`*p^5YJRb;SO4hMq!T_}DDA>T zVP@-u|4XfT`l_^CHm|p-I$H4gX7rvug%=G8+`eoR92GwNI;_qX$Y{6drb7FA+rqg; z>T+6|{5h7*O^ z{xQq@nDcBZdB0tJ%|Bnlh4sgSg^Wqf3}%G^9hoOOf{rsT(6}&BxS8F$NaR6MeC3y} zsz8S_-ET|3YM@J0rwL!Oe${YMK!UdsL@+Xx?~YTP T^iHE6=syNeS3j3^P6EDn4#?y*WRVR3VY5E(5EySALDuk=i8i%rin+BI{m6bm}>BhMWlrWq) zeoc%mf%|^Vj}sq0{EXg^s<5qt!G4dC>$AgGTv@G*Wo!!>WukUu#V(Rz*d!vt`hp== zW-fn`MW_se5r@bb1@{9rwcmc(7I++B&|z_SWKg=`1=GvjKfmz)R5W;y$?$|>g8t5% zkrECof1TakpCI3KL%~qO0cdt7hvOxVeRCWPcrWZaY4)n&qJRW%BbZ?1XJlyHH$$;% T>4U4luwn3Y^>bP0l+XkKbpwM; literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/bars.rsi/bar-nuts.png b/Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/bars.rsi/bar-nuts.png new file mode 100644 index 0000000000000000000000000000000000000000..efec36ff6b58a86ee34f06000ff2e6a6aa06179d GIT binary patch literal 327 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^TEDn4#?y*WRVR3VY5Fgqbc5OLPuc#MRFmXByec`JM z>1z)5YiBtube+hY_s#M@JL}u2?&}R|Zpmsk3mM&TYSvO@@M2at?ZD^g$9&_)f-MYQ zOHRCOS!9y1QtPL@?U{>O=$768S0+75`p;8_wYPf~D;h{KK?w$i-qtR~u8LLS Qz>s0^boFyt=akR{061!ZN&o-= literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/bars.rsi/bar-pink.png b/Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/bars.rsi/bar-pink.png new file mode 100644 index 0000000000000000000000000000000000000000..676fea32c8b59a0f1e7c31982c77c595d08d50e6 GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}b3I)gLn7Rh zQzQ}&SRD9f++&qs!s6x(BRJX)+@JIHzvjvfGnTVF+RD6M<;17`xAtppoZt9UOPkrw zUEnFh1jQ!|6CSs3V?KBD?639f)lWI(nKabYf4r2jq^1cQH78g)oM7;J>Mm;_#k5!vNHEJWF=Td`D4t7d RJOOklgQu&X%Q~loCIDZMQcVB= literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/bars.rsi/bar-two.png b/Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/bars.rsi/bar-two.png new file mode 100644 index 0000000000000000000000000000000000000000..99bce244a3ff6489b005344ba9d24a7d85361356 GIT binary patch literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}zdc%wPGdUe?mEZS7_z$vu~^O?Ek5eJ15b$uG4y|3_0> zBI}-B)NcD6TqD6#ylsNZ@v^x|3@?v9=h(xyA!O8Mqo(9DB**=RQj^sLVcj z#$&Cc8_qAArm$bjaK^*0?fyK+^X-pk^2f2S@b3O2{wOJx!ICLOfJ0&P$B&7x?$!Q2 zTk!d%^d}jI{%uSLV;H>IZBEKx<9U``nE!=!#cYn~ zyN4u1bXz6g$=9C_*qbfNtoScONkvUi*r(-)gj46NK=z)t0~s7WZ43Px$Zb?KzR9Hu2WEfz;IKcKZj5=U61V%$(Gz1232&hYo{1@V4WjKEOIYo}NRF(Yy z?%QvMn@`_hH3z5RAdR8|eBhFL)9IUJIl|9W{XakprBdIYDzAk8{*VqgbcdGv~` zDg#+RE>GYM0Y^O*u*G}ielWa#_n9H`izrzR*?;K{Wg)Pf=QYF6cmEj@*u=o0(J_Am zgQm6yPRCrodV`@NF@S-h5CA1Ybtz%EA+V?bS?*F9z`!oV$RKMZ!*DQfH-l1wCfI>0 zF0x=pJwEq@VQcAnh9&iBU+m5MS8vfulh8+JA=lk`9KFZIxilVHSCJ z2cqyn4xAj*!LYEW0-OLr09S6pnFe4X05af(6+hUA@;4xcm9$JFm==0!vcPIU9w0je zK$<}g0OezH0H_>+nL$EDn4#?y*WRVR3VY5glBNE6;8Hueox|ys7Mux3I5gP6>scos&?~MM;E9iPyIK!;@&8pQJCTAuZ6bi^6X`A^`C5HX5-5$Pz`~Uy{e;WMy z0AI&_LC$S=eB65;W}Fh+aMXa?!KCATVMAkLJM)pC8O)AF3hXatu^PT9Nl`h=ctSD3 z_Beaa!{+DllJl;;Tkg-%@JQ}Sb*^DY{z=yGc*jMI(NPLB*y3cP4l5`v_g;55p*CMG zHcenNccOwN?}41u(|HRt#Q)5?EDn4#?y*WRVR3VY5glBO%#vRJnM-;Ku0>0)o5Os%@ydZ421ogf-#y&Qy#C4N zqwD_X%kDkBAZ_g#1yz;9A3USl9-dvw%rm{;F73njVwT&1)0NJDcyc-2AiAwz+^6}6 zLYdq3K(-zKZrqJ{d+2oofBLWg@iUAi-!V*hC~f{W{leC1sR9>^6CPCmV##^9xm-Z% ziHC%=7?T3K#F8gQ95X~Fy<_+ya6pWGfq=vJuRTWD8{RuMED~TiYOC>Mr^#Lkp^E$m zKFr*9*$qz}vJ!G;Jj%bmy-~JNTUWq`Is4h$vPx$ZAnByR9Hu2WEfz;IKcKZj5=U61V%$(Gz1232uMjv|L5f7X1IIr7DbL!R#N-_ z{rgvjXV0HvH3z5RAdNgc+~AV>;-&LsIYM90@IOfZmoHy&dIYDzAkD(U!e9ryefyTI zDg#+RE>GYM0eN{ju*K`Ty&1k;-^LI#59}e5!NZ4-C<}olNsJ7)j^1Txx~T*XjpfUh zF=%RQ;B?6Kt2Y=TqoNon3IR|e6crVN8v=_8kmawYcr&P3D>HCudNJ@D7ce|u;s$o0 zK}s&zQJ~QJU^s~(CpQ=D;McETk(UTThJg~|!Fh3DLp{6SFw|AoFSHbWm1V4psy50NEh` z(hPC{C?AspK;;O`46;H1WB|TGgpi|Pg&Ele5ha$x97m``C98xZEDn4#?y*WRVR3VY5FgqOC~n;MUvT|2qZ0-vfHqoYH(n|HE&-Y5PBY zwLAQ=p`gt^ZNJ2g)k%hL4!>&H)h-uBy+g-@;uZeVs`NLz7z&U&7tB&7oG3A)Z{ z(tj>8ypH}R1@aUZ3T~H8U&f{TuL}BR#VHh%(0K5m958(PjteK%`C}m z%>T|OY*p}|Aj7oa2m4M55mtli%{edKpFQ8yt{vDG~8Wn*Uc`q-8@412^l0d=J(QF$E8m z^_}mX4|#Nn;e^lxWvjY#3Rmscywbj5ydjD&$fkl@X;sBs4rf>>ny|3hurRoOpRK6P SH?a;F0Sun5elF{r5}E+7*`=`n literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/packing.rsi/two-packed.png b/Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/packing.rsi/two-packed.png new file mode 100644 index 0000000000000000000000000000000000000000..1690cea8e13140b5cf10b1be5ec8ed2d96bcae37 GIT binary patch literal 425 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<$(}BbArbD$ zDG~_>EDn4#?y*WRVR3VY5C!cGOIJPlzx!yJNT~R!z3mcx_v`vDFOE?C<8$@@{(m1j z9YY%WAN~=MXFEJcH$jRe?C;0qfWXU12D`2^K5Kq*sNT>pwv z9z1ia!qXwL8Y|4Xe4*pHOWO^S#~W7}ralPY}UQL&e3f_uY@e?1BtY&zz? zNo6k6@!>zi*jJ^+lbg*i{G8#7K!YS(H}{OE3U(fTzt2e*a5UU_t~2wXV#7OzfQ(79 zOfLc%xLG4S6xtbjcrQDbaWwE;pD3Js!%ACV9!K%?e{7q#_UcNkn`e8_z;f19$9u_Y z7Q7{Iy;(OqWzopr04A)m82|tP literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/trash.rsi/choco-trash.png b/Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/trash.rsi/choco-trash.png new file mode 100644 index 0000000000000000000000000000000000000000..db3b93a9e1b1fec5244415b61698d1fa4b9c180a GIT binary patch literal 533 zcmV+w0_y#VP)Px$&q+iE5qY+PZ;hmyg{_Dkd*60W)(00000NkvXXu0mjfs|Vq& literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/trash.rsi/coconut-trash.png b/Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/trash.rsi/coconut-trash.png new file mode 100644 index 0000000000000000000000000000000000000000..5b5c61734f5b574dfb4d5560f80ee1dbde2cc4f5 GIT binary patch literal 487 zcmVPx$p-DtRR9Hu2WEfz;IKcKZj5=U61V%$(Gz6#~0#co8|APv*XXU{}nN5@;e5EDK zLYNw#ySo_-4fPqCKZ!9gDX23%3D?1E2SpA5S^l&v2yD0Ps;dl-!?YP@%$UKDnVHF$ zmX`5fi|#?|9fx~oS0Y( z%ow6Plo{?k`OI)MWeeB=uy}{jppXCoQbGf-1Kjuj|9|<^IGGeuh=n$};;{&$qL)Cq_ogl{{1CT`^N5G;6 z7JB%yB3=i8;vVFCZ81oEg8;InZysGnae#=NF4(s)aP`$ya0uWlln92vt3zuTKnBAA zvZcSKHlXNd%Wn9Ou2#%01aDzPR4xD+408awrRb@e6ty6|L^*)eyiJPwQ3s5Mz-S1J dhQNS_008;yu_5g=Uibh2002ovPDHLkV1i9l(Z&D( literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/trash.rsi/energy-trash.png b/Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/trash.rsi/energy-trash.png new file mode 100644 index 0000000000000000000000000000000000000000..8190c7c4f07181fb7eb28c5a963e4bace2bfd9e8 GIT binary patch literal 513 zcmV+c0{;DpP)Px$yGcYrR9Hu2WEfz;IKcKZj5=U61V%$(Gz3ONfTkgEAVcZD!;E{3&lbD>mx|qu z)h?<#0Awkweo?blX1I0qE(6FBxau6D8~`#jK*xyTL(Uo$^#W5uz?N;eat>@hNKIa= z4#SgApBZHMco~|WHxM)*uL4lefqVe+iIk8GgTVdIC?5Hs$jeZdA`i9@1VEN%bRC7O zA>@0ILc9+6aHjwNg*lVq4)`Q3!|>+P0fx&*A2ay-Il?V^_U;Lo4RR!iJ)_K;!O4FS zSRa?B7lVLFA$d`N9s(dsHg4L_pldD5Afo5M!1weCI0Qfd7VJfv`N4dAmLdlu-VgxA zJJdjN*U;yWfKO$cYff28my~d5<9^$&~?D79{8ZPzZnwfjIzIRzh|_)7mv~WgvYp z{kTGcU^W4nHp!9Uf4`Um!+Tp16gLPSegozgzB&M=L2B-=JODQnq%Utj{)A4H17Nl) zhC9Fu8ITyVWw=6zkT^*WAY>Rh@}mwI4S~@R7!3gc6tJKnytV@-00000NkvXXu0mjf D{@Bhw literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/trash.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/trash.rsi/meta.json new file mode 100644 index 00000000000..2f43531e0e7 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/trash.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "choco-trash" + }, + { + "name": "coconut-trash" + }, + { + "name": "energy-trash" + }, + { + "name": "nuts-trash" + }, + { + "name": "pink-trash" + }, + { + "name": "two-trash" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/trash.rsi/nuts-trash.png b/Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/trash.rsi/nuts-trash.png new file mode 100644 index 0000000000000000000000000000000000000000..47b752d721cbc70232337dbcad5aa333edf5f193 GIT binary patch literal 574 zcmV-E0>S->P)Px$_(?=TR9Hu2WEfz;IKcKZj5=U61cqM-C@ZP`|Ni|e!?Wj4iSis#iipjs`g(@{ zL2AEz`O0wj-YufcCQ1<@2f!>A78V98ef#z;!^KPI!DgofTK=E2{y0v1D0TqIa+t+1 zhdzAxi1HASl9c|>$;pk^AeiNQ_w8md&^Kbh76ODq4`&E~5)%&(H&{O`IAMk%2RX>{ zk7p+^Jmc_S$jQwG2mkBWuP9H1$UzG-6dAyL3bOq95;q1eO)rLT*S9g$t^2}&9^W_n zod2sA?Ik@8fI>iCUJh*Ux^8c<1u^r$iJW1|3U*9`ER(Kq%j%=L&)$04miEH_C&f zAbA%HSbtZ0CzuAM1A+5-V8;lU6k?b~Ovn(-h9C!k%64pE@`NdHVNj@iFr38jYKk|5 z!;E`GCrZ2_04j*^RV<)%0&@YfV?bg}txe!M0R-^X3wT3-lv)khF(8M-04NRNtDJ}q zDndmnvOLH!pz0V_oa6HdO&oyk7<_dK%^g4}Px$?MXyIR9Hu2WEfz;IKcKZj5=U61V%$(Gz5lM2$(Sh{fCvTPZ%CDtPqQ4uzOX6 z*OOEW0g&Z7+=>hdn>ZO3_K6i~qBnVq>t}u#y4ht5>hyFlf%yy;v>;2w#6-Zs z3<5B5n4|6(pJtGdkYIT6;swK@Lx%{40&yY0Ee*D8!Plo?8srF2XuxQgrK?u0B4{Cc zd}7rAihoehfuaBwj3AAmP=PsuRG;EXNLU>Jivo~kvt7-=DH#Mn>7wx@B<^A0fa*R5 zm9wS{U%VeP@NAW3067d4^mcZ3|3OhfC{(aIU=sW6{|5Y@8DO~p77CycK?fd^dSIa^ zpFT6l@bNOZ{N-b)(b&MSUnmqCmM7YNii6MOFxi9K&2mYxdAH;FMQ<1SuRlQ0GNY74td6K zmJ#M4n0N(y2Hrx6Y7QV6S2z@mI$$&eMnhmU1OQ=-#~~jor=0)*002ovPDHLkV1mkq B>t+A| literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/trash.rsi/two-trash.png b/Resources/Textures/ADT/Objects/Consumable/Food/Chocolate/trash.rsi/two-trash.png new file mode 100644 index 0000000000000000000000000000000000000000..f5297c1ecf9b74e04afcdb3a9602c309fcdb4917 GIT binary patch literal 583 zcmV-N0=WH&P)Px%0ZBwbR9Hu2WEfz;IKcKZj5=U61V%$(Gz6#;0-26-|EKSNM3z}(X(Cj5ip>cB z4^pGtdx+uq?dN#ypt=J<{g>{*9T3}f3hX10a0kY2|L(RdC`4uk7@I28E%m#%TC|%$S8NAt0U0US- z%V2Fn