Merge pull request #773 from Sharkmare/patch-91

Duplicate tray fix, added water and tongue.

code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm

@@ -486,7 +486,6 @@
 	src.modules += new /obj/item/weapon/material/kitchen/rollingpin(src)
 	src.modules += new /obj/item/device/multitool(src) //to freeze trays
 	src.modules += new /obj/item/weapon/dogborg/jaws/small(src)
-	src.modules += new /obj/item/weapon/tray/robotray
 	src.modules += new /obj/item/device/dogborg/boop_module(src)
 	src.modules += new /obj/item/device/dogborg/sleeper/compactor/brewer(src)
 	src.modules += new /obj/item/weapon/reagent_containers/glass/beaker(src)//For holding the ALCOHOL
@@ -503,10 +502,21 @@
 	L.lit = 1
 	src.modules += L
 
+	var/datum/matter_synth/water = new /datum/matter_synth()
+	water.name = "Water reserves"
+	water.recharge_rate = 0.1 // Recharging water for plants - hehe drooly borg
+	water.max_energy = 1000
+	water.energy = 0
+	R.water_res = water
+	synths += water
+	
+	var/obj/item/device/dogborg/tongue/T = new /obj/item/device/dogborg/tongue(src)
+	T.water = water
+	src.modules += T
 	
 
 	src.modules += new /obj/item/weapon/tray/robotray(src)
-	src.modules += new /obj/item/weapon/reagent_containers/borghypo/service(src)
+	src.modules += new /obj/item/weapon/reagent_containers/borghypo/service/booze(src)
 	src.emag = new /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer(src)
 
 	var/datum/reagents/N = new/datum/reagents(50)

code/modules/reagents/reagent_containers/borghydro.dm

@@ -157,3 +157,14 @@
 	reagent_volumes[reagent_ids[mode]] -= t
 	user << "<span class='notice'>You transfer [t] units of the solution to [target].</span>"
 	return
+
+/obj/item/weapon/reagent_containers/borghypo/service/booze
+	name = "cyborg drink synthesizer"
+	desc = "A portable drink dispencer."
+	icon = 'icons/obj/drinks.dmi'
+	icon_state = "shaker"
+	charge_cost = 20
+	recharge_time = 3
+	volume = 120
+	possible_transfer_amounts = list(1 ,5, 10, 20, 30)
+	reagent_ids = list("ale", "beer", "berryjuice", "blood", "bitters", "cherryjelly", "coffee", "cognac", "cola", "demonsblood", "dr_gibb","eggnog", "gin", "gingerale", "hot_coco", "honey", "highpower", "ice", "icetea", "kahlua", "lemonjuice", "lemon_lime", "limejuice", "mead", "milk", "mint", "orangejuice", "gargleblaster", "phoronspecial", "rum", "sake", "sodawater", "soymilk", "space_up", "spacemountainwind", "specialwhiskey", "sugar", "sitonmyface", "spiderdrink", "syndicatebomb", "tea", "tequilla", "tomatojuice", "tonic", "vermouth", "vodka", "virginsip", "water", "watermelonjuice", "whiskey", "wine")