Merge pull request #6627 from VOREStation/aro-carafes

Adds carafes and pitchers

code/datums/autolathe/general_vr.dm

@@ -30,3 +30,12 @@
 	name = "metamorphic glass"
 	path =/obj/item/weapon/reagent_containers/food/drinks/metaglass
 	is_stack = TRUE
+
+/datum/category_item/autolathe/general/drinkingglass_carafe
+	name = "glass carafe"
+	path =/obj/item/weapon/reagent_containers/food/drinks/glass2/carafe
+
+/datum/category_item/autolathe/general/drinkingglass_pitcher
+	name = "plastic pitcher"
+	path =/obj/item/weapon/reagent_containers/food/drinks/glass2/pitcher
+	

code/game/machinery/vending.dm

@@ -685,6 +685,8 @@
 					/obj/item/weapon/reagent_containers/food/drinks/glass2/pint = 10,
 					/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/glass2/carafe = 2,
+					/obj/item/weapon/reagent_containers/food/drinks/glass2/pitcher = 2,
 					/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,
@@ -726,7 +728,7 @@
 					/obj/item/weapon/reagent_containers/food/drinks/ice = 10,
 					/obj/item/weapon/reagent_containers/food/drinks/tea = 15,
 					/obj/item/weapon/glass_extra/stick = 30,
-					/obj/item/weapon/glass_extra/straw = 30)
+					/obj/item/weapon/glass_extra/straw = 30) //VOREStation Add - Carafes and Pitchers
 	contraband = list()
 	vend_delay = 15
 	idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.

code/modules/food/drinkingglass/drinkingglass.dm

@@ -74,9 +74,9 @@
 	update_icon()
 
 /obj/item/weapon/reagent_containers/food/drinks/glass2/proc/can_add_extra(obj/item/weapon/glass_extra/GE)
-	if(!("[base_icon]_[GE.glass_addition]left" in icon_states(DRINK_ICON_FILE)))
+	if(!("[base_icon]_[GE.glass_addition]left" in icon_states(icon))) //VOREStation Edit
 		return 0
-	if(!("[base_icon]_[GE.glass_addition]right" in icon_states(DRINK_ICON_FILE)))
+	if(!("[base_icon]_[GE.glass_addition]right" in icon_states(icon))) //VOREStation Edit
 		return 0
 
 	return 1
@@ -106,20 +106,20 @@
 			over_liquid |= "[base_icon][amnt]_fizz"
 
 		for(var/S in R.glass_special)
-			if("[base_icon]_[S]" in icon_states(DRINK_ICON_FILE))
+			if("[base_icon]_[S]" in icon_states(icon)) //VOREStation Edit
 				under_liquid |= "[base_icon]_[S]"
-			else if("[base_icon][amnt]_[S]" in icon_states(DRINK_ICON_FILE))
+			else if("[base_icon][amnt]_[S]" in icon_states(icon)) //VOREStation Edit
 				over_liquid |= "[base_icon][amnt]_[S]"
 
 		for(var/k in under_liquid)
-			underlays += image(DRINK_ICON_FILE, src, k, -3)
+			underlays += image(icon, src, k, -3) //VOREStation Edit
 
-		var/image/filling = image(DRINK_ICON_FILE, src, "[base_icon][amnt][R.glass_icon]", -2)
+		var/image/filling = image(icon, src, "[base_icon][amnt][R.glass_icon]", -2) //VOREStation Edit
 		filling.color = reagents.get_color()
 		underlays += filling
 
 		for(var/k in over_liquid)
-			underlays += image(DRINK_ICON_FILE, src, k, -1)
+			underlays += image(icon, src, k, -1) //VOREStation Edit
 	else
 		name = initial(name)
 		desc = initial(desc)
@@ -128,7 +128,7 @@
 	for(var/item in extras)
 		if(istype(item, /obj/item/weapon/glass_extra))
 			var/obj/item/weapon/glass_extra/GE = item
-			var/image/I = image(DRINK_ICON_FILE, src, "[base_icon]_[GE.glass_addition][side]")
+			var/image/I = image(icon, src, "[base_icon]_[GE.glass_addition][side]") //VOREStation Edit
 			if(GE.glass_color)
 				I.color = GE.glass_color
 			underlays += I

code/modules/food/drinkingglass/serving_glasses.dm

@@ -0,0 +1,20 @@
+/obj/item/weapon/reagent_containers/food/drinks/glass2/carafe
+	name = "glass carafe"
+	base_name = "carafe"
+	base_icon = "carafe"
+	icon = 'icons/obj/drinks_vr.dmi'
+	filling_states = list(10, 20, 30, 40, 50, 60, 70, 80, 90, 100)
+	volume = 120
+	possible_transfer_amounts = list(5,15,30)
+	matter = list("glass" = 50)
+
+/obj/item/weapon/reagent_containers/food/drinks/glass2/pitcher
+	name = "plastic pitcher"
+	base_name = "pitcher"
+	base_icon = "pitcher"
+	icon = 'icons/obj/drinks_vr.dmi'
+	filling_states = list(15, 30, 50, 70, 85, 100)
+	volume = 120
+	possible_transfer_amounts = list(5,15,30)
+	matter = list("plastic" = 50)
+	

vorestation.dme

@@ -1940,6 +1940,7 @@
 #include "code\modules\food\drinkingglass\glass_boxes.dm"
 #include "code\modules\food\drinkingglass\glass_types.dm"
 #include "code\modules\food\drinkingglass\metaglass.dm"
+#include "code\modules\food\drinkingglass\serving_glasses.dm"
 #include "code\modules\food\drinkingglass\shaker.dm"
 #include "code\modules\food\food\cans.dm"
 #include "code\modules\food\food\condiment.dm"