diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl
index f1b00cdf1c..09099d96fa 100644
--- a/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl
@@ -72,3 +72,6 @@ reagent-desc-hot-ramen = Hot noodles.
 
 reagent-name-pilk = pilk
 reagent-desc-pilk = A sickening mixture of milk and cola.
+
+reagent-name-kvass = kvass
+reagent-desc-kvass = A cool refreshing drink with a taste of socialism.
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml
index 23b3ee55ad..0527f852dc 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml
@@ -33,4 +33,16 @@
   cost: 5000
   category: Food
   group: market
-  
+
+- type: cargoProduct
+  name: kvass tank crate
+  id: FoodCrateKvassTank
+  description: A tank with refreshing kvass, which helps so much in the heat.
+  icon:
+    sprite: Structures/Storage/kvass.rsi
+    state: kvass
+  product: CrateFoodKvassTank
+  cost: 2000
+  category: Food
+  group: market
+
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/Catalog/Fills/Crates/food.yml
index 85ce07d8d3..681881fc8e 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/food.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/food.yml
@@ -44,3 +44,13 @@
       amount: 3
     - id: KitchenKnife
       amount: 1
+
+- type: entity
+  id: CrateFoodKvassTank
+  name:  kvass tank crate
+  parent: CrateGenericSteel
+  components:
+    - type: StorageFill
+      contents:
+        - id: KvassTankFull
+          amount: 1
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
index 6b952d07a2..98e4e50432 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -2117,3 +2117,18 @@
         - ReagentId: CapsaicinOil
           Quantity: 5
 
+- type: entity
+  parent: DrinkGlassBase
+  id: DrinkKvassGlass
+  name: kvass glass
+  description: A cool refreshing drink with a taste of socialism.
+  components:
+    - type: SolutionContainerManager
+      solutions:
+        drink:
+          maxVol: 50
+          reagents:
+            - ReagentId: Kvass
+              Quantity: 50
+    - type: Sprite
+      sprite: Objects/Consumable/Drinks/kvass.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
index fa93ce6671..caf618c3c9 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
@@ -107,3 +107,26 @@
   - type: ReagentTank
     transferAmount: 100
 
+# Kvass
+- type: entity
+  id: KvassTank
+  parent: StorageTank
+  name: КВАС
+  suffix: Empty
+  description: A cool refreshing drink with a taste of socialism.
+  components:
+    - type: Sprite
+      sprite: Structures/Storage/kvass.rsi
+      state: kvass
+
+- type: entity
+  parent: KvassTank
+  id: KvassTankFull
+  suffix: Full
+  components:
+    - type: SolutionContainerManager
+      solutions:
+        tank:
+          reagents:
+            - ReagentId: Kvass
+              Quantity: 1500
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
index f082374c99..9415d67a75 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
@@ -317,3 +317,12 @@
   physicalDesc: strong-smelling
   color: "#485000"
   spritePath: rewriter.rsi
+
+- type: reagent
+  id: Kvass
+  name: reagent-name-kvass
+  parent: BaseDrink
+  desc: reagent-desc-kvass
+  physicalDesc: reagent-physical-desc-bubbly
+  color: "#381600"
+  spritePath: kvass.rsi
diff --git a/Resources/Textures/Objects/Consumable/Drinks/kvass.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/kvass.rsi/icon.png
new file mode 100644
index 0000000000..58a6f21576
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/kvass.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/kvass.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/kvass.rsi/meta.json
new file mode 100644
index 0000000000..2bfce91938
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/kvass.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/TauCetiStation/TauCetiClassic/commit/c449d65dff642f44f3e0d8a312f70aec43ab2eae", "states": [{"name": "icon"}]}
diff --git a/Resources/Textures/Structures/Storage/kvass.rsi/kvass.png b/Resources/Textures/Structures/Storage/kvass.rsi/kvass.png
new file mode 100644
index 0000000000..9053f51e96
Binary files /dev/null and b/Resources/Textures/Structures/Storage/kvass.rsi/kvass.png differ
diff --git a/Resources/Textures/Structures/Storage/kvass.rsi/meta.json b/Resources/Textures/Structures/Storage/kvass.rsi/meta.json
new file mode 100644
index 0000000000..52432bc6e2
--- /dev/null
+++ b/Resources/Textures/Structures/Storage/kvass.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/TauCetiStation/TauCetiClassic/commit/c449d65dff642f44f3e0d8a312f70aec43ab2eae",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "kvass"
+    }
+ ]
+}