From e15c76900c0f910568297a63930e680ffbf2bb9a Mon Sep 17 00:00:00 2001 From: Cooderer <31316111+Cooderer@users.noreply.github.com> Date: Wed, 5 Jul 2023 13:55:52 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=9F=D0=98=D0=92=D0=9E.=20=D0=9F=D0=B8?= =?UTF-8?q?=D0=B2=D0=BD=D0=B0=D1=8F=20=D0=BA=D0=B5=D0=B3=D0=B0=20=D0=A2?= =?UTF-8?q?=D0=93=20(#193)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ПИВО. Пивная кега ТГ Просто кега с пивом+карго покупка * Update Resources/Locale/en-US/prototypes/entities/structures/storage/tanks/tanks.ftl --------- Co-authored-by: Aru Moon --- .../prototypes/catalog/cargo/cargo-food.ftl | 2 ++ .../catalog/fills/crates/food-crates.ftl | 4 +++- .../structures/storage/tanks/tanks.ftl | 6 +++++ .../structures/storage/tanks/tanks.ftl | 7 ++++++ .../prototypes/catalog/cargo/cargo-food.ftl | 2 ++ .../catalog/fills/crates/food-crates.ftl | 2 ++ .../structures/storage/tanks/tanks.ftl | 4 ++++ .../structures/storage/tanks/tanks.ftl | 6 +++++ .../Prototypes/Catalog/Cargo/cargo_food.yml | 10 +++++++++ .../Entities/Objects/Structure/beerkeg.yml | 21 ++++++++++++++++++ .../Storage/beerkeg.rsi/beerkeg.png | Bin 0 -> 791 bytes .../Structures/Storage/beerkeg.rsi/meta.json | 14 ++++++++++++ 12 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/WorkbenchTeam/Entities/Objects/Structure/beerkeg.yml create mode 100644 Resources/Textures/Structures/Storage/beerkeg.rsi/beerkeg.png create mode 100644 Resources/Textures/Structures/Storage/beerkeg.rsi/meta.json diff --git a/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-food.ftl b/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-food.ftl index ec9c36bb52779c..194d7768b48d70 100644 --- a/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-food.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-food.ftl @@ -15,3 +15,5 @@ ent-FoodBarSupply = { ent-CrateFoodBarSupply } ent-FoodCrateKvassTank = { ent-CrateFoodKvassTank } .desc = { ent-CrateFoodKvassTank.desc } +ent-FoodCrateBeerKeg = { ent-CrateFoodBeerKeg } + .desc = { ent-CrateFoodBeerKeg.desc } diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/food-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/food-crates.ftl index 78ad45da927e22..c68bfd8ceb34cd 100644 --- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/food-crates.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/food-crates.ftl @@ -14,4 +14,6 @@ ent-CrateFoodBarSupply = Bartending supplies crate .desc = Extra Bar supplies, in case the clown was allowed in the bar unsupervised. ent-CrateFoodKvassTank = Kvass tank crate - .desc = A tank with refreshing kvass, which helps so much in the heat. \ No newline at end of file + .desc = A tank with refreshing kvass, which helps so much in the heat. +ent-CrateFoodBeerKeg = Beer Keg crate + .desc = A Keg with refreshing beer. diff --git a/Resources/Locale/en-US/prototypes/entities/structures/storage/tanks/tanks.ftl b/Resources/Locale/en-US/prototypes/entities/structures/storage/tanks/tanks.ftl index 877541d1953f33..bb7ec784a61169 100644 --- a/Resources/Locale/en-US/prototypes/entities/structures/storage/tanks/tanks.ftl +++ b/Resources/Locale/en-US/prototypes/entities/structures/storage/tanks/tanks.ftl @@ -24,3 +24,9 @@ ent-KvassTank = КВАС ent-KvassTankFull = { ent-KvassTank } .desc = { ent-KvassTank.desc } + +ent-BeerKeg = BEER + .desc = A cool refreshing drink with a taste of piss. + +ent-BeerKegFull = { ent-BeerKeg } + .desc = { ent-BeerKeg.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/tanks/tanks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/tanks/tanks.ftl index 8d0ae3ff7b1675..c5b497f22023b1 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/tanks/tanks.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/tanks/tanks.ftl @@ -25,3 +25,10 @@ ent-KvassTank = { ent-StorageTank } ent-KvassTankFull = { ent-KvassTank } .suffix = Full .desc = { ent-KvassTank.desc } +ent-BeerKeg = { ent-StorageTank } + .suffix = Empty + .desc = { ent-StorageTank.desc } +ent-BeerKegFull = { ent-BeerKeg } + .suffix = Full + .desc = { ent-BeerKeg.desc } + diff --git a/Resources/Locale/ru-RU/prototypes/catalog/cargo/cargo-food.ftl b/Resources/Locale/ru-RU/prototypes/catalog/cargo/cargo-food.ftl index 23da31db6da1aa..354aedb5ad76a7 100644 --- a/Resources/Locale/ru-RU/prototypes/catalog/cargo/cargo-food.ftl +++ b/Resources/Locale/ru-RU/prototypes/catalog/cargo/cargo-food.ftl @@ -10,3 +10,5 @@ ent-FoodBarSupply = { ent-CrateFoodBarSupply } .desc = { ent-CrateFoodBarSupply.desc } ent-FoodCrateKvassTank = { ent-CrateFoodKvassTank } .desc = { ent-CrateFoodKvassTank.desc } +ent-FoodCrateBeerKeg = { ent-CrateFoodBeerKeg } + .desc = { ent-CrateFoodBeerKeg.desc } diff --git a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/food-crates.ftl b/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/food-crates.ftl index de785598decea7..29aab83ea1c8f8 100644 --- a/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/food-crates.ftl +++ b/Resources/Locale/ru-RU/prototypes/catalog/fills/crates/food-crates.ftl @@ -10,3 +10,5 @@ ent-CrateFoodBarSupply = ящик с припасами для бара .desc = Дополнительные припасы для бара на случай, если клоуна пустят в бар без присмотра. ent-CrateFoodKvassTank = ящик с бочкой кваса .desc = Цистерна с освежающим квасом, который так помогает в жару. +ent-CrateFoodBeerKeg = ящик с кегой Пива + .desc = Кега с напитком древней расы как-то связанной с древними чешуйчатыми diff --git a/Resources/Locale/ru-RU/prototypes/entities/structures/storage/tanks/tanks.ftl b/Resources/Locale/ru-RU/prototypes/entities/structures/storage/tanks/tanks.ftl index eb2fd9c1d1dc0a..c4fd66f11d45ca 100644 --- a/Resources/Locale/ru-RU/prototypes/entities/structures/storage/tanks/tanks.ftl +++ b/Resources/Locale/ru-RU/prototypes/entities/structures/storage/tanks/tanks.ftl @@ -16,3 +16,7 @@ ent-KvassTank = КВАС .desc = Прохладный освежающий напиток с привкусом социализма. ent-KvassTankFull = { ent-KvassTank } .desc = { ent-KvassTank.desc } +ent-BeerKeg = ПИВО + .desc = Напиток древней расы как-то связанной с древними чешуйчатыми. +ent-BeerKegFull = { ent-BeerKeg } + .desc = { ent-BeerKeg.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/tanks/tanks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/tanks/tanks.ftl index 42508ab2d5daac..32a1395650898c 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/tanks/tanks.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/tanks/tanks.ftl @@ -25,3 +25,9 @@ ent-KvassTank = КВАС ent-KvassTankFull = { ent-KvassTank } .suffix = Полный .desc = { ent-KvassTank.desc } +ent-BeerKeg = ПИВО + .desc = Напиток древней расы как-то связанной с древними чешуйчатыми. + .suffix = Пустой +ent-BeerKegFull = { ent-BeerKeg } + .suffix = Полный + .desc = { ent-BeerKeg.desc } diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml index 3bafea1356e06c..aeffa0365a2d8e 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml @@ -68,6 +68,16 @@ category: Food group: market +- type: cargoProduct + id: FoodCrateBeerKeg + icon: + sprite: Structures/Storage/beerkeg.rsi + state: beerkeg + product: BeerKegFull + cost: 1500 + category: Food + group: market + - type: cargoProduct id: FoodSoftdrinks icon: diff --git a/Resources/Prototypes/WorkbenchTeam/Entities/Objects/Structure/beerkeg.yml b/Resources/Prototypes/WorkbenchTeam/Entities/Objects/Structure/beerkeg.yml new file mode 100644 index 00000000000000..10d39934f655ef --- /dev/null +++ b/Resources/Prototypes/WorkbenchTeam/Entities/Objects/Structure/beerkeg.yml @@ -0,0 +1,21 @@ +#BeerKeg +- type: entity + id: BeerKeg + parent: StorageTank + suffix: Empty + components: + - type: Sprite + sprite: Structures/Storage/beerkeg.rsi + state: beerkeg + +- type: entity + parent: BeerKeg + id: BeerKegFull + suffix: Full + components: + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: Beer + Quantity: 1000 diff --git a/Resources/Textures/Structures/Storage/beerkeg.rsi/beerkeg.png b/Resources/Textures/Structures/Storage/beerkeg.rsi/beerkeg.png new file mode 100644 index 0000000000000000000000000000000000000000..487c06f0a384dbec0907ddd0491a2673c098f81c GIT binary patch literal 791 zcmV+y1L*vTP)&E0hoqIbr>UDE^jHPmayLr!(1I;*OqjY5c-5 zZ{E(l_nDbDbMC@_))rt3urfd-5>d>)XEK?cjRR&e@*23}8XjI!(L=dI`EO{=MqyAtp&?QG3eLkO$`+B{e5ylikxC3nE z#^lUbDwT8qT3M}DQTXL*z~yprTYChU*qA&R3{uhXA>TrQi&HwBnZrw|H-pi-$&&~CS@pZsMuU2;k~zuj&p0Jqz%yA>+~ z42MIgR;#p!1>jkp6WFsh$_4}SLn+0|ACZU&$7Z_Q?t zc0l`5UI_r-0GrK5fe?V{viu1S9=+uK^Up7!dh!--cpg(9j|%7Dd@RH(19-h&dT0=W z1x8ugzu?=uS+e~nA3#?7sDbUiZa%vO7-MCC`L$7Eu^1H-s!%BK@0j>a$^-jQhTCfY zR5Lda2vCc+CY4ITT2C>qT2T}_0v1?q?m?i|2g{G&aO?RU$Xg`1+;Q>mtOkn3qA0u= z0H0I_z~oo$@443yy$5Q6zJji05B#dXt|n&Cc!NaezZ3uyuBcwG6Ue!0-<=oX*~e$p z*3`d?dE!-M3c%`M{+#}m^CA3HD_^S%)mN+4bgRbVTkH3L7J~H=W|n032C#qE&_3l! z4RcMk)Daj0UH@;wbrNhGVAI+HYytiNZt_!35*s2s0000EWmrjOO-%qQ0000800000 V0002eQ Date: Wed, 5 Jul 2023 10:59:40 +0000 Subject: [PATCH 2/2] Automatic changelog update --- Resources/Changelog/ChangelogAruMoon.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Changelog/ChangelogAruMoon.yml b/Resources/Changelog/ChangelogAruMoon.yml index 0646985de202ba..3e822ea175033b 100644 --- a/Resources/Changelog/ChangelogAruMoon.yml +++ b/Resources/Changelog/ChangelogAruMoon.yml @@ -667,3 +667,10 @@ Entries: type: Tweak id: 58 time: '2023-07-01T15:57:59.0000000+00:00' +- author: Cooderer + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E \u041F\u0418\u0412\ + \u041E(\u041A\u0435\u0433\u0430(\u0422\u0413))!" + type: Add + id: 59 + time: '2023-07-05T10:55:52.0000000+00:00'