From 0479b08b824c9f055d2931088640c17d675f0699 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Wed, 13 Jun 2018 21:47:40 -0500 Subject: [PATCH 1/2] Merge pull request #5351 from MagmaRam/coffee Fixes "glass of cup of coffee" --- .../Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 26481d8141a..56c93f56f1f 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -909,9 +909,9 @@ cup_icon_state = "cup_coffee" cup_name = "cup of coffee" - cup_desc = "Don't drop it, or you'll send scalding liquid and porcelain shards everywhere." + cup_desc = "Don't drop it, or you'll send scalding liquid and ceramic shards everywhere." - glass_name = "cup of coffee" + glass_name = "coffee" glass_desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere."