diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index e58568e35c..070351ea2c 100644 --- a/code/game/machinery/vending.dm +++ b/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, diff --git a/code/modules/food/drinkingglass/metaglass.dm b/code/modules/food/drinkingglass/metaglass.dm index ec9397b115..ac450f0ab2 100644 --- a/code/modules/food/drinkingglass/metaglass.dm +++ b/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" - 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 /* @@ -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 @@ -645,4 +657,7 @@ Drinks Data /datum/reagent/drink/arnold_palmer glass_icon_state = "arnoldpalmer" - glass_center_of_mass = list("x"=16, "y"=8) \ No newline at end of file + glass_center_of_mass = list("x"=16, "y"=8) + +/datum/reagent/ethanol/mojito + glass_icon_state = "mojito" \ No newline at end of file diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 36e2091041..79ccaed8f5 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ