Merge pull request #289 from MalricB/master

Adds Bottled Wataur (what a bargain!)

code/modules/reagents/reagent_containers/glass.dm

@@ -365,5 +365,15 @@
 /obj/item/reagent_containers/glass/beaker/waterbottle/large/empty
 	list_reagents = list()
 
+/obj/item/reagent_containers/glass/beaker/waterbottle/wataur
+	name = "Bottled Wataur"
+	desc = "Finally, a bottle as proportionate as you. Incredible!"
+	icon = 'icons/obj/drinks.dmi'
+	icon_state = "wataur"
+	list_reagents = list("water" = 100) //robust ass wataur
+	volume = 100
+	amount_per_transfer_from_this = 20
+	container_HP = 1
+
 /obj/item/reagent_containers/glass/get_belt_overlay()
 	return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "bottle")

code/modules/vending/cola.dm

@@ -14,7 +14,8 @@
 					/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10,
 					/obj/item/reagent_containers/glass/beaker/waterbottle = 10)
 	contraband = list(/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 6,
-		              /obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 6)
+		              /obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 6,
+		              /obj/item/reagent_containers/glass/beaker/waterbottle/wataur = 2)
 	premium = list(/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola = 1,
 		           /obj/item/reagent_containers/food/drinks/soda_cans/air = 1,
 		           /obj/item/reagent_containers/food/drinks/soda_cans/grey_bull = 1)