Merge pull request #6659 from Darlantanis/MetamorphicPintGlas

Metamorphic Pint Glass

code/game/machinery/vending.dm

@@ -686,6 +686,7 @@
 					/obj/item/weapon/reagent_containers/food/drinks/glass2/mug = 10,
 					/obj/item/weapon/reagent_containers/food/drinks/glass2/wine = 10,
 					/obj/item/weapon/reagent_containers/food/drinks/metaglass = 10,
+					/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint = 10,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/gin = 5,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe = 5,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/bluecuracao = 5,

code/modules/food/drinkingglass/metaglass.dm

@@ -9,6 +9,12 @@
 	matter = list("glass" = 500)
 	icon = 'icons/obj/drinks.dmi'
 
+/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint
+	name = "metamorphic pint glass"
+	desc = "This glass changes shape and form depending on the drink inside... fancy!"
+	icon_state = "pglass_empty"
+	volume = 60
+
 /obj/item/weapon/reagent_containers/food/drinks/metaglass/on_reagent_change()
 	if (reagents.reagent_list.len > 0)
 		var/datum/reagent/R = reagents.get_master_reagent()
@@ -38,11 +44,17 @@
 		else
 			price_tag = null
 	else
-		icon_state = "glass_empty"
+		if(type == /obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint)
-		name = "metamorphic glass"
+			icon_state = "pglass_empty"
-		desc = "This glass changes shape and form depending on the drink inside... fancy!"
+			name = "metamorphic pint glass"
-		center_of_mass = list("x"=16, "y"=10)
+			desc = "This glass changes shape and form depending on the drink inside... fancy!"
-		return
+			center_of_mass = list("x"=16, "y"=10)
+		else
+			icon_state = "glass_empty"
+			name = "metamorphic glass"
+			desc = "This glass changes shape and form depending on the drink inside... fancy!"
+			center_of_mass = list("x"=16, "y"=10)
+			return
 
 
 /*
@@ -390,7 +402,7 @@ Drinks Data
 	glass_icon_state = "gintonicglass"
 
 /datum/reagent/ethanol/goldschlager
-	glass_icon_state = "ginvodkaglass"
+	glass_icon_state = "goldschlagerglass"
 	glass_center_of_mass = list("x"=16, "y"=12)
 
 /datum/reagent/ethanol/hippies_delight
@@ -646,3 +658,6 @@ Drinks Data
 /datum/reagent/drink/arnold_palmer
 	glass_icon_state = "arnoldpalmer"
 	glass_center_of_mass = list("x"=16, "y"=8)
+
+/datum/reagent/ethanol/mojito
+	glass_icon_state = "mojito"