Fixed #5870: Glasses being labeled both 'glass' and 'Drinking glass' inconsistently

Conflicts:
	code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
This commit is contained in:
Whitellama
2014-08-01 16:39:19 -07:00
committed by ZomgPonies
parent 23bc5b822c
commit 6b1ba1b6a3
@@ -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