diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 87fbc4dcfd..570977d141 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -689,6 +689,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, diff --git a/code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm b/code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm index 0a982b5943..9aea2c398b 100644 --- a/code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm +++ b/code/modules/reagents/reagent_containers/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,12 +44,17 @@ else price_tag = null 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 - + if(type == /obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint) + icon_state = "pglass_empty" + name = "metamorphic pint glass" + desc = "This glass changes shape and form depending on the drink inside... fancy!" + 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 /* Drinks Data @@ -374,7 +385,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 diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 359ebbdf6b..9c737d7f83 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ