From ffc9fa21006fd4cab2ebd09a01a4a17cd351d3fd Mon Sep 17 00:00:00 2001 From: ne4t02 Date: Tue, 20 Aug 2024 15:24:58 +0500 Subject: [PATCH 1/9] =?UTF-8?q?=D0=BE=D1=87=D0=B5=D1=80=D0=B5=D0=B4=D0=B8?= =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D0=BC=D0=BA58?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Objects/Weapons/Guns/Pistols/pistols.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 07d59aadfa1..6dd6c2aab28 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -202,8 +202,10 @@ sprite: Objects/Weapons/Guns/Pistols/mk58.rsi - type: Gun fireRate: 5 + shotsPerBurst: 3 availableModes: - SemiAuto + - Burst soundGunshot: path: /Audio/Weapons/Guns/Gunshots/mk58.ogg From 80f22a9fe47ee68510a0f961ce72bec9e07902ae Mon Sep 17 00:00:00 2001 From: ne4t02 Date: Sat, 24 Aug 2024 00:33:44 +0500 Subject: [PATCH 2/9] =?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 Date: Sat, 24 Aug 2024 13:14:57 +0500 Subject: [PATCH 3/9] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=BE=D1=81?= =?UTF-8?q?=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2=20=D1=81=D0=B3=D1=83?= =?UTF-8?q?=D1=89=D0=B5=D0=BD=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Objects/Consumable/Food/containers.ftl | 5 +++ .../Objects/Consumable/Food/snacks.ftl | 6 --- .../Food/Containers/condensed_milk.yml | 42 ++++++++++++++++++ .../Objects/Weapons/Guns/Pistols/pistols.yml | 2 + .../condensed_milk.rsi/icon-open.png | Bin .../condensed_milk.rsi/icon.png | Bin .../condensed_milk.rsi/meta.json | 0 .../condensed_milk.rsi/trash.png | Bin 8 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/containers.ftl create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Containers/condensed_milk.yml rename Resources/Textures/ADT/Objects/Consumable/Food/{ => Containers}/condensed_milk.rsi/icon-open.png (100%) rename Resources/Textures/ADT/Objects/Consumable/Food/{ => Containers}/condensed_milk.rsi/icon.png (100%) rename Resources/Textures/ADT/Objects/Consumable/Food/{ => Containers}/condensed_milk.rsi/meta.json (100%) rename Resources/Textures/ADT/Objects/Consumable/Food/{ => Containers}/condensed_milk.rsi/trash.png (100%) diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/containers.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/containers.ftl new file mode 100644 index 00000000000..e060ddfb874 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/containers.ftl @@ -0,0 +1,5 @@ +ent-ADTFoodTinCondensedMilkTrash = сгущеное молоко (пусто) + .desc = Пустая консервная банка. Из неё можно получить немного металла. + +ent-ADTFoodTinCondensedMilk = сгущеное молоко + .desc = Стандартная банка сгущенки с удобным язычком. 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 61703ae77c0..3f5e24bce35 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 @@ -110,9 +110,3 @@ ent-ADTFoodSnackChocolateTrashPink = обертка от Розовый шоко ent-ADTFoodSnackChocolateTrashTwo = обертка от Двойного батончика .desc = Мусор - -ent-ADTFoodTinCondensedMilkTrash = сгущеное молоко (пусто) - .desc = Пустая консервная банка. Из неё можно получить немного металла. - -ent-ADTFoodTinCondensedMilk = сгущеное молоко - .desc = Стандартная банка сгущенки с удобным язычком. diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Containers/condensed_milk.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Containers/condensed_milk.yml new file mode 100644 index 00000000000..9dd1412d93e --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Containers/condensed_milk.yml @@ -0,0 +1,42 @@ +#Сгущенка + +- 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/Containers/condensed_milk.rsi + # the convenient pull tab + - type: Item + sprite: ADT/Objects/Consumable/Food/Containers/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/Containers/condensed_milk.rsi + - type: Item + sprite: ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi + size: Small + shape: + - 0,0,0,1 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 6dd6c2aab28..471a4a73f9a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -202,9 +202,11 @@ sprite: Objects/Weapons/Guns/Pistols/mk58.rsi - type: Gun fireRate: 5 + # ADT: amount of shots while burst shotsPerBurst: 3 availableModes: - SemiAuto + # ADT: added burst mode - Burst soundGunshot: path: /Audio/Weapons/Guns/Gunshots/mk58.ogg diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/condensed_milk.rsi/icon-open.png b/Resources/Textures/ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi/icon-open.png similarity index 100% rename from Resources/Textures/ADT/Objects/Consumable/Food/condensed_milk.rsi/icon-open.png rename to Resources/Textures/ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi/icon-open.png diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/condensed_milk.rsi/icon.png b/Resources/Textures/ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi/icon.png similarity index 100% rename from Resources/Textures/ADT/Objects/Consumable/Food/condensed_milk.rsi/icon.png rename to Resources/Textures/ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi/icon.png diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/condensed_milk.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi/meta.json similarity index 100% rename from Resources/Textures/ADT/Objects/Consumable/Food/condensed_milk.rsi/meta.json rename to Resources/Textures/ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi/meta.json diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/condensed_milk.rsi/trash.png b/Resources/Textures/ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi/trash.png similarity index 100% rename from Resources/Textures/ADT/Objects/Consumable/Food/condensed_milk.rsi/trash.png rename to Resources/Textures/ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi/trash.png From ca1f0b2c35f9ab850aae0ce09e7d487457222043 Mon Sep 17 00:00:00 2001 From: ne4t02 <65731121+ne4t02@users.noreply.github.com> Date: Sat, 24 Aug 2024 17:31:20 +0500 Subject: [PATCH 4/9] Update snacks.yml --- .../Objects/Consumable/Food/snacks.yml | 45 ------------------- 1 file changed, 45 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml index bbf7ae06865..03d295bfbe7 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml @@ -502,48 +502,3 @@ 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 - - - From ef8a3d2dc16a05e3691d22b0f1b7351dfcb13b9e Mon Sep 17 00:00:00 2001 From: 1Stepka1 <131589665+1Stepka1@users.noreply.github.com> Date: Sat, 24 Aug 2024 19:50:30 +0300 Subject: [PATCH 5/9] Update condensed_milk.yml --- .../Objects/Consumable/Food/Containers/condensed_milk.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Containers/condensed_milk.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Containers/condensed_milk.yml index 9dd1412d93e..bcb152ca5f8 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Containers/condensed_milk.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Containers/condensed_milk.yml @@ -26,7 +26,8 @@ sound: path: /Audio/Items/can_open3.ogg - type: Food - trash: ADTFoodTinCondensedMilkTrash + trash: + - ADTFoodTinCondensedMilkTrash - type: entity parent: FoodTinBaseTrash From d74ddbfd3422d233ac99a9e944a5bb5f388ea00d Mon Sep 17 00:00:00 2001 From: Darki255 Date: Sat, 24 Aug 2024 22:31:28 +0300 Subject: [PATCH 6/9] =?UTF-8?q?=D0=9F=D0=BE=D0=BC=D0=BE=D0=B3=D0=B0=D0=B5?= =?UTF-8?q?=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Locale/ru-RU/ADT/Objects/Consumable/Food/containers.ftl | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Resources/Locale/ru-RU/ADT/Objects/Consumable/Food/containers.ftl diff --git a/Resources/Locale/ru-RU/ADT/Objects/Consumable/Food/containers.ftl b/Resources/Locale/ru-RU/ADT/Objects/Consumable/Food/containers.ftl new file mode 100644 index 00000000000..eed197c01ba --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Objects/Consumable/Food/containers.ftl @@ -0,0 +1,3 @@ +reagent-name-condensedmilk = сгущенное молоко +reagent-desc-condensedmilk = белая густая и очень сладкая жидкость +flavor-complex-adtconsideredmilk = как сгущенка \ No newline at end of file From 91bf3da68075c2ae20100c203e531243b9231daa Mon Sep 17 00:00:00 2001 From: Darki255 Date: Sat, 24 Aug 2024 22:38:36 +0300 Subject: [PATCH 7/9] =?UTF-8?q?=D0=9D=D0=B5=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE?= =?UTF-8?q?=20=D0=BD=D0=B5=20=D1=82=D1=83=D0=B4=D0=B0=20=D0=B7=D0=B0=D0=BA?= =?UTF-8?q?=D0=B8=D0=BD=D1=83=D0=BB=20=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Food/containers.ftl => Flavors/flavor-profiles.ftl} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Resources/Locale/ru-RU/ADT/{Objects/Consumable/Food/containers.ftl => Flavors/flavor-profiles.ftl} (100%) diff --git a/Resources/Locale/ru-RU/ADT/Objects/Consumable/Food/containers.ftl b/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl similarity index 100% rename from Resources/Locale/ru-RU/ADT/Objects/Consumable/Food/containers.ftl rename to Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl From 7e7c71049351b62033d79695bf625c08a0d2521e Mon Sep 17 00:00:00 2001 From: Darki255 Date: Sat, 24 Aug 2024 22:46:48 +0300 Subject: [PATCH 8/9] =?UTF-8?q?=D0=A7=D0=B8=D0=BD=D0=B8=D0=BC=20=D1=8F?= =?UTF-8?q?=D0=BC=D0=BB,=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=B2=D0=BA=D1=83=D1=81=20=D1=81=D0=B3=D1=83=D1=89=D0=B5=D0=BD?= =?UTF-8?q?=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/ADT/Flavors/fill.txt | 1 - Resources/Prototypes/ADT/Flavors/flavors.yml | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) delete mode 100644 Resources/Prototypes/ADT/Flavors/fill.txt create mode 100644 Resources/Prototypes/ADT/Flavors/flavors.yml diff --git a/Resources/Prototypes/ADT/Flavors/fill.txt b/Resources/Prototypes/ADT/Flavors/fill.txt deleted file mode 100644 index b4954caf47d..00000000000 --- a/Resources/Prototypes/ADT/Flavors/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Flavors/flavors.yml b/Resources/Prototypes/ADT/Flavors/flavors.yml new file mode 100644 index 00000000000..a4da2ce0991 --- /dev/null +++ b/Resources/Prototypes/ADT/Flavors/flavors.yml @@ -0,0 +1,4 @@ +- type: flavor + id: adtconsideredmilk + flavorType: Complex + description: flavor-complex-adtconsideredmilk \ No newline at end of file From e2bf40328630fafb018867192693c1ef3bc68bba Mon Sep 17 00:00:00 2001 From: Darki255 Date: Sun, 25 Aug 2024 18:18:11 +0300 Subject: [PATCH 9/9] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BD=D0=BE=D1=81?= =?UTF-8?q?=D0=B8=D0=BC=20=D1=80=D0=B5=D0=B0=D0=B3=D0=B5=D0=BD=D1=82=D1=8B?= =?UTF-8?q?=20=D0=B2=20=D1=80=D0=B5=D0=B0=D0=B3=D0=B5=D0=BD=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl | 2 -- .../ADT/reagents/Consumable/Food/Containers/condensed_milk.ftl | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 Resources/Locale/ru-RU/ADT/reagents/Consumable/Food/Containers/condensed_milk.ftl diff --git a/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl index eed197c01ba..e921f71467d 100644 --- a/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl +++ b/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl @@ -1,3 +1 @@ -reagent-name-condensedmilk = сгущенное молоко -reagent-desc-condensedmilk = белая густая и очень сладкая жидкость flavor-complex-adtconsideredmilk = как сгущенка \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/reagents/Consumable/Food/Containers/condensed_milk.ftl b/Resources/Locale/ru-RU/ADT/reagents/Consumable/Food/Containers/condensed_milk.ftl new file mode 100644 index 00000000000..4a7e34bf8c8 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/reagents/Consumable/Food/Containers/condensed_milk.ftl @@ -0,0 +1,2 @@ +reagent-name-condensedmilk = сгущенное молоко +reagent-desc-condensedmilk = белая густая и очень сладкая жидкость \ No newline at end of file