From ced41f67225841dde59b004b2f92b7669e8564ef Mon Sep 17 00:00:00 2001
From: "n3ophyt3@gmail.com"
 <n3ophyt3@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Thu, 16 Dec 2010 03:49:57 +0000
Subject: [PATCH] Brobot bottles now also refill when you pour drinks into
 glasses rather than people. Emag beer can now be poured into glasses without
 revealing what it really is.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@635 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/WorkInProgress/Chemistry-Reagents.dm     | 21 +++++++++++++++++++
 code/WorkInProgress/Chemistry-Tools.dm        | 11 ++++++++++
 .../mob/living/silicon/robot/robot_modules.dm |  2 +-
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/code/WorkInProgress/Chemistry-Reagents.dm b/code/WorkInProgress/Chemistry-Reagents.dm
index 9485c90eb5d..3c86c362e1d 100644
--- a/code/WorkInProgress/Chemistry-Reagents.dm
+++ b/code/WorkInProgress/Chemistry-Reagents.dm
@@ -1089,6 +1089,27 @@ datum
 				data++
 				..()
 				return
+
+		beer2							//copypasta of chloral hydrate, disguised as normal beer for use by emagged brobots
+			name = "Beer"
+			id = "beer2"
+			description = "An alcoholic beverage made from malted grains, hops, yeast, and water."
+			reagent_state = LIQUID
+			on_mob_life(var/mob/M)
+				if(!M) M = holder.my_atom
+				if(!data) data = 1
+				switch(data)
+					if(1)
+						M:confused += 2
+						M:drowsyness += 2
+					if(2 to 50)
+						M:sleeping += 1
+					if(51 to INFINITY)
+						M:sleeping += 1
+						M:toxloss += (data - 50)
+				data++
+				..()
+				return
 		/*
 		addiction					//Is a generic "addiction" reagent that is produced by any chemical that is addictive.
 			name = "Addiction"		//	It should never be seen by the player since it only exists inside the body.
diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm
index 2da49d07c3f..70b5e583d45 100644
--- a/code/WorkInProgress/Chemistry-Tools.dm
+++ b/code/WorkInProgress/Chemistry-Tools.dm
@@ -936,6 +936,13 @@
 			var/trans = src.reagents.trans_to(target, 10)
 			user << "\blue You transfer [trans] units of the solution to [target]."
 
+			if(isrobot(user)) //Cyborg modules that include drinks automatically refill themselves, but drain the borg's cell
+				var/mob/living/silicon/robot/bro = user
+				bro.cell.charge -= 30
+				var/refill = reagents.get_master_reagent_id()
+				spawn(600)
+					reagents.add_reagent(refill, trans)
+
 		return
 ////////////////////////////////////////////////////////////////////////////////
 /// Drinks. END
@@ -2357,6 +2364,10 @@
 					icon_state = "beerglass"
 					name = "Beer glass"
 					desc = "A freezing pint of beer"
+				if("beer2")
+					icon_state = "beerglass"
+					name = "Beer glass"
+					desc = "A freezing pint of beer"
 				if("ale")
 					icon_state = "aleglass"
 					name = "Ale glass"
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 70b662fd519..c19e9abb7ba 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -113,7 +113,7 @@
 	var/datum/reagents/R = new/datum/reagents(50)
 	src.emag.reagents = R
 	R.my_atom = src.emag
-	R.add_reagent("chloralhydrate", 50)
+	R.add_reagent("beer2", 50)
 	src.emag.name = "Mickey Finn's Special Brew"
 
 /obj/item/weapon/borg/stun