From 264fa71a9d70a79029af4f80e2136504155273bd Mon Sep 17 00:00:00 2001 From: Den Frae Date: Sun, 13 Oct 2024 21:40:32 +0300 Subject: [PATCH 01/11] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D0=B2=D0=BE=D0=B4=D0=BE=D0=B2=20=D1=81=D1=82=D1=80?= =?UTF-8?q?=D0=BE=D0=B8=D1=82=D0=B5=D0=BB=D1=8C=D1=81=D1=82=D0=B2=D0=B0.?= =?UTF-8?q?=20=D0=9A=D0=B2=D0=B0=D1=81=20=D0=B2=20=D0=BA=D0=B0=D1=80=D0=B3?= =?UTF-8?q?=D0=BE.=20=D0=9D=D0=BE=D0=B2=D1=8B=D0=B5=20=D0=BD=D0=B0=D0=BF?= =?UTF-8?q?=D0=B8=D1=82=D0=BA=D0=B8:=20=D0=9C=D0=B8=D1=80=D1=83=D0=B2?= =?UTF-8?q?=D0=BE=D1=80=20=D0=B8=20=D0=9A=D0=B0=D1=80=D0=B3=D0=BE=D0=BD?= =?UTF-8?q?=D1=81=D0=BA=D0=B8=D0=B9=20=D0=93=D1=80=D1=8B=D0=B7=D0=BB=D0=BE?= =?UTF-8?q?=D0=B4=D1=91=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_LostParadise/flavors/flavor-profiles.ftl | 2 + .../meta/consumable/drink/alcohol.ftl | 5 ++ .../reagents/meta/physical-desc.ftl | 2 + .../object/consumable/drinks/drinks.ftl | 6 ++ .../en-US/reagents/meta/physical-desc.ftl | 2 + .../entities/objects/fun/erp/fleshlight.ftl | 4 +- .../structures/machines/vending_machines.ftl | 3 + .../_LostParadise/Construction/Graphs.ftl | 12 +++ .../_LostParadise/flavors/flavor-profiles.ftl | 2 + .../objects/consumable/drinks/drinks.ftl | 6 ++ .../meta/consumable/drink/alcohol.ftl | 4 + .../reagents/meta/physical-desc.ftl | 2 + .../entities/objects/fun/erp/fleshlight.ftl | 4 +- .../structures/machines/vending_machines.ftl | 3 + .../structures/storage/tanks/tanks.ftl | 8 +- .../Prototypes/Catalog/Cargo/cargo_food.yml | 10 +++ .../DeltaV/Catalog/Cargo/cargo_food.yml | 14 +--- .../Random/Food_Drinks/drinks_glass.yml | 2 + .../Inventories/CushionVendingMashine.yml | 10 +++ .../Markers/Spawners/Random/lppvendings.yml | 1 + .../Objects/Consumable/Drinks/drinks.yml | 31 +++++++ .../Entities/Objects/Fun/ERP/fleshlight.yml | 78 +++++++++++++++++- .../Structures/Machines/vending_machines.yml | 33 ++++++++ .../_LostParadise/Flavors/flavors.yml | 9 ++ .../Reagents/Consumable/Drink/alcohol.yml | 45 ++++++++++ .../Recipes/Reactions/drinks.yml | 33 ++++++++ .../Consumable/Drinks/miruvor.rsi/fill-1.png | Bin 0 -> 168 bytes .../Consumable/Drinks/miruvor.rsi/fill-2.png | Bin 0 -> 196 bytes .../Consumable/Drinks/miruvor.rsi/fill-3.png | Bin 0 -> 205 bytes .../Consumable/Drinks/miruvor.rsi/fill-4.png | Bin 0 -> 238 bytes .../Consumable/Drinks/miruvor.rsi/fill-5.png | Bin 0 -> 255 bytes .../Consumable/Drinks/miruvor.rsi/fill-1.png | Bin 0 -> 210 bytes .../Consumable/Drinks/miruvor.rsi/fill-2.png | Bin 0 -> 235 bytes .../Consumable/Drinks/miruvor.rsi/fill-3.png | Bin 0 -> 247 bytes .../Consumable/Drinks/miruvor.rsi/fill-4.png | Bin 0 -> 261 bytes .../Consumable/Drinks/miruvor.rsi/fill-5.png | Bin 0 -> 264 bytes .../Consumable/Drinks/miruvor.rsi/icon.png | Bin 0 -> 557 bytes .../Drinks/miruvor.rsi/icon_empty.png | Bin 0 -> 488 bytes .../Consumable/Drinks/miruvor.rsi/meta.json | 34 ++++++++ 39 files changed, 341 insertions(+), 24 deletions(-) create mode 100644 Resources/Locale/en-US/_LostParadise/flavors/flavor-profiles.ftl create mode 100644 Resources/Locale/en-US/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl create mode 100644 Resources/Locale/en-US/_LostParadise/reagents/meta/physical-desc.ftl create mode 100644 Resources/Locale/en-US/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl create mode 100644 Resources/Locale/ru-RU/_LostParadise/flavors/flavor-profiles.ftl create mode 100644 Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/consumable/drinks/drinks.ftl create mode 100644 Resources/Locale/ru-RU/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl create mode 100644 Resources/Locale/ru-RU/_LostParadise/reagents/meta/physical-desc.ftl create mode 100644 Resources/Prototypes/_LostParadise/Catalog/VendingMachines/Inventories/CushionVendingMashine.yml create mode 100644 Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/Drinks/drinks.yml create mode 100644 Resources/Prototypes/_LostParadise/Flavors/flavors.yml create mode 100644 Resources/Prototypes/_LostParadise/Reagents/Consumable/Drink/alcohol.yml create mode 100644 Resources/Prototypes/_LostParadise/Recipes/Reactions/drinks.yml create mode 100644 Resources/Textures/Objects/Consumable/Drinks/miruvor.rsi/fill-1.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/miruvor.rsi/fill-2.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/miruvor.rsi/fill-3.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/miruvor.rsi/fill-4.png create mode 100644 Resources/Textures/Objects/Consumable/Drinks/miruvor.rsi/fill-5.png create mode 100644 Resources/Textures/_LostParadise/Objects/Consumable/Drinks/miruvor.rsi/fill-1.png create mode 100644 Resources/Textures/_LostParadise/Objects/Consumable/Drinks/miruvor.rsi/fill-2.png create mode 100644 Resources/Textures/_LostParadise/Objects/Consumable/Drinks/miruvor.rsi/fill-3.png create mode 100644 Resources/Textures/_LostParadise/Objects/Consumable/Drinks/miruvor.rsi/fill-4.png create mode 100644 Resources/Textures/_LostParadise/Objects/Consumable/Drinks/miruvor.rsi/fill-5.png create mode 100644 Resources/Textures/_LostParadise/Objects/Consumable/Drinks/miruvor.rsi/icon.png create mode 100644 Resources/Textures/_LostParadise/Objects/Consumable/Drinks/miruvor.rsi/icon_empty.png create mode 100644 Resources/Textures/_LostParadise/Objects/Consumable/Drinks/miruvor.rsi/meta.json diff --git a/Resources/Locale/en-US/_LostParadise/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_LostParadise/flavors/flavor-profiles.ftl new file mode 100644 index 00000000000..c6b2643a3b7 --- /dev/null +++ b/Resources/Locale/en-US/_LostParadise/flavors/flavor-profiles.ftl @@ -0,0 +1,2 @@ +flavor-complex-lpp-cargo-gargle-blaster = like you made a million and started a revolution +flavor-complex-lpp-miruvor = like arrogant \ No newline at end of file diff --git a/Resources/Locale/en-US/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/en-US/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl new file mode 100644 index 00000000000..acc4f3fe25a --- /dev/null +++ b/Resources/Locale/en-US/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl @@ -0,0 +1,5 @@ +reagent-name-lpp-cargo-gargle-blaster = Cargo Gargle Blaster +reagent-desc-lpp-cargo-gargle-blaster = The Emperor's favorite drink. + +reagent-name-lpp-miruvor = Miruvor +reagent-desc-lpp-miruvor = An exquisite drink especially for elves! \ No newline at end of file diff --git a/Resources/Locale/en-US/_LostParadise/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/_LostParadise/reagents/meta/physical-desc.ftl new file mode 100644 index 00000000000..0784422983a --- /dev/null +++ b/Resources/Locale/en-US/_LostParadise/reagents/meta/physical-desc.ftl @@ -0,0 +1,2 @@ +reagent-physical-desc-lpp-rich = rich +reagent-physical-desc-lpp-exquisite = exquisite \ No newline at end of file diff --git a/Resources/Locale/en-US/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl b/Resources/Locale/en-US/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl new file mode 100644 index 00000000000..7dbae317c94 --- /dev/null +++ b/Resources/Locale/en-US/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl @@ -0,0 +1,6 @@ +ent-DrinkLPPCargoGargleBlasterGlass = { ent-DrinkGlass } + .suffix = cargo gargle blaster + .desc = { ent-DrinkGlass.desc } +ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } + .suffix = miruvor + .desc = { ent-DrinkGlass.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl index 064b21eaa9c..caf7ec4441f 100644 --- a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl @@ -98,4 +98,6 @@ reagent-physical-desc-tropical = tropical reagent-physical-desc-vibrant = vibrant reagent-physical-desc-viscous = viscous reagent-physical-desc-volatile = volatile +reagent-physical-desc-lpp-rich = rich +reagent-physical-desc-lpp-exquisite = exquisite reagent-physical-desc-wormy = wormy diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/fun/erp/fleshlight.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/fun/erp/fleshlight.ftl index 63653aae611..5dbaaf8ea7d 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/fun/erp/fleshlight.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/fun/erp/fleshlight.ftl @@ -9,6 +9,6 @@ ent-LPPFleshlightTeal = fleshlight teal ent-LPPFleshlightYellow = fleshlight yellow .desc = A hamburger bun. Round and convenient to hold. ent-LPPPillowPinkRound = pillow pink round - .desc = A hamburger bun. Round and convenient to hold. + .desc = A soft pillow that is comfortable to sit on. ent-LPPPillowTealRound = pillow teal round - .desc = A hamburger bun. Round and convenient to hold. + .desc = A soft pillow that is comfortable to sit on. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/machines/vending_machines.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/machines/vending_machines.ftl index 833e802b0ad..59429946e21 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/machines/vending_machines.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/machines/vending_machines.ftl @@ -7,6 +7,9 @@ ent-LPPCargodrobeVard = Cargo vard machine ent-LPPErpMachine = Erp machine .desc = Fashionable suits for Varden! .suffix = Unlocked +ent-LPPCushionVendingMashine = Cushion vending mashine + .desc = Soft cushion for cozy gatherings! + .suffix = Unlocked ent-LPPBrasMat = Bras machine .desc = a machine that decorates the appearance of customers and makes them beautiful! .suffix = Unlocked diff --git a/Resources/Locale/ru-RU/_LostParadise/Construction/Graphs.ftl b/Resources/Locale/ru-RU/_LostParadise/Construction/Graphs.ftl index 9750c210057..eee1d13d3ea 100644 --- a/Resources/Locale/ru-RU/_LostParadise/Construction/Graphs.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/Construction/Graphs.ftl @@ -765,3 +765,15 @@ construction-graph-name-ClothingEyesPrescriptionMedHud = медицинский construction-graph-desc-ClothingEyesPrescriptionMedHud = Плохо сделанное и поспешное сочетание половины пары очков, отпускаемых по рецепту, и медицинского дисплея, позволяющего вам чётко видеть одним глазом и следить за состоянием здоровья людей другим! construction-graph-name-ClothingEyesPrescriptionHudSecurity = охранный визор на очках construction-graph-desc-ClothingEyesPrescriptionHudSecurity = Некачественно сделанное и поспешное сочетание половины пары очков, отпускаемых по рецепту, и защитного экрана, позволяющего вам чётко видеть одним глазом и проверять удостоверение личности сотрудника и статус другим! +construction-graph-name-LPPBedDoubleUp = двойная кровать (вверх) +construction-graph-desc-LPPBedDoubleUp = На ней можно лежать или спать пристёгнутым. +construction-graph-name-LPPBedDoubleDown = двойная кровать (низ) +construction-graph-desc-LPPBedDoubleDown = На ней можно лежать или спать пристёгнутым. +construction-graph-name-FloorDrain = дренаж +construction-graph-desc-FloorDrain = Сливает лужи вокруг в себя. Пригодится для опорожнения вёдер или поддержания чистоты в определённых помещениях. +construction-graph-name-LPPClothingHeadHelmetBasicLight = шлем с фонариком +construction-graph-desc-LPPClothingHeadHelmetBasicLight = Стандартная защитная экипировка. Защищает от ударов и светит в технических тоннелях. +construction-graph-name-smugglersbag = сумка контрабандиста +construction-graph-desc-smugglersbag = Модная сумка, для хранения контрабанды. Используйте гаечный ключ и накройте плиткой, чтобы никто не увидел ваши секреты. +construction-graph-name-AtmosDeviceFanTiny = маленький вентилятор +construction-graph-desc-AtmosDeviceFanTiny = Маленький вентилятор создающий лёгкий поток воздуха. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_LostParadise/flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/_LostParadise/flavors/flavor-profiles.ftl new file mode 100644 index 00000000000..d28f5ae6014 --- /dev/null +++ b/Resources/Locale/ru-RU/_LostParadise/flavors/flavor-profiles.ftl @@ -0,0 +1,2 @@ +flavor-complex-lpp-cargo-gargle-blaster = как будто вы заработали миллион и подняли революцию +flavor-complex-lpp-miruvor = как высокомерие \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/consumable/drinks/drinks.ftl b/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/consumable/drinks/drinks.ftl new file mode 100644 index 00000000000..5fba9a2cd1c --- /dev/null +++ b/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/consumable/drinks/drinks.ftl @@ -0,0 +1,6 @@ +ent-DrinkLPPCargoGargleBlasterGlass = { ent-DrinkGlass } + .suffix = Каргонский грызлодёр + .desc = { ent-DrinkGlass.desc } +ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } + .suffix = Мирувор + .desc = { ent-DrinkGlass.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/ru-RU/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl new file mode 100644 index 00000000000..69c11ce45b0 --- /dev/null +++ b/Resources/Locale/ru-RU/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl @@ -0,0 +1,4 @@ +reagent-name-lpp-cargo-gargle-blaster = каргонский грызлодёр +reagent-desc-lpp-cargo-gargle-blaster = Любимый напиток императора. +reagent-name-lpp-miruvor = мирувор +reagent-desc-lpp-miruvor = Изысканный напиток специально для эльфов! \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_LostParadise/reagents/meta/physical-desc.ftl b/Resources/Locale/ru-RU/_LostParadise/reagents/meta/physical-desc.ftl new file mode 100644 index 00000000000..b58d1415afc --- /dev/null +++ b/Resources/Locale/ru-RU/_LostParadise/reagents/meta/physical-desc.ftl @@ -0,0 +1,2 @@ +reagent-physical-desc-lpp-rich = богатое +reagent-physical-desc-lpp-exquisite = изысканное \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/fun/erp/fleshlight.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/fun/erp/fleshlight.ftl index 6498ae1d298..038ed4c9bc2 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/fun/erp/fleshlight.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/fun/erp/fleshlight.ftl @@ -8,7 +8,7 @@ ent-LPPFleshlightTeal = Бирюзовый мастурбатор .desc = Мастурбатор, который удовлетворит вас, если вы одиноки. ent-LPPFleshlightYellow = Желтый мастурбатор .desc = Мастурбатор, который удовлетворит вас, если вы одиноки. -ent-LPPPillowPinkRound = Подушка розовая круглая +ent-LPPPillowPinkRound = розовая подушка .desc = Розовая круглая подушка с дыркой по центру. Зачем же она?.. -ent-LPPPillowTealRound = Подушка бирюзовая круглая +ent-LPPPillowTealRound = бирюзовая подушка .desc = Бирюзовая круглая подушка с дыркой по центру. Зачем же она?.. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/structures/machines/vending_machines.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/structures/machines/vending_machines.ftl index 302542f02b1..a080cbf6a9c 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/structures/machines/vending_machines.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/structures/machines/vending_machines.ftl @@ -7,6 +7,9 @@ ent-LPPCargodrobeVard = Раздатчик продвинутой одежды ent-LPPErpMachine = ВесельеМат .desc = Если надо поразвлечься - поскорее опробуй ты услуг товаров наших! .suffix = Разблокирован +ent-LPPCushionVendingMashine = ПодушкоМат + .desc = Мягкие подушки для уютных посиделок! + .suffix = Разблокирован ent-LPPBrasMat = Раздатчик бюстгальтеров .desc = Раздатчик, что дополняет образ пользователя и делает его неотразимым! .suffix = Разблокирован diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/structures/storage/tanks/tanks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/structures/storage/tanks/tanks.ftl index c7509794f8a..05072bff0a2 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/structures/storage/tanks/tanks.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/deltav/entities/structures/storage/tanks/tanks.ftl @@ -1,6 +1,6 @@ -ent-KvassTank = { ent-StorageTank } +ent-KvassTank = Бочка кваса .suffix = Пустой - .desc = { ent-StorageTank.desc } -ent-KvassTankFull = { ent-KvassTank } + .desc = Прохладный освежающий напиток, со вкусом социализма. +ent-KvassTankFull = Бочка кваса .suffix = Полный - .desc = { ent-KvassTank.desc } + .desc = Прохладный освежающий напиток, со вкусом социализма. diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml index 1a6f8380961..ab1bf63d899 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml @@ -18,6 +18,16 @@ category: cargoproduct-category-name-food group: market +- type: cargoProduct + id: FoodCrateKvassTank + icon: + sprite: DeltaV/Structures/Storage/kvass.rsi + state: kvass + product: KvassTankFull + cost: 2000 + category: cargoproduct-category-name-food + group: market + - type: cargoProduct id: FoodMRE icon: diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml index 42b4d57e910..6e7e0175b4a 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml @@ -1,13 +1,3 @@ -- type: cargoProduct - id: FoodCrateKvassTank - icon: - sprite: DeltaV/Structures/Storage/kvass.rsi - state: kvass - product: KvassTankFull - cost: 2000 - category: Food - group: market - - type: cargoProduct id: FoodDonkpocketSavory icon: @@ -15,7 +5,7 @@ state: pizza-box product: CrateFoodDonkpocketSavory cost: 6000 # Thanks bounties - category: Food + category: cargoproduct-category-name-food group: market - type: cargoProduct @@ -25,5 +15,5 @@ state: berry-box product: CrateFoodDonkpocketSweet cost: 6000 # Thanks bounties - category: Food + category: cargoproduct-category-name-food group: market diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml index ff9e5124328..52592bf5096 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml @@ -45,6 +45,8 @@ - DrinkErikaSurprise - DrinkFourteenLokoGlass - DrinkGargleBlasterGlass + - DrinkLPPCargoGargleBlasterGlass + - DrinkLPPMiruvor - DrinkGinFizzGlass - DrinkGinGlass - DrinkGinTonicglass diff --git a/Resources/Prototypes/_LostParadise/Catalog/VendingMachines/Inventories/CushionVendingMashine.yml b/Resources/Prototypes/_LostParadise/Catalog/VendingMachines/Inventories/CushionVendingMashine.yml new file mode 100644 index 00000000000..fbff024906c --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Catalog/VendingMachines/Inventories/CushionVendingMashine.yml @@ -0,0 +1,10 @@ +- type: vendingMachineInventory + id: CushionVendingMachineServitorInventory + startingInventory: + LPPPillowPinkRound: 3 + LPPPillowTealRound: 3 + LPPPillow1: 3 + LPPPillow2: 3 + LPPPillow3: 3 + LPPPillow4: 3 + LPPPillow5: 3 diff --git a/Resources/Prototypes/_LostParadise/Entities/Markers/Spawners/Random/lppvendings.yml b/Resources/Prototypes/_LostParadise/Entities/Markers/Spawners/Random/lppvendings.yml index 53cb8c3aef5..434ff47faea 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Markers/Spawners/Random/lppvendings.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Markers/Spawners/Random/lppvendings.yml @@ -13,6 +13,7 @@ prototypes: - LPPBeachVendingMachine - LPPErpMachine + - LPPCushionVendingMashine - LPPBrasMat - LPPNascaMat - LPPPillowVendingMachine diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/Drinks/drinks.yml new file mode 100644 index 00000000000..a3bedc81aa7 --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/Drinks/drinks.yml @@ -0,0 +1,31 @@ +- type: entity + parent: DrinkGlass + id: DrinkLPPMiruvorGlass + suffix: miruvor + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: LPPMiruvor + Quantity: 30 + - type: Icon + sprite: _LostParadise/Objects/Consumable/Drinks/miruvor.rsi + state: icon + +- type: entity + parent: DrinkGlass + id: DrinkLPPCargoGargleBlasterGlass + suffix: cargo gargle blaster + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: LPPCargoGargleBlaster + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/gargleblasterglass.rsi + state: icon \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Fun/ERP/fleshlight.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Fun/ERP/fleshlight.yml index 53a30673acd..a79f0ae277f 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Fun/ERP/fleshlight.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Fun/ERP/fleshlight.yml @@ -71,8 +71,8 @@ - type: entity name: pillow pink round id: LPPPillowPinkRound - parent: BaseItem - description: A hamburger bun. Round and convenient to hold. + parent: [BaseItem, BaseFoldable, SeatBase] + description: A soft pillow that is comfortable to sit on. components: - type: Sprite sprite: _LostParadise/Objects/Fun/ERP/fleshlight.rsi @@ -85,8 +85,22 @@ - type: entity name: pillow teal round id: LPPPillowTealRound - parent: BaseItem - description: A hamburger bun. Round and convenient to hold. + parent: [BaseItem, BaseFoldable, SeatBase] + description: A soft pillow that is comfortable to sit on. + components: + - type: Sprite + sprite: _LostParadise/Objects/Fun/ERP/fleshlight.rsi + scale: 1.0, 1.0 + layers: + - state: pillow_teal_round + - type: Item + size: Normal + +- type: entity + name: pillow1 + id: LPPPillow1 + parent: [BaseItem, BaseFoldable, SeatBase] + description: A soft pillow that is comfortable to sit on. components: - type: Sprite sprite: _LostParadise/Objects/Fun/ERP/fleshlight.rsi @@ -95,3 +109,59 @@ - state: pillow_teal_round - type: Item size: Normal + +- type: entity + name: pillow2 + id: LPPPillow2 + parent: [BaseItem, BaseFoldable, SeatBase] + description: A soft pillow that is comfortable to sit on. + components: + - type: Sprite + sprite: _LostParadise/Objects/Fun/ERP/fleshlight.rsi + scale: 1.0, 1.0 + layers: + - state: pillow_teal_round + - type: Item + size: Normal + +- type: entity + name: pillow3 + id: LPPPillow3 + parent: [BaseItem, BaseFoldable, SeatBase] + description: A soft pillow that is comfortable to sit on. + components: + - type: Sprite + sprite: _LostParadise/Objects/Fun/ERP/fleshlight.rsi + scale: 1.0, 1.0 + layers: + - state: pillow_teal_round + - type: Item + size: Normal + +- type: entity + name: pillow4 + id: LPPPillow4 + parent: [BaseItem, BaseFoldable, SeatBase] + description: A soft pillow that is comfortable to sit on. + components: + - type: Sprite + sprite: _LostParadise/Objects/Fun/ERP/fleshlight.rsi + scale: 1.0, 1.0 + layers: + - state: pillow_teal_round + - type: Item + size: Normal + +- type: entity + name: pillow5 + id: LPPPillow5 + parent: [BaseItem, BaseFoldable, SeatBase] + description: A soft pillow that is comfortable to sit on. + components: + - type: Sprite + sprite: _LostParadise/Objects/Fun/ERP/fleshlight.rsi + scale: 1.0, 1.0 + layers: + - state: pillow_teal_round + - type: Item + size: Normal \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Machines/vending_machines.yml index bb7b238b7fb..8329a81fa34 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Structures/Machines/vending_machines.yml @@ -97,6 +97,39 @@ energy: 1.6 color: "#9966cc" +- type: entity + parent: VendingMachine + id: LPPCushionVendingMashine + name: Cushion vending mashine + description: Soft cushion for cozy gatherings! + suffix: Unlocked + components: + - type: VendingMachine + pack: CushionVendingMachineServitorInventory + offState: off + brokenState: broken + normalState: normal-unshaded + ejectState: eject-unshaded + denyState: deny-unshaded + - type: Advertise + pack: ClothesMateAds + - type: SpeakOnUIClosed + pack: GenericVendGoodbyes + - type: Sprite + sprite: _LostParadise/Structures/Machines/VendingMachines/erp-machine.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#9966cc" + - type: entity parent: VendingMachine id: LPPBrasMat diff --git a/Resources/Prototypes/_LostParadise/Flavors/flavors.yml b/Resources/Prototypes/_LostParadise/Flavors/flavors.yml new file mode 100644 index 00000000000..af508866304 --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Flavors/flavors.yml @@ -0,0 +1,9 @@ +- type: flavor + id: lppcargogargleblaster + flavorType: Complex + description: flavor-complex-lpp-cargo-gargle-blaster + +- type: flavor + id: lppmiruvor + flavorType: Complex + description: flavor-complex-lpp-miruvor \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/_LostParadise/Reagents/Consumable/Drink/alcohol.yml new file mode 100644 index 00000000000..8f8e2be41eb --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Reagents/Consumable/Drink/alcohol.yml @@ -0,0 +1,45 @@ +- type: reagent + id: LPPMiruvor + name: reagent-name-lpp-miruvor + parent: BaseAlcohol + desc: reagent-desc-lpp-miruvor + physicalDesc: reagent-physical-desc-lpp-exquisite + flavor: lppmiruvor + color: "#fcff54" + metamorphicSprite: + sprite: _LostParadise/Objects/Consumable/Drinks/miruvor.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.2 + +- type: reagent + id: LPPCargoGargleBlaster + name: reagent-name-lpp-cargo-gargle-blaster + parent: BaseAlcohol + desc: reagent-desc-lpp-cargo-gargle-blaster + physicalDesc: reagent-physical-desc-lpp-rich + flavor: lppcargogargleblaster + color: "#9cc8b4" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/gargleblasterglass.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.4 \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Recipes/Reactions/drinks.yml b/Resources/Prototypes/_LostParadise/Recipes/Reactions/drinks.yml new file mode 100644 index 00000000000..311717252af --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Recipes/Reactions/drinks.yml @@ -0,0 +1,33 @@ +- type: reaction + id: LPPMiruvor + reactants: + Vodka: + amount: 2 + Grenadine: + amount: 2 + TableSalt: + amount: 1 + JuiceLime: + amount: 1 + JuiceOrange: + amount: 1 + Mead: + amount: 1 + products: + LPPMiruvor: 8 + +- type: reaction + id: LPPCargoGargleBlaster + reactants: + Moonshine: + amount: 2 + Mead: + amount: 1 + Kvass: + amount: 1 + JuiceLemon: + amount: 1 + Gold: + amount: 1 + products: + LPPCargoGargleBlaster: 6 \ No newline at end of file diff --git a/Resources/Textures/Objects/Consumable/Drinks/miruvor.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/miruvor.rsi/fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..5dd0f96ee57d60e8684a9c1bc6a2f65cc5a4274e GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}NuDl_ArY-_ z&n*;WP~>sBcywv&jMYl40amO_*hPf;ZwH$Wnv zGi~l_n+wkLEN`EgxR%w}`Ms=Q;hu8Q53X{PbVX18=!3r Mp00i_>zopr0D(0)r~m)} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/miruvor.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/miruvor.rsi/fill-2.png new file mode 100644 index 0000000000000000000000000000000000000000..3c7fa2dc0c5e98769d77addc0b27cd6785e3fb01 GIT binary patch literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}b)GJcArY-_ zFKpy>GUQ>o@H-?V*Zb zS3J(Sry6|du5tSOkG~o%pC_AbeqVRsZeVun?&P&oI}c5?G}^4O)WK!L_qL9N9>!4H txzn`@^gr%d{pw=1d$z8$r_26AW(m#cf6VXh-2u9U!PC{xWt~$(695yqO0xg} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/miruvor.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/miruvor.rsi/fill-3.png new file mode 100644 index 0000000000000000000000000000000000000000..834157b59bfbe47ca002360d52e882c3f45adaa1 GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}?Vc`sP#+Sfs5#>hbIKQ<2eLs&Q(u)Vd{p8TkRYqDD>%d**?B^9Z3%>6=pZ4u8+Z|cU^c~j6BqnO)OjI?F)>Q4_ zcs55saLcs?tMZ?>^6ii>tXcgkEZbF6Rm#(4e<5?GS24T#*WOn^Coy=s`njxgN@xNA Db}mk{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Drinks/miruvor.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/miruvor.rsi/fill-4.png new file mode 100644 index 0000000000000000000000000000000000000000..48544cbf2da6b0054836d292ec10504933cab1f6 GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}D?D8sLn2z= zUfIaoV!*?C;r!B*Tmc5IYzZa&4`hRms+Mw1SXtz>-1=pKz|?qFr=P!mvNjZ-vwW_n zq{Ps$>fG&ZnZ^Igj;>zr!@>A_-*=ZUq8X~QQX{J#|69Cjb6w)eS8)#t_vhuu9^BH< z5z%+|adBhNsoyha&X09)G4K_3VR^kPYLP(%pW)`d#~l*NS!+8Cm7e!Zx%AW~xH0U} mpLs!29WQp)Hx|FsV?VsHE9%R~IqQLLX7F_Nb6Mw<&;$S<4PXNQOGWw~Hw1OfHB>RMs)<-&_QAMOE3oif@3C6< zdhRNV$iuuo&o5suj!rOjaG8_*y&zBF*o}G49L3TKN)pKqE*_eNi#8PSwF;ctweCWc z@^hZGrrUCxw|*;<^IqWfr8@iVqrLOL>kF_v)QdChUmo05WLXOI1cRrmpUXO@geCxl CX=CyL literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Objects/Consumable/Drinks/miruvor.rsi/fill-1.png b/Resources/Textures/_LostParadise/Objects/Consumable/Drinks/miruvor.rsi/fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..ac1a485b87ffd0dc7a4c1300cce9d1522f9b10d3 GIT binary patch literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=Dh+L6~vJ#O${~L0?Z7$B+p3WC_;A2_ijBfd*V|2Q?%z4sa~> zWV*gB?QgqLV8gWUCX>!8pJr5GC_2)9o&Vq)|NH+8DpKC6++G7!57f-S$jr=;_lA#| mS4O0e0cb^PglC$sFM}44%>l$9a4C2)i1Kvxb6Mw<&;$VZW;$a4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Objects/Consumable/Drinks/miruvor.rsi/fill-2.png b/Resources/Textures/_LostParadise/Objects/Consumable/Drinks/miruvor.rsi/fill-2.png new file mode 100644 index 0000000000000000000000000000000000000000..53c93ea3c43922235fb995fe658657f8189099d4 GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCim11AIbUuWijbz1Zj20`GPGEO>_ z%)r2R5QG_bOw4`@6twbmaSXBWPfk!|a1(Vn;1P1*z=0DCOaXcl3uYZS!NL^4$Fd;u z;E^L|cv77hGxH9x0aY=a72U9bfnljX|M`c@{>=xP!j~H1nda-upao=e05J$$3Z4w2 NJYD@<);T3K0RU(`MIitH literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Objects/Consumable/Drinks/miruvor.rsi/fill-3.png b/Resources/Textures/_LostParadise/Objects/Consumable/Drinks/miruvor.rsi/fill-3.png new file mode 100644 index 0000000000000000000000000000000000000000..70726bb425403624301328c4929e2528d0fb5a8d GIT binary patch literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikt0(?STuWijbz1Zj20`DEu+Eix8DLOwvr&f;Qt`NuzCNI{Xh}U z0*}aI1_r)^Ak4U9Vm3&blc$Sgh=u>#bJko83Op_cXPp1LevR5~7nY41Ci*-*#Oz!a z;P}HpAzopr07leK2mk;8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Objects/Consumable/Drinks/miruvor.rsi/fill-4.png b/Resources/Textures/_LostParadise/Objects/Consumable/Drinks/miruvor.rsi/fill-4.png new file mode 100644 index 0000000000000000000000000000000000000000..97e530cdeea7bd543998ba80edf384f9abc7aca2 GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij?1AIbUuWikGw7>A!0`DEu+}HKH^p;u!WhQCVI{+#6k|4j}|6sr%<<0B{ z6yhxKh%9Dc;5!Jyj5{V~zXb~Vc)B=-Sops^Yskl-$l($wHu1N7W#o*sEgNFE<8svg zxO{BpJ5}3gBV@p(d-eUgu9+GV4KuGD(2+}f#IJj%GtlCL#phbyGTABrnZJuCoe{5= mdOK+y&|JRM2+uTMUj{88n*)eJ;8O5p5asFW=d#Wzp$PyQUsD4B literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Objects/Consumable/Drinks/miruvor.rsi/fill-5.png b/Resources/Textures/_LostParadise/Objects/Consumable/Drinks/miruvor.rsi/fill-5.png new file mode 100644 index 0000000000000000000000000000000000000000..6a32d744f305baa643611cc2a8ca6d31549ca992 GIT binary patch literal 264 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij?1AIbUuWijbw!r)JVxJw;+}HKH^p;u!W!^3lnFplUOM?7@|APU8lsB^* zP>8d@BeIx*f$ty)Gwzs}{T3+b@9E+gV&VVxoT1PG1s-NcnV$dupH!%rD!J}jlBjL6 zuPIR9&tX10v&o6@m|A|`O$si;Ix`F%g>6o3GcrB+|HAWSj&chw1aEurlI2T%Kq<4R ozIZHyv?|DGzSIcMG+$o^Eg+i%h(X{|@MI9>>FVdQ&MBb@0MnFF;{X5v literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Objects/Consumable/Drinks/miruvor.rsi/icon.png b/Resources/Textures/_LostParadise/Objects/Consumable/Drinks/miruvor.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..409373731146c1b15a6d669043473758c7f1dc1a GIT binary patch literal 557 zcmV+|0@D47P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0jNntK~z{rV;BXa zU=)mazzC&@1`qb6|A#Wc;P2NbP!jbLb*f%CMZobc=z@#2Z;Xq?h%*|10P;Lgv*fvND2X9@c*Bz_MGAE z-3?F?OwjN*lK~hFM4L-;2*ALnZ-202QUO^Gc=7%x!?&M*;rQzPFK{-gfSg?LzeDZ` z!-Fep816s&4i$xfof?%S1wROo>;Mo5Uw;f-7Wm(+VR-)bC&MYLZm{^uKr52XBg+9G z;686FN|C%X$(wAm$OfR0fQ1IRfb3iV0w3PL2V+VA*};bHb8_Mz1jr5nsPF$nF;tY! z08}r4FqBIcpePNz2bTRH4CRsq$cneT4Tr$-fAj4paM9& zEH~59>jvRZKYufWu%xIMm~T04J;_;;><~Ep>@AcB0laK147*Z%$<9@yV1NJv0|0Z8 v&y0cr=!5_O01jnXNoGw=04e|g00;m8000000Mb*F00000NkvXXu0mjf1`y-I literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Objects/Consumable/Drinks/miruvor.rsi/icon_empty.png b/Resources/Textures/_LostParadise/Objects/Consumable/Drinks/miruvor.rsi/icon_empty.png new file mode 100644 index 0000000000000000000000000000000000000000..0a8a49c8385ab4424d5b01e931e2f576c0016a4b GIT binary patch literal 488 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!hGb6{$B+p3WC_;A2_iie2RN2?vhjag^1t2a z;Dh(q)dR$s4LRTpq9fcNj`?g z4_}WTNNwcem%brbzVA;K`$cW$wH{{uI_wP%zxS-waQ$>nC4bXdCFuqyCNZfeOkF|` z+rPg*I77&xY{SCebLRYDXWZn>@ap&f03Ok$#vL~b{#bK3?@VFrx^$pA;U@o~0KLeD zH5I3C7jVe@H@{!^i+fS*mMb&l_tzXW&^*wW^4Wural+FytE#&Se_lS%PZO9XBFg+( zclla%OYcdtOv~r*ZT+OsFuk`mF}zFv=FTh;9)W}e28L;7vw7Biv^xWg1HRM<&op0O Z1}z|)1BgN3Qt)ID<>~6@vd$@?2>_8szE}VN literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Objects/Consumable/Drinks/miruvor.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Consumable/Drinks/miruvor.rsi/meta.json new file mode 100644 index 00000000000..e5994967cd8 --- /dev/null +++ b/Resources/Textures/_LostParadise/Objects/Consumable/Drinks/miruvor.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "size": + { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi. Fill levels by Tayrtahn on GitHub.", + "states": + [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + } + ] +} From 49734cf4c27d21ff93e90216b9c98f2bc34f3348 Mon Sep 17 00:00:00 2001 From: Den Frae Date: Sun, 13 Oct 2024 22:22:56 +0300 Subject: [PATCH 02/11] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=B2=D0=B5?= =?UTF-8?q?=D1=82=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../objects/consumable/drinks/drinks.ftl | 6 + .../entities/objects/fun/erp/fleshlight.ftl | 2 +- .../structures/machines/vending_machines.ftl | 3 - .../_LostParadise/Construction/Graphs.ftl | 2 +- .../_LostParadise/flavors/flavor-profiles.ftl | 2 +- .../objects/consumable/drinks/drinks.ftl | 2 +- .../meta/consumable/drink/alcohol.ftl | 2 +- .../reagents/meta/physical-desc.ftl | 2 +- .../object/consumable/drinks/drinks.ftl | 6 + Resources/Locale/ru-RU/accent/italian.ftl | 1 + .../actions/actions/actions-commands.ftl | 1 + Resources/Locale/ru-RU/atmos/air-alarm-ui.ftl | 2 + .../ru-RU/atmos/gas-canister-component.ftl | 1 + .../ru-RU/barsign/barsign-component.ftl | 1 + .../ru-RU/climbing/glass-table-component.ftl | 1 + .../interaction-popup-component.ftl | 1 + .../ru-RU/escape-menu/ui/escape-menu.ftl | 12 +- .../ru-RU/escape-menu/ui/options-menu.ftl | 467 +++++++++--------- .../Locale/ru-RU/flavors/flavor-profiles.ftl | 1 + .../gravity/gravity-generator-component.ftl | 1 + Resources/Locale/ru-RU/info/info-window.ftl | 1 + .../interaction-popup-component.ftl | 1 + .../ru-RU/pda/Ringer/ringer-component.ftl | 1 + Resources/Locale/ru-RU/random-barks/cow.ftl | 2 +- .../ru-RU/reagents/meta/physical-desc.ftl | 2 + .../Locale/ru-RU/robust-toolbox/commands.ftl | 2 + Resources/Locale/ru-RU/shell.ftl | 1 + Resources/Locale/ru-RU/shuttles/emergency.ftl | 1 + .../objects/consumable/drinks/drinks.ftl | 6 + .../entities/objects/fun/erp/fleshlight.ftl | 2 +- .../structures/machines/vending_machines.ftl | 3 - Resources/Locale/ru-RU/ui/transfer-amount.ftl | 1 + .../ru-RU/verbs/invoke-verb-command.ftl | 1 + .../Locale/ru-RU/verbs/list-verbs-command.ftl | 1 + .../Locale/ru-RU/voting/vote-commands.ftl | 1 + .../Inventories/CushionVendingMashine.yml | 10 - .../Markers/Spawners/Random/lppvendings.yml | 1 - .../Entities/Objects/Fun/ERP/fleshlight.yml | 70 --- .../Structures/Machines/vending_machines.yml | 33 -- 39 files changed, 292 insertions(+), 364 deletions(-) create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl create mode 100644 Resources/Locale/ru-RU/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl delete mode 100644 Resources/Prototypes/_LostParadise/Catalog/VendingMachines/Inventories/CushionVendingMashine.yml diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl new file mode 100644 index 00000000000..91fd3bfc62f --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl @@ -0,0 +1,6 @@ +ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } + .suffix = miruvor + .desc = { ent-DrinkGlass.desc } +ent-DrinkLPPCargoGargleBlasterGlass = { ent-DrinkGlass } + .suffix = cargo gargle blaster + .desc = { ent-DrinkGlass.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/fun/erp/fleshlight.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/fun/erp/fleshlight.ftl index 5dbaaf8ea7d..1c44913e9c8 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/fun/erp/fleshlight.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/fun/erp/fleshlight.ftl @@ -11,4 +11,4 @@ ent-LPPFleshlightYellow = fleshlight yellow ent-LPPPillowPinkRound = pillow pink round .desc = A soft pillow that is comfortable to sit on. ent-LPPPillowTealRound = pillow teal round - .desc = A soft pillow that is comfortable to sit on. + .desc = A soft pillow that is comfortable to sit on. \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/machines/vending_machines.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/machines/vending_machines.ftl index 59429946e21..833e802b0ad 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/machines/vending_machines.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/machines/vending_machines.ftl @@ -7,9 +7,6 @@ ent-LPPCargodrobeVard = Cargo vard machine ent-LPPErpMachine = Erp machine .desc = Fashionable suits for Varden! .suffix = Unlocked -ent-LPPCushionVendingMashine = Cushion vending mashine - .desc = Soft cushion for cozy gatherings! - .suffix = Unlocked ent-LPPBrasMat = Bras machine .desc = a machine that decorates the appearance of customers and makes them beautiful! .suffix = Unlocked diff --git a/Resources/Locale/ru-RU/_LostParadise/Construction/Graphs.ftl b/Resources/Locale/ru-RU/_LostParadise/Construction/Graphs.ftl index eee1d13d3ea..6742ab4c9f5 100644 --- a/Resources/Locale/ru-RU/_LostParadise/Construction/Graphs.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/Construction/Graphs.ftl @@ -776,4 +776,4 @@ construction-graph-desc-LPPClothingHeadHelmetBasicLight = Стандартная construction-graph-name-smugglersbag = сумка контрабандиста construction-graph-desc-smugglersbag = Модная сумка, для хранения контрабанды. Используйте гаечный ключ и накройте плиткой, чтобы никто не увидел ваши секреты. construction-graph-name-AtmosDeviceFanTiny = маленький вентилятор -construction-graph-desc-AtmosDeviceFanTiny = Маленький вентилятор создающий лёгкий поток воздуха. \ No newline at end of file +construction-graph-desc-AtmosDeviceFanTiny = Маленький вентилятор создающий лёгкий поток воздуха. diff --git a/Resources/Locale/ru-RU/_LostParadise/flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/_LostParadise/flavors/flavor-profiles.ftl index d28f5ae6014..eaf4334b9bf 100644 --- a/Resources/Locale/ru-RU/_LostParadise/flavors/flavor-profiles.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/flavors/flavor-profiles.ftl @@ -1,2 +1,2 @@ flavor-complex-lpp-cargo-gargle-blaster = как будто вы заработали миллион и подняли революцию -flavor-complex-lpp-miruvor = как высокомерие \ No newline at end of file +flavor-complex-lpp-miruvor = как высокомерие diff --git a/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/consumable/drinks/drinks.ftl b/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/consumable/drinks/drinks.ftl index 5fba9a2cd1c..1535611cd46 100644 --- a/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/consumable/drinks/drinks.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/consumable/drinks/drinks.ftl @@ -3,4 +3,4 @@ ent-DrinkLPPCargoGargleBlasterGlass = { ent-DrinkGlass } .desc = { ent-DrinkGlass.desc } ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } .suffix = Мирувор - .desc = { ent-DrinkGlass.desc } \ No newline at end of file + .desc = { ent-DrinkGlass.desc } diff --git a/Resources/Locale/ru-RU/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/ru-RU/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl index 69c11ce45b0..ecab61f7af3 100644 --- a/Resources/Locale/ru-RU/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl @@ -1,4 +1,4 @@ reagent-name-lpp-cargo-gargle-blaster = каргонский грызлодёр reagent-desc-lpp-cargo-gargle-blaster = Любимый напиток императора. reagent-name-lpp-miruvor = мирувор -reagent-desc-lpp-miruvor = Изысканный напиток специально для эльфов! \ No newline at end of file +reagent-desc-lpp-miruvor = Изысканный напиток специально для эльфов! diff --git a/Resources/Locale/ru-RU/_LostParadise/reagents/meta/physical-desc.ftl b/Resources/Locale/ru-RU/_LostParadise/reagents/meta/physical-desc.ftl index b58d1415afc..0e6a93a02bb 100644 --- a/Resources/Locale/ru-RU/_LostParadise/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/reagents/meta/physical-desc.ftl @@ -1,2 +1,2 @@ reagent-physical-desc-lpp-rich = богатое -reagent-physical-desc-lpp-exquisite = изысканное \ No newline at end of file +reagent-physical-desc-lpp-exquisite = изысканное diff --git a/Resources/Locale/ru-RU/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl b/Resources/Locale/ru-RU/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl new file mode 100644 index 00000000000..1333d9591e7 --- /dev/null +++ b/Resources/Locale/ru-RU/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl @@ -0,0 +1,6 @@ +ent-DrinkLPPCargoGargleBlasterGlass = { ent-DrinkGlass } + .suffix = cargo gargle blaster + .desc = { ent-DrinkGlass.desc } +ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } + .suffix = miruvor + .desc = { ent-DrinkGlass.desc } diff --git a/Resources/Locale/ru-RU/accent/italian.ftl b/Resources/Locale/ru-RU/accent/italian.ftl index 5245f28e9d5..b1c25f83971 100644 --- a/Resources/Locale/ru-RU/accent/italian.ftl +++ b/Resources/Locale/ru-RU/accent/italian.ftl @@ -1,6 +1,7 @@ # This should probably use the same prefix system as the mobster accent. # For the record, these do not work right now - even when uncommented. + # accent-italian-prefix-1 = Ravioli, ravioli, give me the formuoli! # accent-italian-prefix-2 = Mamma-mia! # accent-italian-prefix-3 = Mamma-mia! That's a spicy meat-ball! diff --git a/Resources/Locale/ru-RU/actions/actions/actions-commands.ftl b/Resources/Locale/ru-RU/actions/actions/actions-commands.ftl index 8a6d41203cc..fed57d1c1a9 100644 --- a/Resources/Locale/ru-RU/actions/actions/actions-commands.ftl +++ b/Resources/Locale/ru-RU/actions/actions/actions-commands.ftl @@ -1,5 +1,6 @@ ## Actions Commands loc + ## Upgradeaction command loc upgradeaction-command-need-one-argument = upgradeaction needs at least one argument, the action entity uid. The second optional argument is a specified level. diff --git a/Resources/Locale/ru-RU/atmos/air-alarm-ui.ftl b/Resources/Locale/ru-RU/atmos/air-alarm-ui.ftl index 0278f62114f..67482f4d42b 100644 --- a/Resources/Locale/ru-RU/atmos/air-alarm-ui.ftl +++ b/Resources/Locale/ru-RU/atmos/air-alarm-ui.ftl @@ -1,5 +1,6 @@ # UI + ## Window air-alarm-ui-access-denied = Недостаточный уровень доступа! @@ -30,6 +31,7 @@ air-alarm-ui-mode-none = Нет ## Widgets + ### General air-alarm-ui-widget-enable = Включено diff --git a/Resources/Locale/ru-RU/atmos/gas-canister-component.ftl b/Resources/Locale/ru-RU/atmos/gas-canister-component.ftl index 772d1d1a927..99c0ad00b91 100644 --- a/Resources/Locale/ru-RU/atmos/gas-canister-component.ftl +++ b/Resources/Locale/ru-RU/atmos/gas-canister-component.ftl @@ -1,5 +1,6 @@ ## UI + # Bound Interface gas-canister-bound-user-interface-title = Газовый баллон diff --git a/Resources/Locale/ru-RU/barsign/barsign-component.ftl b/Resources/Locale/ru-RU/barsign/barsign-component.ftl index be6d0da645e..d291ae62314 100644 --- a/Resources/Locale/ru-RU/barsign/barsign-component.ftl +++ b/Resources/Locale/ru-RU/barsign/barsign-component.ftl @@ -2,6 +2,7 @@ barsign-component-name = вывеска бара # Bar signs prototypes + ## The Harmbaton barsign-prototype-name-harmbaton = Хармбатон diff --git a/Resources/Locale/ru-RU/climbing/glass-table-component.ftl b/Resources/Locale/ru-RU/climbing/glass-table-component.ftl index 5056cc13de9..e22123a9698 100644 --- a/Resources/Locale/ru-RU/climbing/glass-table-component.ftl +++ b/Resources/Locale/ru-RU/climbing/glass-table-component.ftl @@ -1,5 +1,6 @@ ### Tables which take damage when a user is dragged onto them + ## Showed to users other than the climber glass-table-shattered-others = { CAPITALIZE($table) } ломается под весом { $climber }! diff --git a/Resources/Locale/ru-RU/deltav/interaction/interaction-popup-component.ftl b/Resources/Locale/ru-RU/deltav/interaction/interaction-popup-component.ftl index ccf1d2051a0..82ef324f735 100644 --- a/Resources/Locale/ru-RU/deltav/interaction/interaction-popup-component.ftl +++ b/Resources/Locale/ru-RU/deltav/interaction/interaction-popup-component.ftl @@ -1,5 +1,6 @@ ### Interaction Popup component + ## Petting animals petting-success-nukie-mouse = Вы гладите { THE($target) } по { POSS-ADJ($target) } маленькая кроваво-красная мышиная головка синдиката. diff --git a/Resources/Locale/ru-RU/escape-menu/ui/escape-menu.ftl b/Resources/Locale/ru-RU/escape-menu/ui/escape-menu.ftl index 03c2c53d910..38c823b573a 100644 --- a/Resources/Locale/ru-RU/escape-menu/ui/escape-menu.ftl +++ b/Resources/Locale/ru-RU/escape-menu/ui/escape-menu.ftl @@ -1,9 +1,9 @@ ### EscapeMenu.xaml -ui-escape-title = Игровое меню -ui-escape-options = Настройки -ui-escape-rules = Правила -ui-escape-guidebook = Руководство +ui-escape-title = Game Menu +ui-escape-options = Options +ui-escape-rules = Rules +ui-escape-guidebook = Guidebook ui-escape-wiki = Wiki -ui-escape-disconnect = Отключиться -ui-escape-quit = Выйти +ui-escape-disconnect = Disconnect +ui-escape-quit = Quit diff --git a/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl b/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl index c8c82c3dc94..abae09143e5 100644 --- a/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl +++ b/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl @@ -1,260 +1,267 @@ ## General stuff -ui-options-title = Игровые настройки -ui-options-tab-graphics = Графика -ui-options-tab-controls = Управление -ui-options-tab-audio = Аудио -ui-options-tab-network = Сеть -ui-options-tab-misc = Основные -ui-options-apply = Сохранить и применить -ui-options-reset-all = Сброс изменений -ui-options-default = Сброс к настройкам по умолчанию +ui-options-title = Game Options +ui-options-tab-graphics = Graphics +ui-options-tab-controls = Controls +ui-options-tab-audio = Audio +ui-options-tab-network = Network +ui-options-tab-misc = General +ui-options-apply = Apply +ui-options-reset-all = Reset All +ui-options-default = Default # Misc/General menu -ui-options-discordrich = Включить Discord Rich Presence -ui-options-general-ui-style = Стиль UI +ui-options-discordrich = Enable Discord Rich Presence +ui-options-general-ui-style = UI Style ui-options-general-discord = Discord -ui-options-general-cursor = Курсор -ui-options-general-speech = Речь -ui-options-general-storage = Инвентарь -ui-options-general-accessibility = Доступность +ui-options-general-cursor = Cursor +ui-options-general-speech = Speech +ui-options-general-storage = Storage +ui-options-general-accessibility = Accessibility ## Audio menu -ui-options-master-volume = Основная громкость: -ui-options-midi-volume = Громкость MIDI (Муз. инструменты): -ui-options-ambient-music-volume = Громкость музыки окружения: -ui-options-ambience-volume = Громкость окружения: -ui-options-lobby-volume = Громкость лобби и окончания раунда: -ui-options-announcer-volume = Громкость диктора: -ui-options-interface-volume = Громкость интерфейса: -ui-options-ambience-max-sounds = Кол-во одновременных звуков окружения: -ui-options-lobby-music = Музыка в лобби -ui-options-announcer-disable-multiple-sounds = Выключить многократное объявления. -ui-options-announcer-disable-multiple-sounds-tooltip = Некоторые объявления будут звучать неправильно, эта настройка не рекомендуется -ui-options-restart-sounds = Звуки перезапуска раунда -ui-options-event-music = Музыка событий +ui-options-master-volume = Master Volume: +ui-options-midi-volume = MIDI (Instrument) Volume: +ui-options-ambient-music-volume = Ambient music volume: +ui-options-ambience-volume = Ambience volume: +ui-options-lobby-volume = Lobby & Round-end volume: +ui-options-interface-volume = Interface volume: +ui-options-ambience-max-sounds = Ambience simultaneous sounds: +ui-options-announcer-volume = Announcer volume: +ui-options-lobby-music = Lobby & Round-end Music +ui-options-restart-sounds = Round Restart Sounds +ui-options-event-music = Event Music +ui-options-announcer-disable-multiple-sounds = Disable Overlapping Announcer Sounds +ui-options-announcer-disable-multiple-sounds-tooltip = Some announcements will not sound right, this setting isn't recommended +ui-options-admin-sounds = Play Admin Sounds +ui-options-volume-label = Volume ui-options-volume-percent = { TOSTRING($volume, "P0") } -ui-options-admin-sounds = Музыка админов -ui-options-volume-label = Громкость -ui-options-show-offer-mode-indicators = Показывать индикаторы режима предложения с помощью курсора ## Graphics menu -ui-options-show-held-item = Показать удерживаемый элемент рядом с курсором -ui-options-show-combat-mode-indicators = Показать индикатор боевого режима рядом с курсором -ui-options-opaque-storage-window = Непрозрачность окна хранилища -ui-options-no-filters = Отключить фильтры зрения -ui-options-show-ooc-patron-color = Цветной ник в OOC для патронов с Patreon -ui-options-show-looc-on-head = Показывать LOOC-чат над головами персонажей +ui-options-show-held-item = Show held item next to cursor +ui-options-show-combat-mode-indicators = Show combat mode indicators with cursor +ui-options-show-offer-mode-indicators = Show offer mode indicators with cursor +ui-options-opaque-storage-window = Opaque storage window +ui-options-show-ooc-patron-color = Show OOC Patreon color +ui-options-show-looc-on-head = Show LOOC chat above characters head +ui-options-fancy-speech = Show names in speech bubbles +ui-options-fancy-name-background = Add background to speech bubble names +ui-options-enable-color-name = Add colors to character names +ui-options-colorblind-friendly = Colorblind friendly mode +ui-options-no-filters = Disable species vision filters +ui-options-reduced-motion = Reduce motion of visual effects +ui-options-chat-window-opacity = Chat window opacity ui-options-chat-window-opacity-percent = { TOSTRING($opacity, "P0") } -ui-options-fancy-speech = Показывать имена в облачках с текстом +ui-options-screen-shake-intensity = Screen shake intensity ui-options-screen-shake-percent = { TOSTRING($intensity, "P0") } -ui-options-fancy-name-background = Добавить фон облачкам с текстом -ui-options-vsync = Вертикальная синхронизация -ui-options-fullscreen = Полный экран -ui-options-lighting-label = Качество освещения: -ui-options-lighting-very-low = Очень низкое -ui-options-lighting-low = Низкое -ui-options-lighting-medium = Среднее -ui-options-lighting-high = Высокое -ui-options-scale-label = Масштаб UI: -ui-options-scale-auto = Автоматическое ({ TOSTRING($scale, "P0") }) +ui-options-vsync = VSync +ui-options-fullscreen = Fullscreen +ui-options-lighting-label = Lighting Quality: +ui-options-lighting-very-low = Very Low +ui-options-lighting-low = Low +ui-options-lighting-medium = Medium +ui-options-lighting-high = High +ui-options-scale-label = UI Scale: +ui-options-scale-auto = Automatic ({ TOSTRING($scale, "P0") }) ui-options-scale-75 = 75% ui-options-scale-100 = 100% ui-options-scale-125 = 125% ui-options-scale-150 = 150% ui-options-scale-175 = 175% ui-options-scale-200 = 200% -ui-options-hud-theme = Тема HUD: -ui-options-hud-theme-default = По умолчанию -ui-options-hud-theme-plasmafire = Плазма -ui-options-hud-theme-slimecore = Слаймкор -ui-options-hud-theme-clockwork = Механизм -ui-options-hud-theme-retro = Ретро -ui-options-hud-theme-minimalist = Минимализм -ui-options-hud-theme-ashen = Пепел -ui-options-vp-stretch = Растянуть изображение для соответствия окну игры -ui-options-vp-scale = Фиксированный масштаб окна игры: -ui-options-vp-integer-scaling = Использовать целочисленное масштабирование (может вызывать появление чёрных полос/обрезания) +ui-options-hud-theme = HUD theme: +ui-options-hud-theme-default = Default +ui-options-hud-theme-plasmafire = Plasmafire +ui-options-hud-theme-slimecore = Slimecore +ui-options-hud-theme-clockwork = Clockwork +ui-options-hud-theme-retro = Retro +ui-options-hud-theme-minimalist = Minimalist +ui-options-hud-theme-ashen = Ashen +ui-options-vp-stretch = Stretch viewport to fit game window +ui-options-vp-scale = Fixed viewport scale: x{ $scale } +ui-options-vp-integer-scaling = Prefer integer scaling (might cause black bars/clipping) ui-options-vp-integer-scaling-tooltip = - Если эта опция включена, область просмотра будет масштабироваться, - используя целочисленное значение при определённых разрешениях. Хотя это и - приводит к чётким текстурам, это часто означает, что сверху/снизу экрана будут - чёрные полосы или что часть окна не будет видна. - Когда функция включена, основное окно просмотра не будет учитывать горизонтальную ось - при подгонке под ваш экран. Если ваш экран меньше, чем окно просмотра, - то это приведёт к его обрезанию по горизонтальной оси. -ui-options-vp-low-res = Изображение низкого разрешения -ui-options-parallax-low-quality = Низкокачественный параллакс (фон) -ui-options-fps-counter = Показать счётчик FPS -ui-options-vp-width = Ширина окна игры: -ui-options-hud-layout = Тип HUD: + If this option is enabled, the viewport will be scaled using an integer value + at specific resolutions. While this results in crisp textures, it also often + means that black bars appear at the top/bottom of the screen or that part + of the viewport is not visible. +ui-options-vp-low-res = Low-resolution viewport +ui-options-parallax-low-quality = Low-quality Parallax (background) +ui-options-fps-counter = Show FPS counter +ui-options-vp-width = Viewport width: { $width } +ui-options-hud-layout = HUD layout: ## Controls menu -ui-options-binds-reset-all = Сбросить ВСЕ привязки -ui-options-binds-explanation = ЛКМ — изменить кнопку, ПКМ — убрать кнопку -ui-options-unbound = Пусто -ui-options-bind-reset = Сбросить -ui-options-key-prompt = Нажмите кнопку... -ui-options-header-movement = Перемещение -ui-options-header-camera = Камера -ui-options-header-interaction-basic = Базовые взаимодействия -ui-options-header-interaction-adv = Продвинутые взаимодействия -ui-options-header-ui = Интерфейс -ui-options-header-misc = Разное -ui-options-header-hotbar = Хотбар -ui-options-header-shuttle = Шаттл -ui-options-header-map-editor = Редактор карт -ui-options-hotkey-default-walk = Ходить по умолчанию -ui-options-header-dev = Разработка -ui-options-header-general = Основное -ui-options-hotkey-keymap = Использовать клавиши QWERTY (США) -ui-options-hotkey-toggle-walk = Переключать шаг\бег -ui-options-function-move-up = Двигаться вверх -ui-options-function-move-left = Двигаться налево -ui-options-function-move-down = Двигаться вниз -ui-options-function-move-right = Двигаться направо -ui-options-function-walk = Идти -ui-options-function-camera-rotate-left = Повернуть налево -ui-options-function-camera-rotate-right = Повернуть направо -ui-options-function-camera-reset = Сбросить камеру -ui-options-function-zoom-in = Приблизить -ui-options-function-zoom-out = Отдалить -ui-options-function-reset-zoom = Сбросить -ui-options-function-use = Использовать -ui-options-function-use-secondary = Использовать вторично -ui-options-function-alt-use = Альтернативное использование -ui-options-function-wide-attack = Размашистая атака -ui-options-function-activate-item-in-hand = Использовать предмет в руке -ui-options-function-alt-activate-item-in-hand = Альтернативно использовать предмет в руке -ui-options-function-activate-item-in-world = Использовать предмет в мире -ui-options-function-alt-activate-item-in-world = Альтернативно использовать предмет в мире -ui-options-function-drop = Положить предмет -ui-options-function-offer-item = Предложи что-нибудь -ui-options-function-examine-entity = Осмотреть -ui-options-function-toggle-standing = Переключать лежание -ui-options-function-swap-hands = Поменять руки -ui-options-function-move-stored-item = Переместить хранящийся объект -ui-options-function-rotate-stored-item = Повернуть хранящийся объект -ui-options-function-save-item-location = Сохранить расположение объекта -ui-options-static-storage-ui = Закрепить интерфейс хранилища на хотбаре -ui-options-function-smart-equip-backpack = Умная экипировка в рюкзак -ui-options-function-smart-equip-belt = Умная экипировка на пояс -ui-options-function-open-backpack = Открыть рюкзак -ui-options-function-open-belt = Открыть пояс -ui-options-function-throw-item-in-hand = Бросить предмет -ui-options-function-try-pull-object = Тянуть объект -ui-options-function-move-pulled-object = Тянуть объект в сторону -ui-options-function-release-pulled-object = Перестать тянуть объект -ui-options-function-point = Указать на что-либо -ui-options-function-focus-chat-input-window = Писать в чат -ui-options-function-focus-local-chat-window = Писать в чат (IC) -ui-options-function-focus-emote = Писать в чат (Emote) -ui-options-function-focus-whisper-chat-window = Писать в чат (Шёпот) -ui-options-function-focus-radio-window = Писать в чат (Радио) -ui-options-function-focus-looc-window = Писать в чат (LOOC) -ui-options-function-focus-ooc-window = Писать в чат (OOC) -ui-options-function-focus-admin-chat-window = Писать в чат (Админ) -ui-options-function-focus-dead-chat-window = Писать в чат (Мёртвые) -ui-options-function-focus-console-chat-window = Писать в чат (Консоль) -ui-options-function-cycle-chat-channel-forward = Переключение каналов чата (Вперёд) -ui-options-function-cycle-chat-channel-backward = Переключение каналов чата (Назад) -ui-options-function-open-character-menu = Открыть меню персонажа -ui-options-function-open-context-menu = Открыть контекстное меню -ui-options-function-open-crafting-menu = Открыть меню строительства -ui-options-function-open-inventory-menu = Открыть снаряжение -ui-options-function-open-a-help = Открыть админ помощь -ui-options-function-open-abilities-menu = Открыть меню действий -ui-options-function-open-entity-spawn-window = Открыть меню спавна сущностей -ui-options-function-open-sandbox-window = Открыть меню песочницы -ui-options-function-open-tile-spawn-window = Открыть меню спавна тайлов -ui-options-function-open-decal-spawn-window = Открыть меню спавна декалей -ui-options-function-open-admin-menu = Открыть админ меню -ui-options-function-open-guidebook = Открыть руководство -ui-options-function-window-close-all = Закрыть все окна -ui-options-function-window-close-recent = Закрыть текущее окно -ui-options-function-show-escape-menu = Переключить игровое меню -ui-options-function-escape-context = Закрыть текущее окно или переключить игровое меню -ui-options-function-take-screenshot = Сделать скриншот -ui-options-function-take-screenshot-no-ui = Сделать скриншот (без интерфейса) -ui-options-function-toggle-fullscreen = Переключить полноэкранный режим -ui-options-function-editor-place-object = Разместить объект -ui-options-function-editor-cancel-place = Отменить размещение -ui-options-function-editor-grid-place = Размещать в сетке -ui-options-function-editor-line-place = Размещать в линию -ui-options-function-editor-rotate-object = Повернуть -ui-options-function-editor-flip-object = Перевернуть -ui-options-function-editor-copy-object = Копировать -ui-options-function-show-debug-console = Открыть консоль -ui-options-function-show-debug-monitors = Показать дебаг информацию -ui-options-function-inspect-entity = Изучить сущность -ui-options-function-hide-ui = Спрятать интерфейс -ui-options-function-hotbar1 = 1 слот хотбара -ui-options-function-hotbar2 = 2 слот хотбара -ui-options-function-hotbar3 = 3 слот хотбара -ui-options-function-hotbar4 = 4 слот хотбара -ui-options-function-hotbar5 = 5 слот хотбара -ui-options-function-hotbar6 = 6 слот хотбара -ui-options-function-hotbar7 = 7 слот хотбара -ui-options-function-hotbar8 = 8 слот хотбара -ui-options-function-hotbar9 = 9 слот хотбара -ui-options-function-hotbar0 = 0 слот хотбара -ui-options-function-loadout1 = 1 страница хотбара -ui-options-function-loadout2 = 2 страница хотбара -ui-options-function-loadout3 = 3 страница хотбара -ui-options-function-loadout4 = 4 страница хотбара -ui-options-function-loadout5 = 5 страница хотбара -ui-options-function-loadout6 = 6 страница хотбара -ui-options-function-loadout7 = 7 страница хотбара -ui-options-function-loadout8 = 8 страница хотбара -ui-options-function-loadout9 = 9 страница хотбара -ui-options-function-loadout0 = 0 страница хотбара -ui-options-function-shuttle-strafe-up = Стрейф вверх -ui-options-function-shuttle-strafe-right = Стрейф вправо -ui-options-function-shuttle-strafe-left = Стрейф влево -ui-options-function-shuttle-strafe-down = Стрейф вниз -ui-options-function-shuttle-rotate-left = Поворот налево -ui-options-function-shuttle-rotate-right = Поворот направо -ui-options-function-shuttle-brake = Торможение -ui-options-net-interp-ratio = Сетевое сглаживание -ui-options-net-predict = Предугадывание на стороне клиента +ui-options-binds-reset-all = Reset ALL keybinds +ui-options-binds-explanation = Click to change binding, right-click to clear +ui-options-unbound = Unbound +ui-options-bind-reset = Reset +ui-options-key-prompt = Press a key... +ui-options-header-movement = Movement +ui-options-header-camera = Camera +ui-options-header-interaction-basic = Basic Interaction +ui-options-header-interaction-adv = Advanced Interaction +ui-options-header-ui = User Interface +ui-options-header-misc = Miscellaneous +ui-options-header-hotbar = Hotbar +ui-options-header-shuttle = Shuttle +ui-options-header-map-editor = Map Editor +ui-options-header-dev = Development +ui-options-header-general = General +ui-options-hotkey-keymap = Use US QWERTY Keys +ui-options-hotkey-toggle-walk = Toggle Speed +ui-options-hotkey-default-walk = Walk by default +ui-options-function-move-up = Move Up +ui-options-function-move-left = Move Left +ui-options-function-move-down = Move Down +ui-options-function-move-right = Move Right +ui-options-function-walk = Change Speed +ui-options-function-camera-rotate-left = Rotate left +ui-options-function-camera-rotate-right = Rotate right +ui-options-function-camera-reset = Reset +ui-options-function-zoom-in = Zoom in +ui-options-function-zoom-out = Zoom out +ui-options-function-reset-zoom = Reset zoom +ui-options-function-use = Use +ui-options-function-use-secondary = Use secondary +ui-options-function-alt-use = Alt use +ui-options-function-wide-attack = Wide attack +ui-options-function-activate-item-in-hand = Activate item in hand +ui-options-function-alt-activate-item-in-hand = Alternative activate item in hand +ui-options-function-activate-item-in-world = Activate item in world +ui-options-function-alt-activate-item-in-world = Alternative activate item in world +ui-options-function-drop = Drop item +ui-options-function-examine-entity = Examine +ui-options-function-swap-hands = Swap hands +ui-options-function-move-stored-item = Move stored item +ui-options-function-rotate-stored-item = Rotate stored item +ui-options-function-offer-item = Offer something +ui-options-function-save-item-location = Save item location +ui-options-function-toggle-standing = Toggle standing +ui-options-static-storage-ui = Lock storage window to hotbar +ui-options-function-smart-equip-backpack = Smart-equip to backpack +ui-options-function-smart-equip-belt = Smart-equip to belt +ui-options-function-open-backpack = Open backpack +ui-options-function-open-belt = Open belt +ui-options-function-throw-item-in-hand = Throw item +ui-options-function-try-pull-object = Pull object +ui-options-function-move-pulled-object = Move pulled object +ui-options-function-release-pulled-object = Release pulled object +ui-options-function-point = Point at location +ui-options-function-focus-chat-input-window = Focus chat +ui-options-function-focus-local-chat-window = Focus chat (IC) +ui-options-function-focus-emote = Focus chat (Emote) +ui-options-function-focus-whisper-chat-window = Focus chat (Whisper) +ui-options-function-focus-radio-window = Focus chat (Radio) +ui-options-function-focus-looc-window = Focus chat (LOOC) +ui-options-function-focus-ooc-window = Focus chat (OOC) +ui-options-function-focus-admin-chat-window = Focus chat (Admin) +ui-options-function-focus-dead-chat-window = Focus chat (Dead) +ui-options-function-focus-console-chat-window = Focus chat (Console) +ui-options-function-cycle-chat-channel-forward = Cycle channel (Forward) +ui-options-function-cycle-chat-channel-backward = Cycle channel (Backward) +ui-options-function-open-character-menu = Open character menu +ui-options-function-open-context-menu = Open context menu +ui-options-function-open-crafting-menu = Open crafting menu +ui-options-function-open-inventory-menu = Open inventory +ui-options-function-open-a-help = Open admin help +ui-options-function-open-abilities-menu = Open action menu +ui-options-function-open-entity-spawn-window = Open entity spawn menu +ui-options-function-open-sandbox-window = Open sandbox menu +ui-options-function-open-tile-spawn-window = Open tile spawn menu +ui-options-function-open-decal-spawn-window = Open decal spawn menu +ui-options-function-open-admin-menu = Open admin menu +ui-options-function-open-guidebook = Open guidebook +ui-options-function-window-close-all = Close all windows +ui-options-function-window-close-recent = Close recent window +ui-options-function-show-escape-menu = Toggle game menu +ui-options-function-escape-context = Close recent window or toggle game menu +ui-options-function-take-screenshot = Take screenshot +ui-options-function-take-screenshot-no-ui = Take screenshot (without UI) +ui-options-function-toggle-fullscreen = Toggle fullscreen +ui-options-function-editor-place-object = Place object +ui-options-function-editor-cancel-place = Cancel placement +ui-options-function-editor-grid-place = Place in grid +ui-options-function-editor-line-place = Place line +ui-options-function-editor-rotate-object = Rotate +ui-options-function-editor-flip-object = Flip +ui-options-function-editor-copy-object = Copy +ui-options-function-open-abilities-menu = Open action menu +ui-options-function-show-debug-console = Open Console +ui-options-function-show-debug-monitors = Show Debug Monitors +ui-options-function-inspect-entity = Inspect Entity +ui-options-function-hide-ui = Hide UI +ui-options-function-hotbar1 = Hotbar slot 1 +ui-options-function-hotbar2 = Hotbar slot 2 +ui-options-function-hotbar3 = Hotbar slot 3 +ui-options-function-hotbar4 = Hotbar slot 4 +ui-options-function-hotbar5 = Hotbar slot 5 +ui-options-function-hotbar6 = Hotbar slot 6 +ui-options-function-hotbar7 = Hotbar slot 7 +ui-options-function-hotbar8 = Hotbar slot 8 +ui-options-function-hotbar9 = Hotbar slot 9 +ui-options-function-hotbar0 = Hotbar slot 0 +ui-options-function-loadout1 = Hotbar Loadout 1 +ui-options-function-loadout2 = Hotbar Loadout 2 +ui-options-function-loadout3 = Hotbar Loadout 3 +ui-options-function-loadout4 = Hotbar Loadout 4 +ui-options-function-loadout5 = Hotbar Loadout 5 +ui-options-function-loadout6 = Hotbar Loadout 6 +ui-options-function-loadout7 = Hotbar Loadout 7 +ui-options-function-loadout8 = Hotbar Loadout 8 +ui-options-function-loadout9 = Hotbar Loadout 9 +ui-options-function-loadout0 = Hotbar Loadout 0 +ui-options-function-shuttle-strafe-up = Strafe up +ui-options-function-shuttle-strafe-right = Strafe right +ui-options-function-shuttle-strafe-left = Strafe left +ui-options-function-shuttle-strafe-down = Strafe down +ui-options-function-shuttle-rotate-left = Rotate left +ui-options-function-shuttle-rotate-right = Rotate right +ui-options-function-shuttle-brake = Brake + +## Network menu + +ui-options-net-predict = Client-side prediction +ui-options-net-interp-ratio = State buffer size ui-options-net-interp-ratio-tooltip = - Увеличение этого параметра, как правило, делает игру - более устойчивой к потере пакетов, однако при этом - это так же добавляет немного больше задержки и - требует от клиента предсказывать больше будущих тиков. -ui-options-net-predict-tick-bias = Погрешность тиков предугадывания + Increasing this will generally make the game more resistant + to server->client packet-loss, however in doing so it + effectively adds slightly more latency and requires the + client to predict more future ticks. +ui-options-net-predict-tick-bias = Prediction tick bias ui-options-net-predict-tick-bias-tooltip = - Увеличение этого параметра, как правило, делает игру более устойчивой - к потере пакетов между клиентом и сервером, однако при этом - немного возрастает задержка, и клиенту требуется предугадывать - больше будущих тиков -ui-options-net-pvs-spawn = Лимит появление PVS сущностей + Increasing this will generally make the game more resistant + to client->server packet-loss, however in doing so it + effectively adds slightly more latency and requires the + client to predict more future ticks. +ui-options-net-pvs-spawn = PVS entity spawn budget ui-options-net-pvs-spawn-tooltip = - Ограничение частоты отправки новых появившихся сущностей сервером на клиент. - Снижение этого параметра может помочь уменьшить "захлёбывания", - вызываемые спавном сущностей, но может привести к их резкому появлению. -ui-options-net-pvs-entry = Лимит PVS сущностей + This limits the rate at which the server will send newly spawned + entities to the client. Lowering this can help reduce + stuttering due to entity spawning, but can lead to pop-in. +ui-options-net-pvs-entry = PVS entity budget ui-options-net-pvs-entry-tooltip = - Ограничение частоты отправки новых видимых сущностей сервером на клиент. - Снижение этого параметра может помочь уменьшить "захлёбывания", - вызываемые спавном сущностей, но может привести к их резкому появлению. -ui-options-net-pvs-leave = Частота удаления PVS + This limits the rate at which the server will send newly visible + entities to the client. Lowering this can help reduce + stuttering, but can lead to pop-in. +ui-options-net-pvs-leave = PVS detach rate ui-options-net-pvs-leave-tooltip = - Ограничение частоты, с которой клиент будет удалять - сущности вне поля зрения. Снижение этого параметра может помочь - уменьшить "захлёбывания" при ходьбе, но иногда может - привести к неправильным предугадываниям и другим проблемам. -ui-options-function-look-up = Присмотреться/Прицелиться -ui-options-function-auto-get-up = Автоматически вставать после падения -ui-options-function-hold-look-up = Удерживайте клавишу, чтобы прицелиться -cmd-options-desc = Открывает меню опций, опционально с конкретно выбранной вкладкой. -cmd-options-help = Использование: options [tab] -ui-options-enable-color-name = Цветные имена персонажей -ui-options-colorblind-friendly = Режим для дальтоников -ui-options-reduced-motion = Снижение интенсивности визуальных эффектов -ui-options-chat-window-opacity = Прозрачность окна чата -ui-options-screen-shake-intensity = Интенсивность дрожания экрана + This limits the rate at which the client will remove + out-of-view entities. Lowering this can help reduce + stuttering when walking around, but could occasionally + lead to mispredicts and other issues. + +## Toggle window console command + +cmd-options-desc = Opens options menu, optionally with a specific tab selected. +cmd-options-help = Usage: options [tab] + +## Combat Options + +ui-options-function-look-up = Look up/Take aim +ui-options-function-auto-get-up = Automatically get up after falling +ui-options-function-hold-look-up = Hold down the key to aim diff --git a/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl index f64e828e938..1244ce913f5 100644 --- a/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl +++ b/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl @@ -255,6 +255,7 @@ flavor-complex-pilk = как сладкое молоко # Medicine/chemical-specific flavors. + ## Generic flavors. flavor-complex-medicine = как лекарство diff --git a/Resources/Locale/ru-RU/gravity/gravity-generator-component.ftl b/Resources/Locale/ru-RU/gravity/gravity-generator-component.ftl index 48e571d333c..22190b51ea1 100644 --- a/Resources/Locale/ru-RU/gravity/gravity-generator-component.ftl +++ b/Resources/Locale/ru-RU/gravity/gravity-generator-component.ftl @@ -1,5 +1,6 @@ ### Gravity Generator + ## UI gravity-generator-window-title = Генератор гравитации diff --git a/Resources/Locale/ru-RU/info/info-window.ftl b/Resources/Locale/ru-RU/info/info-window.ftl index 722956d5dad..4d45a42bde0 100644 --- a/Resources/Locale/ru-RU/info/info-window.ftl +++ b/Resources/Locale/ru-RU/info/info-window.ftl @@ -1,5 +1,6 @@ ### Info Window + ## General stuff ui-info-title = Информация diff --git a/Resources/Locale/ru-RU/interaction/interaction-popup-component.ftl b/Resources/Locale/ru-RU/interaction/interaction-popup-component.ftl index c8be66cfdbb..c2dbb8cab8a 100644 --- a/Resources/Locale/ru-RU/interaction/interaction-popup-component.ftl +++ b/Resources/Locale/ru-RU/interaction/interaction-popup-component.ftl @@ -1,5 +1,6 @@ ### Interaction Popup component + ## Petting animals petting-success-generic = Вы гладите { $target } по голове. diff --git a/Resources/Locale/ru-RU/pda/Ringer/ringer-component.ftl b/Resources/Locale/ru-RU/pda/Ringer/ringer-component.ftl index b0cd8a95bc3..a461cbd7952 100644 --- a/Resources/Locale/ru-RU/pda/Ringer/ringer-component.ftl +++ b/Resources/Locale/ru-RU/pda/Ringer/ringer-component.ftl @@ -1,5 +1,6 @@ ### UI + # For the PDA Ringer screen comp-ringer-vibration-popup = Ваш КПК вибрирует diff --git a/Resources/Locale/ru-RU/random-barks/cow.ftl b/Resources/Locale/ru-RU/random-barks/cow.ftl index aaff7aa64bc..5a75afc7755 100644 --- a/Resources/Locale/ru-RU/random-barks/cow.ftl +++ b/Resources/Locale/ru-RU/random-barks/cow.ftl @@ -4,7 +4,7 @@ bark-cow-3 = Хрр bark-cow-4 = Мууууууууууууууу bark-cow-5 = Муууууу bark-cow-6 = Пол это еда -bark-cow-7 = Я голодный +bark-cow-7 = Я голодный bark-cow-8 = Как долго я здесь нахожусь? bark-cow-9 = Мууууу Мууууууу bark-cow-10 = Хрр... Мууууу diff --git a/Resources/Locale/ru-RU/reagents/meta/physical-desc.ftl b/Resources/Locale/ru-RU/reagents/meta/physical-desc.ftl index 958ff218c16..8b38eb37704 100644 --- a/Resources/Locale/ru-RU/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/ru-RU/reagents/meta/physical-desc.ftl @@ -97,3 +97,5 @@ reagent-physical-desc-alkaline = щелочное reagent-physical-desc-holy = святое reagent-physical-desc-slimy = склизкое reagent-physical-desc-neural = нейронное +reagent-physical-desc-lpp-rich = rich +reagent-physical-desc-lpp-exquisite = exquisite diff --git a/Resources/Locale/ru-RU/robust-toolbox/commands.ftl b/Resources/Locale/ru-RU/robust-toolbox/commands.ftl index 1259d33e34f..3f0fc6778ca 100644 --- a/Resources/Locale/ru-RU/robust-toolbox/commands.ftl +++ b/Resources/Locale/ru-RU/robust-toolbox/commands.ftl @@ -1,5 +1,6 @@ ### Localization for engine console commands + ## generic command errors cmd-invalid-arg-number-error = Недопустимое число аргументов. @@ -171,6 +172,7 @@ cmd-hint-savebp-id = ## 'flushcookies' command + # Примечание: команда flushcookies взята из Robust.Client.WebView, её нет в коде основного движка. cmd-flushcookies-desc = Сброс хранилища CEF-cookie на диск diff --git a/Resources/Locale/ru-RU/shell.ftl b/Resources/Locale/ru-RU/shell.ftl index 82b1ded8554..1c2169249ef 100644 --- a/Resources/Locale/ru-RU/shell.ftl +++ b/Resources/Locale/ru-RU/shell.ftl @@ -1,5 +1,6 @@ ### for technical and/or system messages + ## General shell-server-cannot = Сервер не может выполнить это. diff --git a/Resources/Locale/ru-RU/shuttles/emergency.ftl b/Resources/Locale/ru-RU/shuttles/emergency.ftl index f11256dc036..598fc029c91 100644 --- a/Resources/Locale/ru-RU/shuttles/emergency.ftl +++ b/Resources/Locale/ru-RU/shuttles/emergency.ftl @@ -1,5 +1,6 @@ # Commands + ## Delay shuttle round end emergency-shuttle-command-round-desc = Останавливает таймер окончания раунда, когда эвакуационный шаттл покидает гиперпространство. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl new file mode 100644 index 00000000000..91fd3bfc62f --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl @@ -0,0 +1,6 @@ +ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } + .suffix = miruvor + .desc = { ent-DrinkGlass.desc } +ent-DrinkLPPCargoGargleBlasterGlass = { ent-DrinkGlass } + .suffix = cargo gargle blaster + .desc = { ent-DrinkGlass.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/fun/erp/fleshlight.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/fun/erp/fleshlight.ftl index 038ed4c9bc2..35c3f40bea3 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/fun/erp/fleshlight.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/fun/erp/fleshlight.ftl @@ -11,4 +11,4 @@ ent-LPPFleshlightYellow = Желтый мастурбатор ent-LPPPillowPinkRound = розовая подушка .desc = Розовая круглая подушка с дыркой по центру. Зачем же она?.. ent-LPPPillowTealRound = бирюзовая подушка - .desc = Бирюзовая круглая подушка с дыркой по центру. Зачем же она?.. + .desc = Бирюзовая круглая подушка с дыркой по центру. Зачем же она?.. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/structures/machines/vending_machines.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/structures/machines/vending_machines.ftl index a080cbf6a9c..302542f02b1 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/structures/machines/vending_machines.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/structures/machines/vending_machines.ftl @@ -7,9 +7,6 @@ ent-LPPCargodrobeVard = Раздатчик продвинутой одежды ent-LPPErpMachine = ВесельеМат .desc = Если надо поразвлечься - поскорее опробуй ты услуг товаров наших! .suffix = Разблокирован -ent-LPPCushionVendingMashine = ПодушкоМат - .desc = Мягкие подушки для уютных посиделок! - .suffix = Разблокирован ent-LPPBrasMat = Раздатчик бюстгальтеров .desc = Раздатчик, что дополняет образ пользователя и делает его неотразимым! .suffix = Разблокирован diff --git a/Resources/Locale/ru-RU/ui/transfer-amount.ftl b/Resources/Locale/ru-RU/ui/transfer-amount.ftl index 4864b4deb3b..2b786d323df 100644 --- a/Resources/Locale/ru-RU/ui/transfer-amount.ftl +++ b/Resources/Locale/ru-RU/ui/transfer-amount.ftl @@ -1,5 +1,6 @@ ### Loc for the transfer amount eui window + ## Title ui-transfer-amount-title = Изменить перемещаемое количество diff --git a/Resources/Locale/ru-RU/verbs/invoke-verb-command.ftl b/Resources/Locale/ru-RU/verbs/invoke-verb-command.ftl index e8d06c3ae58..b748505059b 100644 --- a/Resources/Locale/ru-RU/verbs/invoke-verb-command.ftl +++ b/Resources/Locale/ru-RU/verbs/invoke-verb-command.ftl @@ -1,5 +1,6 @@ ### Localization used for the invoke verb command. + # Mostly help + error messages. invoke-verb-command-description = Вызывает verb с заданным именем на сущности, с сущностью игрока diff --git a/Resources/Locale/ru-RU/verbs/list-verbs-command.ftl b/Resources/Locale/ru-RU/verbs/list-verbs-command.ftl index 7811b4b3e5e..fc2330408ff 100644 --- a/Resources/Locale/ru-RU/verbs/list-verbs-command.ftl +++ b/Resources/Locale/ru-RU/verbs/list-verbs-command.ftl @@ -1,5 +1,6 @@ ### Localization used for the list verbs command. + # Mostly help + error messages. list-verbs-command-description = Перечисляет все verbs, которые игрок может использовать на данной сущности. diff --git a/Resources/Locale/ru-RU/voting/vote-commands.ftl b/Resources/Locale/ru-RU/voting/vote-commands.ftl index f2e9067437b..1d333f82a5a 100644 --- a/Resources/Locale/ru-RU/voting/vote-commands.ftl +++ b/Resources/Locale/ru-RU/voting/vote-commands.ftl @@ -1,5 +1,6 @@ ### Voting system related console commands + ## 'createvote' command cmd-createvote-desc = Создаёт голосование diff --git a/Resources/Prototypes/_LostParadise/Catalog/VendingMachines/Inventories/CushionVendingMashine.yml b/Resources/Prototypes/_LostParadise/Catalog/VendingMachines/Inventories/CushionVendingMashine.yml deleted file mode 100644 index fbff024906c..00000000000 --- a/Resources/Prototypes/_LostParadise/Catalog/VendingMachines/Inventories/CushionVendingMashine.yml +++ /dev/null @@ -1,10 +0,0 @@ -- type: vendingMachineInventory - id: CushionVendingMachineServitorInventory - startingInventory: - LPPPillowPinkRound: 3 - LPPPillowTealRound: 3 - LPPPillow1: 3 - LPPPillow2: 3 - LPPPillow3: 3 - LPPPillow4: 3 - LPPPillow5: 3 diff --git a/Resources/Prototypes/_LostParadise/Entities/Markers/Spawners/Random/lppvendings.yml b/Resources/Prototypes/_LostParadise/Entities/Markers/Spawners/Random/lppvendings.yml index 434ff47faea..53cb8c3aef5 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Markers/Spawners/Random/lppvendings.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Markers/Spawners/Random/lppvendings.yml @@ -13,7 +13,6 @@ prototypes: - LPPBeachVendingMachine - LPPErpMachine - - LPPCushionVendingMashine - LPPBrasMat - LPPNascaMat - LPPPillowVendingMachine diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Fun/ERP/fleshlight.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Fun/ERP/fleshlight.yml index a79f0ae277f..d7344f4e251 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Fun/ERP/fleshlight.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Fun/ERP/fleshlight.yml @@ -88,76 +88,6 @@ parent: [BaseItem, BaseFoldable, SeatBase] description: A soft pillow that is comfortable to sit on. components: - - type: Sprite - sprite: _LostParadise/Objects/Fun/ERP/fleshlight.rsi - scale: 1.0, 1.0 - layers: - - state: pillow_teal_round - - type: Item - size: Normal - -- type: entity - name: pillow1 - id: LPPPillow1 - parent: [BaseItem, BaseFoldable, SeatBase] - description: A soft pillow that is comfortable to sit on. - components: - - type: Sprite - sprite: _LostParadise/Objects/Fun/ERP/fleshlight.rsi - scale: 1.0, 1.0 - layers: - - state: pillow_teal_round - - type: Item - size: Normal - -- type: entity - name: pillow2 - id: LPPPillow2 - parent: [BaseItem, BaseFoldable, SeatBase] - description: A soft pillow that is comfortable to sit on. - components: - - type: Sprite - sprite: _LostParadise/Objects/Fun/ERP/fleshlight.rsi - scale: 1.0, 1.0 - layers: - - state: pillow_teal_round - - type: Item - size: Normal - -- type: entity - name: pillow3 - id: LPPPillow3 - parent: [BaseItem, BaseFoldable, SeatBase] - description: A soft pillow that is comfortable to sit on. - components: - - type: Sprite - sprite: _LostParadise/Objects/Fun/ERP/fleshlight.rsi - scale: 1.0, 1.0 - layers: - - state: pillow_teal_round - - type: Item - size: Normal - -- type: entity - name: pillow4 - id: LPPPillow4 - parent: [BaseItem, BaseFoldable, SeatBase] - description: A soft pillow that is comfortable to sit on. - components: - - type: Sprite - sprite: _LostParadise/Objects/Fun/ERP/fleshlight.rsi - scale: 1.0, 1.0 - layers: - - state: pillow_teal_round - - type: Item - size: Normal - -- type: entity - name: pillow5 - id: LPPPillow5 - parent: [BaseItem, BaseFoldable, SeatBase] - description: A soft pillow that is comfortable to sit on. - components: - type: Sprite sprite: _LostParadise/Objects/Fun/ERP/fleshlight.rsi scale: 1.0, 1.0 diff --git a/Resources/Prototypes/_LostParadise/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Machines/vending_machines.yml index 8329a81fa34..bb7b238b7fb 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Structures/Machines/vending_machines.yml @@ -97,39 +97,6 @@ energy: 1.6 color: "#9966cc" -- type: entity - parent: VendingMachine - id: LPPCushionVendingMashine - name: Cushion vending mashine - description: Soft cushion for cozy gatherings! - suffix: Unlocked - components: - - type: VendingMachine - pack: CushionVendingMachineServitorInventory - offState: off - brokenState: broken - normalState: normal-unshaded - ejectState: eject-unshaded - denyState: deny-unshaded - - type: Advertise - pack: ClothesMateAds - - type: SpeakOnUIClosed - pack: GenericVendGoodbyes - - type: Sprite - sprite: _LostParadise/Structures/Machines/VendingMachines/erp-machine.rsi - layers: - - state: "off" - map: ["enum.VendingMachineVisualLayers.Base"] - - state: "off" - map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] - shader: unshaded - - state: panel - map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: PointLight - radius: 1.5 - energy: 1.6 - color: "#9966cc" - - type: entity parent: VendingMachine id: LPPBrasMat From 87cbace2f021a6b05d6f133ca7e941cd5e8cc527 Mon Sep 17 00:00:00 2001 From: Den Frae Date: Sun, 13 Oct 2024 22:34:00 +0300 Subject: [PATCH 03/11] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=BD=D1=84=D0=BB=D0=B8=D0=BA=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_LostParadise/Flavors/flavors.yml | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/Resources/Prototypes/_LostParadise/Flavors/flavors.yml b/Resources/Prototypes/_LostParadise/Flavors/flavors.yml index af508866304..5e0811df648 100644 --- a/Resources/Prototypes/_LostParadise/Flavors/flavors.yml +++ b/Resources/Prototypes/_LostParadise/Flavors/flavors.yml @@ -1,3 +1,33 @@ +- type: flavor + id: camomiletea + flavorType: Complex + description: flavor-complex-camomile-tea + +- type: flavor + id: minttea + flavorType: Complex + description: flavor-complex-mint-tea + +- type: flavor + id: gingertea + flavorType: Complex + description: flavor-complex-ginger-tea + +- type: flavor + id: berrytea + flavorType: Complex + description: flavor-complex-berry-tea + +- type: flavor + id: orangetea + flavorType: Complex + description: flavor-complex-orange-tea + +- type: flavor + id: flowertea + flavorType: Complex + description: flavor-complex-flower-tea + - type: flavor id: lppcargogargleblaster flavorType: Complex From c236d901ce6d7b2561d386853af39b14dda1cad4 Mon Sep 17 00:00:00 2001 From: Den Frae Date: Sun, 13 Oct 2024 22:48:35 +0300 Subject: [PATCH 04/11] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D0=B2=D0=B5?= =?UTF-8?q?=D1=82=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Consumable/Drinks/miruvor.rsi/fill-1.png | Bin 168 -> 0 bytes .../Consumable/Drinks/miruvor.rsi/fill-2.png | Bin 196 -> 0 bytes .../Consumable/Drinks/miruvor.rsi/fill-3.png | Bin 205 -> 0 bytes .../Consumable/Drinks/miruvor.rsi/fill-4.png | Bin 238 -> 0 bytes .../Consumable/Drinks/miruvor.rsi/fill-5.png | Bin 255 -> 0 bytes 5 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/miruvor.rsi/fill-1.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/miruvor.rsi/fill-2.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/miruvor.rsi/fill-3.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/miruvor.rsi/fill-4.png delete mode 100644 Resources/Textures/Objects/Consumable/Drinks/miruvor.rsi/fill-5.png diff --git a/Resources/Textures/Objects/Consumable/Drinks/miruvor.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/miruvor.rsi/fill-1.png deleted file mode 100644 index 5dd0f96ee57d60e8684a9c1bc6a2f65cc5a4274e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}NuDl_ArY-_ z&n*;WP~>sBcywv&jMYl40amO_*hPf;ZwH$Wnv zGi~l_n+wkLEN`EgxR%w}`Ms=Q;hu8Q53X{PbVX18=!3r Mp00i_>zopr0D(0)r~m)} diff --git a/Resources/Textures/Objects/Consumable/Drinks/miruvor.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/miruvor.rsi/fill-2.png deleted file mode 100644 index 3c7fa2dc0c5e98769d77addc0b27cd6785e3fb01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}b)GJcArY-_ zFKpy>GUQ>o@H-?V*Zb zS3J(Sry6|du5tSOkG~o%pC_AbeqVRsZeVun?&P&oI}c5?G}^4O)WK!L_qL9N9>!4H txzn`@^gr%d{pw=1d$z8$r_26AW(m#cf6VXh-2u9U!PC{xWt~$(695yqO0xg} diff --git a/Resources/Textures/Objects/Consumable/Drinks/miruvor.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/miruvor.rsi/fill-3.png deleted file mode 100644 index 834157b59bfbe47ca002360d52e882c3f45adaa1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}?Vc`sP#+Sfs5#>hbIKQ<2eLs&Q(u)Vd{p8TkRYqDD>%d**?B^9Z3%>6=pZ4u8+Z|cU^c~j6BqnO)OjI?F)>Q4_ zcs55saLcs?tMZ?>^6ii>tXcgkEZbF6Rm#(4e<5?GS24T#*WOn^Coy=s`njxgN@xNA Db}mk{ diff --git a/Resources/Textures/Objects/Consumable/Drinks/miruvor.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/miruvor.rsi/fill-4.png deleted file mode 100644 index 48544cbf2da6b0054836d292ec10504933cab1f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}D?D8sLn2z= zUfIaoV!*?C;r!B*Tmc5IYzZa&4`hRms+Mw1SXtz>-1=pKz|?qFr=P!mvNjZ-vwW_n zq{Ps$>fG&ZnZ^Igj;>zr!@>A_-*=ZUq8X~QQX{J#|69Cjb6w)eS8)#t_vhuu9^BH< z5z%+|adBhNsoyha&X09)G4K_3VR^kPYLP(%pW)`d#~l*NS!+8Cm7e!Zx%AW~xH0U} mpLs!29WQp)Hx|FsV?VsHE9%R~IqQLLX7F_Nb6Mw<&;$S<4PXNQOGWw~Hw1OfHB>RMs)<-&_QAMOE3oif@3C6< zdhRNV$iuuo&o5suj!rOjaG8_*y&zBF*o}G49L3TKN)pKqE*_eNi#8PSwF;ctweCWc z@^hZGrrUCxw|*;<^IqWfr8@iVqrLOL>kF_v)QdChUmo05WLXOI1cRrmpUXO@geCxl CX=CyL From 85550e45b8011389c9aa290bfe2e48126050e4af Mon Sep 17 00:00:00 2001 From: Den Frae Date: Mon, 14 Oct 2024 00:12:43 +0300 Subject: [PATCH 05/11] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BE=D1=88?= =?UTF-8?q?=D0=B8=D0=B1=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Markers/Spawners/Random/Food_Drinks/drinks_glass.yml | 2 +- .../_LostParadise/Entities/Objects/Fun/ERP/fleshlight.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml index 52592bf5096..d5ddc7993e5 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml @@ -46,7 +46,7 @@ - DrinkFourteenLokoGlass - DrinkGargleBlasterGlass - DrinkLPPCargoGargleBlasterGlass - - DrinkLPPMiruvor + - DrinkLPPMiruvorGlass - DrinkGinFizzGlass - DrinkGinGlass - DrinkGinTonicglass diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Fun/ERP/fleshlight.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Fun/ERP/fleshlight.yml index d7344f4e251..8b66769f094 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Fun/ERP/fleshlight.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Fun/ERP/fleshlight.yml @@ -71,7 +71,7 @@ - type: entity name: pillow pink round id: LPPPillowPinkRound - parent: [BaseItem, BaseFoldable, SeatBase] + parent: BaseItem description: A soft pillow that is comfortable to sit on. components: - type: Sprite @@ -85,7 +85,7 @@ - type: entity name: pillow teal round id: LPPPillowTealRound - parent: [BaseItem, BaseFoldable, SeatBase] + parent: BaseItem description: A soft pillow that is comfortable to sit on. components: - type: Sprite From f2332b6289a94521cbc9f8893253c670f0768fef Mon Sep 17 00:00:00 2001 From: Den Frae Date: Mon, 14 Oct 2024 01:44:12 +0300 Subject: [PATCH 06/11] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BB=D0=BE?= =?UTF-8?q?=D0=BA=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/en-US/reagents/meta/physical-desc.ftl | 2 -- .../prototypes/entities/object/consumable/drinks/drinks.ftl | 4 ++-- Resources/Locale/ru-RU/reagents/meta/physical-desc.ftl | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl index caf7ec4441f..064b21eaa9c 100644 --- a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl @@ -98,6 +98,4 @@ reagent-physical-desc-tropical = tropical reagent-physical-desc-vibrant = vibrant reagent-physical-desc-viscous = viscous reagent-physical-desc-volatile = volatile -reagent-physical-desc-lpp-rich = rich -reagent-physical-desc-lpp-exquisite = exquisite reagent-physical-desc-wormy = wormy diff --git a/Resources/Locale/ru-RU/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl b/Resources/Locale/ru-RU/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl index 1333d9591e7..1535611cd46 100644 --- a/Resources/Locale/ru-RU/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl @@ -1,6 +1,6 @@ ent-DrinkLPPCargoGargleBlasterGlass = { ent-DrinkGlass } - .suffix = cargo gargle blaster + .suffix = Каргонский грызлодёр .desc = { ent-DrinkGlass.desc } ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } - .suffix = miruvor + .suffix = Мирувор .desc = { ent-DrinkGlass.desc } diff --git a/Resources/Locale/ru-RU/reagents/meta/physical-desc.ftl b/Resources/Locale/ru-RU/reagents/meta/physical-desc.ftl index 8b38eb37704..6d57e8a1d2c 100644 --- a/Resources/Locale/ru-RU/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/ru-RU/reagents/meta/physical-desc.ftl @@ -96,6 +96,4 @@ reagent-physical-desc-funny = смешное reagent-physical-desc-alkaline = щелочное reagent-physical-desc-holy = святое reagent-physical-desc-slimy = склизкое -reagent-physical-desc-neural = нейронное -reagent-physical-desc-lpp-rich = rich -reagent-physical-desc-lpp-exquisite = exquisite +reagent-physical-desc-neural = нейронное \ No newline at end of file From 622e6f209ff11932a8f2e328b3ad50f766ac01d6 Mon Sep 17 00:00:00 2001 From: Den Frae Date: Mon, 14 Oct 2024 11:26:29 +0300 Subject: [PATCH 07/11] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D1=82=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/consumable/drinks/drinks.ftl | 6 +-- .../objects/consumable/drinks/drinks.ftl | 6 +-- .../objects/consumable/drinks/drinks.ftl | 8 ++-- .../object/consumable/drinks/drinks.ftl | 8 ++-- .../objects/consumable/drinks/drinks.ftl | 8 ++-- .../Random/Food_Drinks/drinks_glass.yml | 2 +- .../Objects/Consumable/Drinks/drinks.yml | 30 ++++++------- .../_LostParadise/Flavors/flavors.yml | 8 ++-- .../Reagents/Consumable/Drink/alcohol.yml | 44 +++++++++---------- .../Recipes/Reactions/drinks.yml | 32 +++++++------- 10 files changed, 76 insertions(+), 76 deletions(-) diff --git a/Resources/Locale/en-US/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl b/Resources/Locale/en-US/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl index 7dbae317c94..889496e12ce 100644 --- a/Resources/Locale/en-US/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl +++ b/Resources/Locale/en-US/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl @@ -1,6 +1,6 @@ +# ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } +# .suffix = miruvor +# .desc = { ent-DrinkGlass.desc } ent-DrinkLPPCargoGargleBlasterGlass = { ent-DrinkGlass } .suffix = cargo gargle blaster - .desc = { ent-DrinkGlass.desc } -ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } - .suffix = miruvor .desc = { ent-DrinkGlass.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl index 91fd3bfc62f..53c1f999be2 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl @@ -1,6 +1,6 @@ -ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } - .suffix = miruvor - .desc = { ent-DrinkGlass.desc } +# ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } +# .suffix = miruvor +# .desc = { ent-DrinkGlass.desc } ent-DrinkLPPCargoGargleBlasterGlass = { ent-DrinkGlass } .suffix = cargo gargle blaster .desc = { ent-DrinkGlass.desc } diff --git a/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/consumable/drinks/drinks.ftl b/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/consumable/drinks/drinks.ftl index 1535611cd46..7868cb9fa8a 100644 --- a/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/consumable/drinks/drinks.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/consumable/drinks/drinks.ftl @@ -1,6 +1,6 @@ +# ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } +# .suffix = Мирувор +# .desc = { ent-DrinkGlass.desc } ent-DrinkLPPCargoGargleBlasterGlass = { ent-DrinkGlass } .suffix = Каргонский грызлодёр - .desc = { ent-DrinkGlass.desc } -ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } - .suffix = Мирувор - .desc = { ent-DrinkGlass.desc } + .desc = { ent-DrinkGlass.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl b/Resources/Locale/ru-RU/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl index 1535611cd46..7868cb9fa8a 100644 --- a/Resources/Locale/ru-RU/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl @@ -1,6 +1,6 @@ +# ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } +# .suffix = Мирувор +# .desc = { ent-DrinkGlass.desc } ent-DrinkLPPCargoGargleBlasterGlass = { ent-DrinkGlass } .suffix = Каргонский грызлодёр - .desc = { ent-DrinkGlass.desc } -ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } - .suffix = Мирувор - .desc = { ent-DrinkGlass.desc } + .desc = { ent-DrinkGlass.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl index 91fd3bfc62f..b0780d4b0fe 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl @@ -1,6 +1,6 @@ -ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } - .suffix = miruvor - .desc = { ent-DrinkGlass.desc } +# ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } +# .suffix = Мирувор +# .desc = { ent-DrinkGlass.desc } ent-DrinkLPPCargoGargleBlasterGlass = { ent-DrinkGlass } - .suffix = cargo gargle blaster + .suffix = Каргонский грызлодёр .desc = { ent-DrinkGlass.desc } diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml index d5ddc7993e5..af52adb68cd 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml @@ -46,7 +46,7 @@ - DrinkFourteenLokoGlass - DrinkGargleBlasterGlass - DrinkLPPCargoGargleBlasterGlass - - DrinkLPPMiruvorGlass +# - DrinkLPPMiruvorGlass - DrinkGinFizzGlass - DrinkGinGlass - DrinkGinTonicglass diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/Drinks/drinks.yml index a3bedc81aa7..8974d932bc0 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/Drinks/drinks.yml @@ -1,18 +1,18 @@ -- type: entity - parent: DrinkGlass - id: DrinkLPPMiruvorGlass - suffix: miruvor - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: LPPMiruvor - Quantity: 30 - - type: Icon - sprite: _LostParadise/Objects/Consumable/Drinks/miruvor.rsi - state: icon +#- type: entity +# parent: DrinkGlass +# id: DrinkLPPMiruvorGlass +# suffix: miruvor +# components: +# - type: SolutionContainerManager +# solutions: +# drink: +# maxVol: 30 +# reagents: +# - ReagentId: LPPMiruvor +# Quantity: 30 +# - type: Icon +# sprite: _LostParadise/Objects/Consumable/Drinks/miruvor.rsi +# state: icon - type: entity parent: DrinkGlass diff --git a/Resources/Prototypes/_LostParadise/Flavors/flavors.yml b/Resources/Prototypes/_LostParadise/Flavors/flavors.yml index 5e0811df648..5499939f54d 100644 --- a/Resources/Prototypes/_LostParadise/Flavors/flavors.yml +++ b/Resources/Prototypes/_LostParadise/Flavors/flavors.yml @@ -33,7 +33,7 @@ flavorType: Complex description: flavor-complex-lpp-cargo-gargle-blaster -- type: flavor - id: lppmiruvor - flavorType: Complex - description: flavor-complex-lpp-miruvor \ No newline at end of file +#- type: flavor +# id: lppmiruvor +# flavorType: Complex +# description: flavor-complex-lpp-miruvor \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/_LostParadise/Reagents/Consumable/Drink/alcohol.yml index 8f8e2be41eb..165f317df4e 100644 --- a/Resources/Prototypes/_LostParadise/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/_LostParadise/Reagents/Consumable/Drink/alcohol.yml @@ -1,25 +1,25 @@ -- type: reagent - id: LPPMiruvor - name: reagent-name-lpp-miruvor - parent: BaseAlcohol - desc: reagent-desc-lpp-miruvor - physicalDesc: reagent-physical-desc-lpp-exquisite - flavor: lppmiruvor - color: "#fcff54" - metamorphicSprite: - sprite: _LostParadise/Objects/Consumable/Drinks/miruvor.rsi - state: icon_empty - metamorphicMaxFillLevels: 5 - metamorphicFillBaseName: fill- - metamorphicChangeColor: false - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:AdjustReagent - reagent: Ethanol - amount: 0.2 +#- type: reagent +# id: LPPMiruvor +# name: reagent-name-lpp-miruvor +# parent: BaseAlcohol +# desc: reagent-desc-lpp-miruvor +# physicalDesc: reagent-physical-desc-lpp-exquisite +# flavor: lppmiruvor +# color: "#fcff54" +# metamorphicSprite: +# sprite: _LostParadise/Objects/Consumable/Drinks/miruvor.rsi +# state: icon_empty +# metamorphicMaxFillLevels: 5 +# metamorphicFillBaseName: fill- +# metamorphicChangeColor: false +# metabolisms: +# Drink: +# effects: +# - !type:SatiateThirst +# factor: 2 +# - !type:AdjustReagent +# reagent: Ethanol +# amount: 0.2 - type: reagent id: LPPCargoGargleBlaster diff --git a/Resources/Prototypes/_LostParadise/Recipes/Reactions/drinks.yml b/Resources/Prototypes/_LostParadise/Recipes/Reactions/drinks.yml index 311717252af..bffae24f015 100644 --- a/Resources/Prototypes/_LostParadise/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/_LostParadise/Recipes/Reactions/drinks.yml @@ -1,20 +1,20 @@ - type: reaction - id: LPPMiruvor - reactants: - Vodka: - amount: 2 - Grenadine: - amount: 2 - TableSalt: - amount: 1 - JuiceLime: - amount: 1 - JuiceOrange: - amount: 1 - Mead: - amount: 1 - products: - LPPMiruvor: 8 +# id: LPPMiruvor +# reactants: +# Vodka: +# amount: 2 +# Grenadine: +# amount: 2 +# TableSalt: +# amount: 1 +# JuiceLime: +# amount: 1 +# JuiceOrange: +# amount: 1 +# Mead: +# amount: 1 +# products: +# LPPMiruvor: 8 - type: reaction id: LPPCargoGargleBlaster From 36c79f65bf1751eacab3824dd9b692e8ac3b4779 Mon Sep 17 00:00:00 2001 From: Den Frae Date: Mon, 14 Oct 2024 11:37:28 +0300 Subject: [PATCH 08/11] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D1=82=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D0=B0=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../en-US/_LostParadise/flavors/flavor-profiles.ftl | 4 +++- .../reagents/meta/consumable/drink/alcohol.ftl | 4 +++- .../entities/object/consumable/drinks/drinks.ftl | 8 +++++--- .../entities/objects/consumable/drinks/drinks.ftl | 8 +++++--- .../ru-RU/_LostParadise/flavors/flavor-profiles.ftl | 2 ++ .../entities/objects/consumable/drinks/drinks.ftl | 8 +++++--- .../reagents/meta/consumable/drink/alcohol.ftl | 2 ++ .../entities/object/consumable/drinks/drinks.ftl | 8 +++++--- .../entities/objects/consumable/drinks/drinks.ftl | 8 +++++--- 9 files changed, 35 insertions(+), 17 deletions(-) diff --git a/Resources/Locale/en-US/_LostParadise/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_LostParadise/flavors/flavor-profiles.ftl index c6b2643a3b7..6fc55806334 100644 --- a/Resources/Locale/en-US/_LostParadise/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/_LostParadise/flavors/flavor-profiles.ftl @@ -1,2 +1,4 @@ flavor-complex-lpp-cargo-gargle-blaster = like you made a million and started a revolution -flavor-complex-lpp-miruvor = like arrogant \ No newline at end of file +<#-- +flavor-complex-lpp-miruvor = like arrogant +--> \ No newline at end of file diff --git a/Resources/Locale/en-US/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/en-US/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl index acc4f3fe25a..59f2ffd92ed 100644 --- a/Resources/Locale/en-US/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl +++ b/Resources/Locale/en-US/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl @@ -1,5 +1,7 @@ reagent-name-lpp-cargo-gargle-blaster = Cargo Gargle Blaster reagent-desc-lpp-cargo-gargle-blaster = The Emperor's favorite drink. +<#-- reagent-name-lpp-miruvor = Miruvor -reagent-desc-lpp-miruvor = An exquisite drink especially for elves! \ No newline at end of file +reagent-desc-lpp-miruvor = An exquisite drink especially for elves! +--> \ No newline at end of file diff --git a/Resources/Locale/en-US/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl b/Resources/Locale/en-US/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl index 889496e12ce..d64244bb0de 100644 --- a/Resources/Locale/en-US/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl +++ b/Resources/Locale/en-US/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl @@ -1,6 +1,8 @@ -# ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } -# .suffix = miruvor -# .desc = { ent-DrinkGlass.desc } +<#-- +ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } + .suffix = miruvor + .desc = { ent-DrinkGlass.desc } +--> ent-DrinkLPPCargoGargleBlasterGlass = { ent-DrinkGlass } .suffix = cargo gargle blaster .desc = { ent-DrinkGlass.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl index 53c1f999be2..8f2ac3b0dd3 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl @@ -1,6 +1,8 @@ -# ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } -# .suffix = miruvor -# .desc = { ent-DrinkGlass.desc } +<#-- +ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } + .suffix = miruvor + .desc = { ent-DrinkGlass.desc } +--> ent-DrinkLPPCargoGargleBlasterGlass = { ent-DrinkGlass } .suffix = cargo gargle blaster .desc = { ent-DrinkGlass.desc } diff --git a/Resources/Locale/ru-RU/_LostParadise/flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/_LostParadise/flavors/flavor-profiles.ftl index eaf4334b9bf..ad038b6e7e1 100644 --- a/Resources/Locale/ru-RU/_LostParadise/flavors/flavor-profiles.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/flavors/flavor-profiles.ftl @@ -1,2 +1,4 @@ flavor-complex-lpp-cargo-gargle-blaster = как будто вы заработали миллион и подняли революцию +<#-- flavor-complex-lpp-miruvor = как высокомерие +--> diff --git a/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/consumable/drinks/drinks.ftl b/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/consumable/drinks/drinks.ftl index 7868cb9fa8a..2921c335c09 100644 --- a/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/consumable/drinks/drinks.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/consumable/drinks/drinks.ftl @@ -1,6 +1,8 @@ -# ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } -# .suffix = Мирувор -# .desc = { ent-DrinkGlass.desc } +<#-- +ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } + .suffix = Мирувор + .desc = { ent-DrinkGlass.desc } +--> ent-DrinkLPPCargoGargleBlasterGlass = { ent-DrinkGlass } .suffix = Каргонский грызлодёр .desc = { ent-DrinkGlass.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/ru-RU/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl index ecab61f7af3..bf10b5fdf8c 100644 --- a/Resources/Locale/ru-RU/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl @@ -1,4 +1,6 @@ reagent-name-lpp-cargo-gargle-blaster = каргонский грызлодёр reagent-desc-lpp-cargo-gargle-blaster = Любимый напиток императора. +<#-- reagent-name-lpp-miruvor = мирувор reagent-desc-lpp-miruvor = Изысканный напиток специально для эльфов! +--> diff --git a/Resources/Locale/ru-RU/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl b/Resources/Locale/ru-RU/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl index 7868cb9fa8a..2921c335c09 100644 --- a/Resources/Locale/ru-RU/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl @@ -1,6 +1,8 @@ -# ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } -# .suffix = Мирувор -# .desc = { ent-DrinkGlass.desc } +<#-- +ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } + .suffix = Мирувор + .desc = { ent-DrinkGlass.desc } +--> ent-DrinkLPPCargoGargleBlasterGlass = { ent-DrinkGlass } .suffix = Каргонский грызлодёр .desc = { ent-DrinkGlass.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl index b0780d4b0fe..52a1278af07 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl @@ -1,6 +1,8 @@ -# ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } -# .suffix = Мирувор -# .desc = { ent-DrinkGlass.desc } +<#-- +ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } + .suffix = Мирувор + .desc = { ent-DrinkGlass.desc } +--> ent-DrinkLPPCargoGargleBlasterGlass = { ent-DrinkGlass } .suffix = Каргонский грызлодёр .desc = { ent-DrinkGlass.desc } From 2506a56b5307bf0efad343c0f0eb01d726511bac Mon Sep 17 00:00:00 2001 From: Den Frae Date: Mon, 14 Oct 2024 11:46:21 +0300 Subject: [PATCH 09/11] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D1=82=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D0=B0=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_LostParadise/flavors/flavor-profiles.ftl | 4 -- .../meta/consumable/drink/alcohol.ftl | 7 --- .../object/consumable/drinks/drinks.ftl | 8 ---- .../objects/consumable/drinks/drinks.ftl | 8 ---- .../_LostParadise/flavors/flavor-profiles.ftl | 4 -- .../objects/consumable/drinks/drinks.ftl | 8 ---- .../meta/consumable/drink/alcohol.ftl | 6 --- .../object/consumable/drinks/drinks.ftl | 8 ---- .../objects/consumable/drinks/drinks.ftl | 8 ---- .../Random/Food_Drinks/drinks_glass.yml | 2 - .../Objects/Consumable/Drinks/drinks.yml | 31 ------------- .../_LostParadise/Flavors/flavors.yml | 12 +---- .../Reagents/Consumable/Drink/alcohol.yml | 45 ------------------- .../Recipes/Reactions/drinks.yml | 33 -------------- 14 files changed, 1 insertion(+), 183 deletions(-) diff --git a/Resources/Locale/en-US/_LostParadise/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_LostParadise/flavors/flavor-profiles.ftl index 6fc55806334..e69de29bb2d 100644 --- a/Resources/Locale/en-US/_LostParadise/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/_LostParadise/flavors/flavor-profiles.ftl @@ -1,4 +0,0 @@ -flavor-complex-lpp-cargo-gargle-blaster = like you made a million and started a revolution -<#-- -flavor-complex-lpp-miruvor = like arrogant ---> \ No newline at end of file diff --git a/Resources/Locale/en-US/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/en-US/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl index 59f2ffd92ed..e69de29bb2d 100644 --- a/Resources/Locale/en-US/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl +++ b/Resources/Locale/en-US/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl @@ -1,7 +0,0 @@ -reagent-name-lpp-cargo-gargle-blaster = Cargo Gargle Blaster -reagent-desc-lpp-cargo-gargle-blaster = The Emperor's favorite drink. - -<#-- -reagent-name-lpp-miruvor = Miruvor -reagent-desc-lpp-miruvor = An exquisite drink especially for elves! ---> \ No newline at end of file diff --git a/Resources/Locale/en-US/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl b/Resources/Locale/en-US/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl index d64244bb0de..e69de29bb2d 100644 --- a/Resources/Locale/en-US/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl +++ b/Resources/Locale/en-US/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl @@ -1,8 +0,0 @@ -<#-- -ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } - .suffix = miruvor - .desc = { ent-DrinkGlass.desc } ---> -ent-DrinkLPPCargoGargleBlasterGlass = { ent-DrinkGlass } - .suffix = cargo gargle blaster - .desc = { ent-DrinkGlass.desc } \ No newline at end of file diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl index 8f2ac3b0dd3..e69de29bb2d 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl @@ -1,8 +0,0 @@ -<#-- -ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } - .suffix = miruvor - .desc = { ent-DrinkGlass.desc } ---> -ent-DrinkLPPCargoGargleBlasterGlass = { ent-DrinkGlass } - .suffix = cargo gargle blaster - .desc = { ent-DrinkGlass.desc } diff --git a/Resources/Locale/ru-RU/_LostParadise/flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/_LostParadise/flavors/flavor-profiles.ftl index ad038b6e7e1..e69de29bb2d 100644 --- a/Resources/Locale/ru-RU/_LostParadise/flavors/flavor-profiles.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/flavors/flavor-profiles.ftl @@ -1,4 +0,0 @@ -flavor-complex-lpp-cargo-gargle-blaster = как будто вы заработали миллион и подняли революцию -<#-- -flavor-complex-lpp-miruvor = как высокомерие ---> diff --git a/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/consumable/drinks/drinks.ftl b/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/consumable/drinks/drinks.ftl index 2921c335c09..e69de29bb2d 100644 --- a/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/consumable/drinks/drinks.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/consumable/drinks/drinks.ftl @@ -1,8 +0,0 @@ -<#-- -ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } - .suffix = Мирувор - .desc = { ent-DrinkGlass.desc } ---> -ent-DrinkLPPCargoGargleBlasterGlass = { ent-DrinkGlass } - .suffix = Каргонский грызлодёр - .desc = { ent-DrinkGlass.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/ru-RU/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl index bf10b5fdf8c..e69de29bb2d 100644 --- a/Resources/Locale/ru-RU/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl @@ -1,6 +0,0 @@ -reagent-name-lpp-cargo-gargle-blaster = каргонский грызлодёр -reagent-desc-lpp-cargo-gargle-blaster = Любимый напиток императора. -<#-- -reagent-name-lpp-miruvor = мирувор -reagent-desc-lpp-miruvor = Изысканный напиток специально для эльфов! ---> diff --git a/Resources/Locale/ru-RU/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl b/Resources/Locale/ru-RU/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl index 2921c335c09..e69de29bb2d 100644 --- a/Resources/Locale/ru-RU/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl @@ -1,8 +0,0 @@ -<#-- -ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } - .suffix = Мирувор - .desc = { ent-DrinkGlass.desc } ---> -ent-DrinkLPPCargoGargleBlasterGlass = { ent-DrinkGlass } - .suffix = Каргонский грызлодёр - .desc = { ent-DrinkGlass.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl index 52a1278af07..e69de29bb2d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl @@ -1,8 +0,0 @@ -<#-- -ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } - .suffix = Мирувор - .desc = { ent-DrinkGlass.desc } ---> -ent-DrinkLPPCargoGargleBlasterGlass = { ent-DrinkGlass } - .suffix = Каргонский грызлодёр - .desc = { ent-DrinkGlass.desc } diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml index af52adb68cd..ff9e5124328 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml @@ -45,8 +45,6 @@ - DrinkErikaSurprise - DrinkFourteenLokoGlass - DrinkGargleBlasterGlass - - DrinkLPPCargoGargleBlasterGlass -# - DrinkLPPMiruvorGlass - DrinkGinFizzGlass - DrinkGinGlass - DrinkGinTonicglass diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/Drinks/drinks.yml index 8974d932bc0..e69de29bb2d 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/Drinks/drinks.yml @@ -1,31 +0,0 @@ -#- type: entity -# parent: DrinkGlass -# id: DrinkLPPMiruvorGlass -# suffix: miruvor -# components: -# - type: SolutionContainerManager -# solutions: -# drink: -# maxVol: 30 -# reagents: -# - ReagentId: LPPMiruvor -# Quantity: 30 -# - type: Icon -# sprite: _LostParadise/Objects/Consumable/Drinks/miruvor.rsi -# state: icon - -- type: entity - parent: DrinkGlass - id: DrinkLPPCargoGargleBlasterGlass - suffix: cargo gargle blaster - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: LPPCargoGargleBlaster - Quantity: 30 - - type: Icon - sprite: Objects/Consumable/Drinks/gargleblasterglass.rsi - state: icon \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Flavors/flavors.yml b/Resources/Prototypes/_LostParadise/Flavors/flavors.yml index 5499939f54d..3e3a446c6a8 100644 --- a/Resources/Prototypes/_LostParadise/Flavors/flavors.yml +++ b/Resources/Prototypes/_LostParadise/Flavors/flavors.yml @@ -26,14 +26,4 @@ - type: flavor id: flowertea flavorType: Complex - description: flavor-complex-flower-tea - -- type: flavor - id: lppcargogargleblaster - flavorType: Complex - description: flavor-complex-lpp-cargo-gargle-blaster - -#- type: flavor -# id: lppmiruvor -# flavorType: Complex -# description: flavor-complex-lpp-miruvor \ No newline at end of file + description: flavor-complex-flower-tea \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/_LostParadise/Reagents/Consumable/Drink/alcohol.yml index 165f317df4e..e69de29bb2d 100644 --- a/Resources/Prototypes/_LostParadise/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/_LostParadise/Reagents/Consumable/Drink/alcohol.yml @@ -1,45 +0,0 @@ -#- type: reagent -# id: LPPMiruvor -# name: reagent-name-lpp-miruvor -# parent: BaseAlcohol -# desc: reagent-desc-lpp-miruvor -# physicalDesc: reagent-physical-desc-lpp-exquisite -# flavor: lppmiruvor -# color: "#fcff54" -# metamorphicSprite: -# sprite: _LostParadise/Objects/Consumable/Drinks/miruvor.rsi -# state: icon_empty -# metamorphicMaxFillLevels: 5 -# metamorphicFillBaseName: fill- -# metamorphicChangeColor: false -# metabolisms: -# Drink: -# effects: -# - !type:SatiateThirst -# factor: 2 -# - !type:AdjustReagent -# reagent: Ethanol -# amount: 0.2 - -- type: reagent - id: LPPCargoGargleBlaster - name: reagent-name-lpp-cargo-gargle-blaster - parent: BaseAlcohol - desc: reagent-desc-lpp-cargo-gargle-blaster - physicalDesc: reagent-physical-desc-lpp-rich - flavor: lppcargogargleblaster - color: "#9cc8b4" - metamorphicSprite: - sprite: Objects/Consumable/Drinks/gargleblasterglass.rsi - state: icon_empty - metamorphicMaxFillLevels: 5 - metamorphicFillBaseName: fill- - metamorphicChangeColor: false - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:AdjustReagent - reagent: Ethanol - amount: 0.4 \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Recipes/Reactions/drinks.yml b/Resources/Prototypes/_LostParadise/Recipes/Reactions/drinks.yml index bffae24f015..e69de29bb2d 100644 --- a/Resources/Prototypes/_LostParadise/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/_LostParadise/Recipes/Reactions/drinks.yml @@ -1,33 +0,0 @@ -- type: reaction -# id: LPPMiruvor -# reactants: -# Vodka: -# amount: 2 -# Grenadine: -# amount: 2 -# TableSalt: -# amount: 1 -# JuiceLime: -# amount: 1 -# JuiceOrange: -# amount: 1 -# Mead: -# amount: 1 -# products: -# LPPMiruvor: 8 - -- type: reaction - id: LPPCargoGargleBlaster - reactants: - Moonshine: - amount: 2 - Mead: - amount: 1 - Kvass: - amount: 1 - JuiceLemon: - amount: 1 - Gold: - amount: 1 - products: - LPPCargoGargleBlaster: 6 \ No newline at end of file From 1e0c24d33508bb8cbade0ae31aac8bfafaf09672 Mon Sep 17 00:00:00 2001 From: Den Frae Date: Mon, 14 Oct 2024 12:09:22 +0300 Subject: [PATCH 10/11] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D1=82=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D0=B0=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_LostParadise/flavors/flavor-profiles.ftl | 2 + .../meta/consumable/drink/alcohol.ftl | 5 +++ .../object/consumable/drinks/drinks.ftl | 0 .../objects/consumable/drinks/drinks.ftl | 0 .../_LostParadise/flavors/flavor-profiles.ftl | 2 + .../objects/consumable/drinks/drinks.ftl | 6 +++ .../meta/consumable/drink/alcohol.ftl | 4 ++ .../object/consumable/drinks/drinks.ftl | 0 .../objects/consumable/drinks/drinks.ftl | 0 .../consumable/drinks/drinks_bottles.ftl | 16 ------- .../Objects/Consumable/Drinks/drinks.yml | 31 +++++++++++++ .../_LostParadise/Flavors/flavors.yml | 12 ++++- .../Reagents/Consumable/Drink/alcohol.yml | 45 +++++++++++++++++++ .../Recipes/Reactions/drinks.yml | 33 ++++++++++++++ 14 files changed, 139 insertions(+), 17 deletions(-) delete mode 100644 Resources/Locale/en-US/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl delete mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl delete mode 100644 Resources/Locale/ru-RU/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl delete mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks_bottles.ftl diff --git a/Resources/Locale/en-US/_LostParadise/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_LostParadise/flavors/flavor-profiles.ftl index e69de29bb2d..c6b2643a3b7 100644 --- a/Resources/Locale/en-US/_LostParadise/flavors/flavor-profiles.ftl +++ b/Resources/Locale/en-US/_LostParadise/flavors/flavor-profiles.ftl @@ -0,0 +1,2 @@ +flavor-complex-lpp-cargo-gargle-blaster = like you made a million and started a revolution +flavor-complex-lpp-miruvor = like arrogant \ No newline at end of file diff --git a/Resources/Locale/en-US/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/en-US/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl index e69de29bb2d..ad9027d8af8 100644 --- a/Resources/Locale/en-US/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl +++ b/Resources/Locale/en-US/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl @@ -0,0 +1,5 @@ +reagent-name-lpp-cargo-gargle-blaster = Cargo Gargle Blaster +reagent-desc-lpp-cargo-gargle-blaster = The Emperor's favorite drink. + +reagent-name-lpp-miruvor = Miruvor +reagent-desc-lpp-miruvor = An exquisite drink especially for elves! \ No newline at end of file diff --git a/Resources/Locale/en-US/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl b/Resources/Locale/en-US/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/Resources/Locale/ru-RU/_LostParadise/flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/_LostParadise/flavors/flavor-profiles.ftl index e69de29bb2d..eaf4334b9bf 100644 --- a/Resources/Locale/ru-RU/_LostParadise/flavors/flavor-profiles.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/flavors/flavor-profiles.ftl @@ -0,0 +1,2 @@ +flavor-complex-lpp-cargo-gargle-blaster = как будто вы заработали миллион и подняли революцию +flavor-complex-lpp-miruvor = как высокомерие diff --git a/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/consumable/drinks/drinks.ftl b/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/consumable/drinks/drinks.ftl index e69de29bb2d..62f6663ff8b 100644 --- a/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/consumable/drinks/drinks.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/prototypes/entities/objects/consumable/drinks/drinks.ftl @@ -0,0 +1,6 @@ +ent-DrinkLPPMiruvorGlass = { ent-DrinkGlass } + .suffix = Мирувор + .desc = { ent-DrinkGlass.desc } +ent-DrinkLPPCargoGargleBlasterGlass = { ent-DrinkGlass } + .suffix = Каргонский грызлодёр + .desc = { ent-DrinkGlass.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/ru-RU/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl index e69de29bb2d..ecab61f7af3 100644 --- a/Resources/Locale/ru-RU/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/reagents/meta/consumable/drink/alcohol.ftl @@ -0,0 +1,4 @@ +reagent-name-lpp-cargo-gargle-blaster = каргонский грызлодёр +reagent-desc-lpp-cargo-gargle-blaster = Любимый напиток императора. +reagent-name-lpp-miruvor = мирувор +reagent-desc-lpp-miruvor = Изысканный напиток специально для эльфов! diff --git a/Resources/Locale/ru-RU/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl b/Resources/Locale/ru-RU/_LostParadise/ss14-ru/prototypes/entities/object/consumable/drinks/drinks.ftl deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks.ftl deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks_bottles.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks_bottles.ftl deleted file mode 100644 index 47753797f65..00000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/drinks/drinks_bottles.ftl +++ /dev/null @@ -1,16 +0,0 @@ -ent-LPPDrinkCamomileTeaBottleFull = бутылка ромашкового чая - .desc = Бутылка ромашкового чая, идеялен для ваших шальных нервов. -ent-LPPDrinkMintTeaBottleFull = бутылка мятного чая - .desc = Бутылка освежающего мятного чая, просто посмотрев на него вам становиться прохладно. -ent-LPPDrinkGingerTeaBottleFull = бутылка имбирного чая - .desc = Бутылка имбирного чая, идеален для согревания души. -ent-LPPDrinkBerryTeaBottleFull = бутылка ягодного чая - .desc = Бутылка ягодного чая с богатым вкусом летних ягод. -ent-LPPDrinkOrangeTeaBottleFull = бутылка апельсинового чая - .desc = Бутылка апельсинового чая обладающего цитрусовой свежестью. -ent-LPPDrinkFlowerTeaBottleFull = бутылка цветочного чая - .desc = Бутылка цветочного чая с тонкими, нежными нотками цветов. -ent-LPPDrinkTeaBottleFull = бутылка чая - .desc = Бутылка с обычным чаем, ничего необычного. -ent-LPPDrinkGreenTeaBottleFull = бутылка зелёного чая - .desc = Бутылка с зелёным чаем, так же ничего необычного. diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/Drinks/drinks.yml index e69de29bb2d..a3bedc81aa7 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/Drinks/drinks.yml @@ -0,0 +1,31 @@ +- type: entity + parent: DrinkGlass + id: DrinkLPPMiruvorGlass + suffix: miruvor + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: LPPMiruvor + Quantity: 30 + - type: Icon + sprite: _LostParadise/Objects/Consumable/Drinks/miruvor.rsi + state: icon + +- type: entity + parent: DrinkGlass + id: DrinkLPPCargoGargleBlasterGlass + suffix: cargo gargle blaster + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: LPPCargoGargleBlaster + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/gargleblasterglass.rsi + state: icon \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Flavors/flavors.yml b/Resources/Prototypes/_LostParadise/Flavors/flavors.yml index 3e3a446c6a8..5e0811df648 100644 --- a/Resources/Prototypes/_LostParadise/Flavors/flavors.yml +++ b/Resources/Prototypes/_LostParadise/Flavors/flavors.yml @@ -26,4 +26,14 @@ - type: flavor id: flowertea flavorType: Complex - description: flavor-complex-flower-tea \ No newline at end of file + description: flavor-complex-flower-tea + +- type: flavor + id: lppcargogargleblaster + flavorType: Complex + description: flavor-complex-lpp-cargo-gargle-blaster + +- type: flavor + id: lppmiruvor + flavorType: Complex + description: flavor-complex-lpp-miruvor \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/_LostParadise/Reagents/Consumable/Drink/alcohol.yml index e69de29bb2d..8f8e2be41eb 100644 --- a/Resources/Prototypes/_LostParadise/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/_LostParadise/Reagents/Consumable/Drink/alcohol.yml @@ -0,0 +1,45 @@ +- type: reagent + id: LPPMiruvor + name: reagent-name-lpp-miruvor + parent: BaseAlcohol + desc: reagent-desc-lpp-miruvor + physicalDesc: reagent-physical-desc-lpp-exquisite + flavor: lppmiruvor + color: "#fcff54" + metamorphicSprite: + sprite: _LostParadise/Objects/Consumable/Drinks/miruvor.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.2 + +- type: reagent + id: LPPCargoGargleBlaster + name: reagent-name-lpp-cargo-gargle-blaster + parent: BaseAlcohol + desc: reagent-desc-lpp-cargo-gargle-blaster + physicalDesc: reagent-physical-desc-lpp-rich + flavor: lppcargogargleblaster + color: "#9cc8b4" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/gargleblasterglass.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.4 \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Recipes/Reactions/drinks.yml b/Resources/Prototypes/_LostParadise/Recipes/Reactions/drinks.yml index e69de29bb2d..311717252af 100644 --- a/Resources/Prototypes/_LostParadise/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/_LostParadise/Recipes/Reactions/drinks.yml @@ -0,0 +1,33 @@ +- type: reaction + id: LPPMiruvor + reactants: + Vodka: + amount: 2 + Grenadine: + amount: 2 + TableSalt: + amount: 1 + JuiceLime: + amount: 1 + JuiceOrange: + amount: 1 + Mead: + amount: 1 + products: + LPPMiruvor: 8 + +- type: reaction + id: LPPCargoGargleBlaster + reactants: + Moonshine: + amount: 2 + Mead: + amount: 1 + Kvass: + amount: 1 + JuiceLemon: + amount: 1 + Gold: + amount: 1 + products: + LPPCargoGargleBlaster: 6 \ No newline at end of file From 9daf84d6616d374b3891dd52538af9e73a4ab3e7 Mon Sep 17 00:00:00 2001 From: Den Frae Date: Mon, 14 Oct 2024 12:24:18 +0300 Subject: [PATCH 11/11] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D1=82=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D0=B0=205?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/_LostParadise/Recipes/Reactions/drinks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_LostParadise/Recipes/Reactions/drinks.yml b/Resources/Prototypes/_LostParadise/Recipes/Reactions/drinks.yml index 311717252af..a4ec13fd3c0 100644 --- a/Resources/Prototypes/_LostParadise/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/_LostParadise/Recipes/Reactions/drinks.yml @@ -1,7 +1,7 @@ - type: reaction id: LPPMiruvor reactants: - Vodka: + Moonshine: amount: 2 Grenadine: amount: 2