3 files changed, 22 insertions, 3 deletions

diff --git a/data/items.yaml b/data/items.yaml
index 936f498a..d1958937 100644
--- a/data/items.yaml
+++ b/data/items.yaml
@@ -47,9 +47,12 @@
 - glass:
   - traits:
     - container
-    - glass
-  - contains:
-    - liquid
+    - cup
+    - empty-cup
+- water:
+  - traits:
+    - container
+    - cup
 - plate:
   - traits:
     - container
diff --git a/data/recipes.yaml b/data/recipes.yaml
index 19a28301..c35bee30 100644
--- a/data/recipes.yaml
+++ b/data/recipes.yaml
@@ -61,6 +61,18 @@
   action: instant
   duration: 0
 
+# cups
+- tile: watercooler
+  inputs: [glass]
+  outputs: [water]
+  action: wait
+  duration: 2
+- tile: sink
+  inputs: [water]
+  outputs: [glass]
+  action: instant
+  duration: 0
+
 # cleaning
 - tile: sink
   inputs: [dirty-glass]
diff --git a/data/tiles.yaml b/data/tiles.yaml
index 2e1f757d..078a6f29 100644
--- a/data/tiles.yaml
+++ b/data/tiles.yaml
@@ -1,5 +1,8 @@
 # kitchen

 - counter

+- watercooler:

+  - accepts:

+    - empty-cup

 - oven:

   - accepts:

     - bakeable

@@ -20,6 +23,7 @@
 - sink:

   - accepts:

     - dirty

+    - cup

 

 # customers

 - table