Merge branch 'master' into hypo

code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm

@@ -90,6 +90,9 @@ Drinks Data
 /datum/reagent/drink/juice/lemon
 	glass_icon_state = "lemonjuice"
 
+/datum/reagent/drink/juice/apple
+	glass_icon_state = "applejuice"
+
 /datum/reagent/drink/juice/lime
 	glass_icon_state = "glass_green"
 

code/modules/reagents/reagent_containers/glass.dm

@@ -19,7 +19,7 @@
 
 	var/label_text = ""
 
-	var/list/prefill = list()	//Reagents to fill the container with on New()
+	var/list/prefill = null	//Reagents to fill the container with on New(), formatted as "reagentID" = quantity
 
 	var/list/can_be_placed_into = list(
 		/obj/machinery/chem_master/,
@@ -49,9 +49,10 @@
 
 /obj/item/weapon/reagent_containers/glass/New()
 	..()
-	if(prefill.len)
+	if(LAZYLEN(prefill))
 		for(var/R in prefill)
 			reagents.add_reagent(R,prefill[R])
+		prefill = null
 		update_icon()
 	base_name = name
 	base_desc = desc
@@ -228,7 +229,7 @@
 	volume = 30
 	w_class = ITEMSIZE_TINY
 	amount_per_transfer_from_this = 10
-	possible_transfer_amounts = list(5,10,15,25)
+	possible_transfer_amounts = list(5,10,15,30)
 	flags = OPENCONTAINER
 
 /obj/item/weapon/reagent_containers/glass/beaker/cryoxadone

code/modules/reagents/reagent_containers/glass/bottle_vr.dm

@@ -3,20 +3,11 @@
 	desc = "A small bottle of ickypak. The smell alone makes you gag."
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle-3"
-
-/obj/item/weapon/reagent_containers/glass/bottle/ickypak/New()
-	..()
-	reagents.add_reagent("ickypak", 60)
-	update_icon()
-
+	prefill = list("ickypak" = 60)
 
 /obj/item/weapon/reagent_containers/glass/bottle/unsorbitol
 	name = "unsorbitol bottle"
 	desc = "A small bottle of unsorbitol. Sickeningly sweet."
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle-3"
-
-/obj/item/weapon/reagent_containers/glass/bottle/unsorbitol/New()
-	..()
-	reagents.add_reagent("unsorbitol", 60)
-	update_icon()
+	prefill = list("unsorbitol" = 60)

code/modules/reagents/reagent_containers/glass_vr.dm

@@ -1,7 +1,6 @@
 /obj/item/weapon/reagent_containers/glass/beaker/neurotoxin
 	prefill = list("neurotoxin" = 50)
 
-
 /obj/item/weapon/reagent_containers/glass/beaker/vial/bicaridine
 	name = "vial (bicaridine)"
 	prefill = list("bicaridine" = 30)