diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml
index 4d49ab26ab..9fd56c6593 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml
@@ -4,7 +4,10 @@
   animationDuration: 0.5
   spriteName: snack
   startingInventory:
-    FoodSnackRaisins: 2
-    FoodSnackChocolate: 2
-    FoodSnackPopcorn: 2
-    FoodSnackSyndi: 2
+    FoodSnackRaisins: 3
+    FoodSnackChocolate: 3
+    FoodSnackPopcorn: 3
+    FoodSnackSyndi: 3
+    DrinkRamen: 3
+    DrinkHellRamen: 2
+
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
index 52e62f661a..d1be02ec8d 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
@@ -861,16 +861,6 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/grogglass.rsi
 
-- type: entity
-  parent: DrinkGlassBase
-  id: DrinkHell
-  name: hell ramen
-  description: The noodles are boiled, the flavors are artificial, just like being back in school.
-  components:
-  - type: Drink
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/hell.rsi
-
 - type: entity
   parent: DrinkGlassBase
   id: DrinkHippiesDelightGlass
@@ -1423,16 +1413,6 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/pwineglass.rsi
 
-- type: entity
-  parent: DrinkGlassBase
-  id: DrinkRamen
-  name: cup ramen
-  description: Just add 10ml water, self heats! A taste that reminds you of your school years.
-  components:
-  - type: Drink
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/ramen.rsi
-
 - type: entity
   parent: DrinkGlassBase
   id: DrinkRedMeadGlass
@@ -2108,3 +2088,37 @@
   - type: Drink
   - type: Sprite
     sprite: Objects/Consumable/Drinks/shake-white.rsi
+
+- type: entity
+  parent: DrinkGlassBase
+  id: DrinkRamen
+  name: cup ramen
+  description: Just add 10ml water, self heats! A taste that reminds you of your school years
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 50
+        reagents:
+        - ReagentId: DryRamen
+          Quantity: 30
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/ramen.rsi
+
+- type: entity
+  parent: DrinkGlassBase
+  id: DrinkHellRamen
+  name: hell ramen
+  description: Just add 10ml water, self heats! Super spicy flavor.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 50
+        reagents:
+        - ReagentId: DryRamen
+          Quantity: 30
+        - ReagentId: CapsaicinOil
+          Quantity: 5
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/ramen.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/sink.yml b/Resources/Prototypes/Entities/Structures/Furniture/sink.yml
new file mode 100644
index 0000000000..04ebfaef54
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Furniture/sink.yml
@@ -0,0 +1,44 @@
+- type: entity
+  name: sink
+  id: SinkEmpty
+  suffix: Empty
+  description: The faucets have been tightened to the maximum possible torque but are still known to drip.
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Sprite
+    sprite: Structures/Furniture/sink.rsi
+    state: sink
+    netsync: false
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        maxVol: 500
+  - type: DrainableSolution
+    solution: tank
+  - type: ReagentTank
+
+- type: entity
+  name: sink
+  id: Sink
+  parent: SinkEmpty
+  suffix: Water
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+        - ReagentId: Water
+          Quantity: 500
+
+- type: entity
+  name: wide sink
+  id: SinkWide
+  parent: Sink
+  components:
+  - type: Sprite
+    sprite: Structures/Furniture/sink.rsi
+    state: sink_wide
+    netsync: false
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
index 0457ae11e2..75ad7da4b1 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
@@ -237,3 +237,29 @@
   plantMetabolism:
   - !type:PlantAdjustWater
     amount: 1
+
+- type: reagent
+  id: DryRamen
+  name: dry ramen
+  parent: BaseDrink
+  desc: Dry noodles and salt.
+  physicalDesc: wormy
+  color: "#664300"
+  metabolisms:
+    Food:
+      effects:
+      - !type:SatiateHunger
+        factor: 1
+
+- type: reagent
+  id: HotRamen
+  name: hot ramen
+  parent: BaseDrink
+  desc: Hot noodles.
+  physicalDesc: wormy
+  color: "#664300"
+  metabolisms:
+    Food:
+      effects:
+      - !type:SatiateHunger
+        factor: 4
diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml
index e0cb384bca..035c8b35e0 100644
--- a/Resources/Prototypes/Recipes/Reactions/drinks.yml
+++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml
@@ -551,3 +551,13 @@
       amount: 1
   products:
     WhiteRussian: 3
+
+- type: reaction
+  id: HotRamen
+  reactants:
+    DryRamen:
+      amount: 3
+    Water:
+      amount: 1
+  products:
+    HotRamen: 3
diff --git a/Resources/Textures/Structures/Furniture/sink.rsi/meta.json b/Resources/Textures/Structures/Furniture/sink.rsi/meta.json
new file mode 100644
index 0000000000..af45b1d4ad
--- /dev/null
+++ b/Resources/Textures/Structures/Furniture/sink.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/commit/f01afc7edd39b28dd718407d5bbfca3a5dfe995f#diff-378d1b8f0f0a73185e7c82e4ccfdb65102561992a7abb306090ce851f8419780",
+    "states": [
+        {
+            "name": "sink",
+            "directions": 4
+        },
+        {
+            "name": "sink_wide",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Structures/Furniture/sink.rsi/sink.png b/Resources/Textures/Structures/Furniture/sink.rsi/sink.png
new file mode 100644
index 0000000000..3f29fc996b
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/sink.rsi/sink.png differ
diff --git a/Resources/Textures/Structures/Furniture/sink.rsi/sink_wide.png b/Resources/Textures/Structures/Furniture/sink.rsi/sink_wide.png
new file mode 100644
index 0000000000..80ce7e054e
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/sink.rsi/sink_wide.png differ