Merge pull request #8633 from Sypsoti/bartendinggood

Bartending enhancements

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)
@@ -79,6 +79,14 @@
 	containertype = /obj/structure/closet/crate/allico
 	containername = "crate of gifts"
 
+/datum/supply_pack/hospitality/holywater
+	name = "Holy water crate"
+	contains = list(
+		/obj/item/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

@@ -50,6 +50,7 @@
 					/obj/item/reagent_containers/food/drinks/glass2/wine = 10,
 					/obj/item/reagent_containers/food/drinks/metaglass = 10,
 					/obj/item/reagent_containers/food/drinks/metaglass/metapint = 10,
+					/obj/item/reagent_containers/glass/beaker/stopperedbottle = 10,
 					/obj/item/reagent_containers/food/drinks/bottle/gin = 5,
 					/obj/item/reagent_containers/food/drinks/bottle/absinthe = 5,
 					/obj/item/reagent_containers/food/drinks/bottle/bluecuracao = 5,

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

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

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

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

code/modules/reagents/reactions/instant/drinks.dm

@@ -204,6 +204,7 @@
 	id = "martini"
 	result = "martini"
 	required_reagents = list("gin" = 2, "vermouth" = 1)
+	inhibitors = list("bitters" = 1)
 	result_amount = 3
 
 /decl/chemical_reaction/instant/drinks/vodkamartini
@@ -1269,4 +1270,4 @@
 	id = "ayahuasca"
 	result = "ayahuasca"
 	required_reagents = list("water" = 1, "dmt" = 2, "honey" = 1)
-	result_amount = 3
+	result_amount = 3

code/modules/reagents/reagent_containers/glass.dm

@@ -251,6 +251,16 @@
 /obj/item/reagent_containers/glass/beaker/sulphuric
 	prefill = list("sacid" = 60)
 
+/obj/item/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/reagent_containers/glass/bucket
 	desc = "It's a bucket."
 	name = "bucket"