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

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

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"