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