Merge pull request #5010 from CHOMPStation2/upstream-merge-12971

[MIRROR] [MIRROR] Bartending enhancements (ABLE TO BE MERGED)

code/datums/supplypacks/hospitality.dm

@@ -47,7 +47,7 @@
 	cost = 10
 	containertype = /obj/structure/closet/crate/gilthari
 	containername = "crate of bar supplies"
-	
+
 /datum/supply_pack/hospitality/cookingoil
 	name = "Cooking oil tank crate"
 	contains = list(/obj/structure/reagent_dispensers/cookingoil)
@@ -96,6 +96,15 @@
 	containertype = /obj/structure/closet/crate/centauri
 	containername = "Painting equipment"
 
+/datum/supply_pack/hospitality/holywater
+	name = "Holy water crate"
+	contains = list(
+		/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater = 3
+		)
+	cost = 15
+	containertype = /obj/structure/closet/crate/gilthari
+	containername = "holy water crate"
+
 /datum/supply_pack/randomised/hospitality/
 	group = "Hospitality"
 

code/modules/economy/vending_machines.dm

@@ -47,17 +47,21 @@
 					/obj/item/weapon/reagent_containers/food/drinks/glass2/shot = 10,
 					/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,	//VOREStation Add - Carafes and Pitchers
 					/obj/item/weapon/reagent_containers/food/drinks/glass2/pitcher = 2,	//VOREStation Add - Carafes and Pitchers
+					/obj/item/weapon/reagent_containers/food/drinks/glass2/wine = 10,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/whitewine = 5,
+					/obj/item/weapon/reagent_containers/food/drinks/bottle/grapejuice = 5,
 					/obj/item/weapon/reagent_containers/food/drinks/metaglass = 10,
 					/obj/item/weapon/reagent_containers/food/drinks/metaglass/metapint = 10,
+					/obj/item/weapon/reagent_containers/glass/beaker/stopperedbottle = 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,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac = 5,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine = 5,
 					/obj/item/weapon/reagent_containers/food/condiment/cookingoil = 5,
+					/obj/item/weapon/reagent_containers/food/condiment/cornoil = 5,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua = 5,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/melonliquor = 5,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/peppermintschnapps = 5,
@@ -70,8 +74,6 @@
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth = 5,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka = 5,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey = 5,
-					/obj/item/weapon/reagent_containers/food/drinks/bottle/wine = 5,
-					/obj/item/weapon/reagent_containers/food/drinks/bottle/whitewine = 5,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/grapejuice = 5,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/jager = 5,
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale = 15,

code/modules/reagents/machinery/dispenser/cartridge_presets.dm

@@ -139,6 +139,10 @@
 	spawn_reagent = "greentea"
 /obj/item/weapon/reagent_containers/chem_disp_cartridge/decaf
 	spawn_reagent = "decaf"
+/obj/item/weapon/reagent_containers/chem_disp_cartridge/chaitea
+	spawn_reagent = "chaitea"
+/obj/item/weapon/reagent_containers/chem_disp_cartridge/decafchai
+	spawn_reagent = "chaiteadecaf"
 
 // ERT
 /obj/item/weapon/reagent_containers/chem_disp_cartridge/inaprov

code/modules/reagents/machinery/dispenser/dispenser_presets.dm

@@ -144,5 +144,7 @@
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/lime,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/berry,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/greentea,
-			/obj/item/weapon/reagent_containers/chem_disp_cartridge/decaf
+			/obj/item/weapon/reagent_containers/chem_disp_cartridge/decaf,
+			/obj/item/weapon/reagent_containers/chem_disp_cartridge/chaitea,
+			/obj/item/weapon/reagent_containers/chem_disp_cartridge/decafchai
 		)

code/modules/reagents/reagent_containers/glass.dm

@@ -263,6 +263,16 @@
 /obj/item/weapon/reagent_containers/glass/beaker/sulphuric
 	prefill = list("sacid" = 60)
 
+/obj/item/weapon/reagent_containers/glass/beaker/stopperedbottle
+	name = "stoppered bottle"
+	desc = "A stoppered bottle for keeping beverages fresh."
+	icon_state = "stopperedbottle"
+	center_of_mass = list("x" = 16,"y" = 13)
+	volume = 120
+	amount_per_transfer_from_this = 10
+	possible_transfer_amounts = list(5,10,15,25,30,60,120)
+	flags = OPENCONTAINER
+
 /obj/item/weapon/reagent_containers/glass/bucket
 	desc = "It's a bucket."
 	name = "bucket"