From 9c270c2571c3b0ff3fa923c191604a651c19f64b Mon Sep 17 00:00:00 2001
From: Miniature <wndavey@hotmail.com>
Date: Fri, 16 Mar 2012 16:26:44 +1030
Subject: [PATCH] Fixed removing the first beaker from chem grenades, fixed
 premade grenades not working

---
 code/modules/chemical/Chemistry-Tools.dm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm
index c7fea46583..70266ea062 100644
--- a/code/modules/chemical/Chemistry-Tools.dm
+++ b/code/modules/chemical/Chemistry-Tools.dm
@@ -212,7 +212,7 @@
 			return
 		user.machine = src
 		var/dat = {"<B> Grenade properties: </B>
-		<BR> <B> Beaker one:</B> [beaker_one] [beaker_one ? "<A href='?src=\ref[src];beaker_one=1'>Remove</A>" : ""]
+		<BR> <B> Beaker one:</B> [beaker_one] [beaker_one ? "<A href='?src=\ref[src];beakerone=1'>Remove</A>" : ""]
 		<BR> <B> Beaker two:</B> [beaker_two] [beaker_two ? "<A href='?src=\ref[src];beakertwo=1'>Remove</A>" : ""]
 		<BR> <B> Control attachment:</B> [attached_device ? "<A href='?src=\ref[src];device=1'>[attached_device]</A>" : "None"] [attached_device ? "<A href='?src=\ref[src];rem_device=1'>Remove</A>" : ""]"}
 
@@ -312,6 +312,7 @@
 		New()
 			..()
 			attached_device = new /obj/item/device/assembly/timer(src)
+			attached_device.master = src
 			var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
 			var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)
 
@@ -332,6 +333,7 @@
 		New()
 			..()
 			attached_device = new /obj/item/device/assembly/timer(src)
+			attached_device.master = src
 			var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
 			var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)
 
@@ -352,6 +354,7 @@
 		New()
 			..()
 			attached_device = new /obj/item/device/assembly/timer(src)
+			attached_device.master = src
 			var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
 			var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)