From 6b1ba1b6a3e69ea38330c5644906d366d66b13dc Mon Sep 17 00:00:00 2001
From: Whitellama <whitellama@users.noreply.github.com>
Date: Fri, 1 Aug 2014 16:39:19 -0700
Subject: [PATCH] Fixed #5870: Glasses being labeled both 'glass' and 'Drinking
 glass' inconsistently

Conflicts:
	code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
---
 .../reagents/reagent_containers/food/drinks/drinkingglass.dm | 5 +++--
 1 file changed, 3 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 968954a5149..fe2282c257d 100644
--- a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
@@ -530,8 +530,9 @@
 					desc = "You can't really tell what this is."
 		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
 
 // for /obj/machinery/vending/sovietsoda