diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml index 6a109fbf8e4..c6ac45a5abe 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml @@ -197,6 +197,7 @@ contents: - id: DrinkCoffeeJug - id: DrinkColaBottleFull + - id: DrinkTarragonBottleFull - id: DrinkCreamCartonXL - id: DrinkDrGibbJug - id: DrinkEnergyDrinkJug diff --git a/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml b/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml index 4689e26f8e6..d7f3b36d696 100644 --- a/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml +++ b/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml @@ -4,6 +4,7 @@ - DrinkCoconutWaterJug - DrinkCoffeeJug - DrinkColaBottleFull + - DrinkTarragonBottleFull - DrinkCreamCartonXL - DrinkDrGibbJug - DrinkEnergyDrinkJug diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml index dcbd230804f..873c1507307 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml @@ -19,6 +19,7 @@ DrinkCognacBottleFull: 4 DrinkCoconutWaterCarton: 3 DrinkColaBottleFull: 4 + DrinkTarragonBottleFull: 3 DrinkEnergyDrinkCan: 8 DrinkMilkCarton: 2 DrinkCreamCarton: 5 diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Drinks/drinks_bottles.yml index a60039f4bd5..dfd66dcb225 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Drinks/drinks_bottles.yml @@ -15,4 +15,22 @@ - type: SolutionContainerVisuals maxFillLevels: 10 fillBaseName: fill- + - type: Sealable + +- type: entity + parent: DrinkColaBottleFull + id: DrinkTarragonBottleFull + name: Бутылка космического тархуна + description: Безалкогольный напиток... хотя кому надо описание? + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: Tarragon + Quantity: 100 + - type: Label + currentLabel: тархун + - type: Sprite + sprite: Objects/Consumable/Drinks/space-up_bottle.rsi - type: Sealable \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Corvax/Reagents/Consumable/Drink/soda.yml new file mode 100644 index 00000000000..76c5a3bac4a --- /dev/null +++ b/Resources/Prototypes/Corvax/Reagents/Consumable/Drink/soda.yml @@ -0,0 +1,24 @@ +- type: reagent + id: Tarragon + name: reagent-name-tarragon + parent: Cola + desc: reagent-desc-cola + physicalDesc: reagent-physical-desc-tarragon + flavor: reagent-name-tarragon + color: "#99bb43" + recognizable: true + metamorphicSprite: + sprite: Objects/Consumable/Drinks/colaglass.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 3 + - !type:GenericStatusEffect + key: Drowsiness + time: 1.0 + type: Remove \ No newline at end of file