From dad248d49d4944f45331faab7a379418c152deda Mon Sep 17 00:00:00 2001 From: Whitellama Date: Fri, 1 Aug 2014 16:39:19 -0700 Subject: [PATCH] Fixed #5870: Glasses being labeled both 'glass' and 'Drinking glass' inconsistently --- .../reagents/reagent_containers/food/drinks/drinkingglass.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm index 454badcf19..fa788fc5b4 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm @@ -605,8 +605,8 @@ center_of_mass = list("x"=16, "y"=10) else icon_state = "glass_empty" - name = "Drinking glass" - desc = "Your standard drinking glass" + name = "glass" + desc = "Your standard drinking glass." center_of_mass = list("x"=16, "y"=10) return