Hello, I'm back :3

Bugfixes: Paper bin and clipboard now retrievable from pocketslots
Reagent grinder could not process plasma, rending the station plasma-less. Now fixed.

I was going to add new pill sounds but I couldn't find any :<
Changelog updated, only with this entry. Gotta study.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1694 316c924e-a436-60f5-8080-3fe189b3f50e

code/WorkInProgress/Chemistry-Machinery.dm

@@ -500,7 +500,7 @@
 	var/obj/item/weapon/reagent_containers/beaker = null
 	var/global/list/allowed_items = list (
 		/obj/item/stack/sheet/plasma = "plasma",
-		/obj/item/stack/sheet/plasma = "uranium",
+		/obj/item/stack/sheet/uranium = "uranium",
 		/obj/item/stack/sheet/clown = "banana",
 		/obj/item/stack/sheet/silver = "silver",
 		/obj/item/stack/sheet/gold = "gold",
@@ -572,7 +572,7 @@
 		beaker_contents = "\The [src]  has attached a beaker with something."
 		is_beaker_ready = 1
 	else
-		beaker_contents = "\The [src]  has attached a beaker and beaker is full!"
+		beaker_contents = "\The [src]  has attached a beaker and the beaker is full!"
 
 	var/dat = {"
 <b>Processing chamber contains:</b><br>

code/game/objects/items/weapons/papers_bins.dm

@@ -774,7 +774,24 @@ CLIPBOARDS
 	return
 
 
-
+/obj/item/weapon/clipboard/MouseDrop(obj/over_object as obj) //Quick clipboard fix. -Agouri
+	if (ishuman(usr) || ismonkey(usr)) //Can monkeys even place items in the pocket slots? Leaving this in just in case~
+		var/mob/M = usr
+		if (!( istype(over_object, /obj/screen) ))
+			return ..()
+		if ((!( M.restrained() ) && !( M.stat ) /*&& M.pocket == src*/))
+			if (over_object.name == "r_hand")
+				if (!( M.r_hand ))
+					M.u_equip(src)
+					M.r_hand = src
+			else
+				if (over_object.name == "l_hand")
+					if (!( M.l_hand ))
+						M.u_equip(src)
+						M.l_hand = src
+			M.update_clothing()
+			src.add_fingerprint(usr)
+			return //
 
 
 // PHOTOGRAPH

code/game/objects/storage/storage.dm

@@ -223,6 +223,32 @@
 	..()
 	return
 
+/obj/item/weapon/storage/pill_bottle/MouseDrop(obj/over_object as obj) //Quick pillbottle fix. -Agouri
+
+	if (ishuman(usr) || ismonkey(usr)) //Can monkeys even place items in the pocket slots? Leaving this in just in case~
+		var/mob/M = usr
+		if (!( istype(over_object, /obj/screen) ))
+			return ..()
+		if ((!( M.restrained() ) && !( M.stat ) /*&& M.pocket == src*/))
+			if (over_object.name == "r_hand")
+				if (!( M.r_hand ))
+					M.u_equip(src)
+					M.r_hand = src
+			else
+				if (over_object.name == "l_hand")
+					if (!( M.l_hand ))
+						M.u_equip(src)
+						M.l_hand = src
+			M.update_clothing()
+			src.add_fingerprint(usr)
+			return
+		if(over_object == usr && in_range(src, usr) || usr.contents.Find(src))
+			if (usr.s_active)
+				usr.s_active.close(usr)
+			src.show_to(usr)
+			return
+	return   ///////////////////////////////////////////////////////Alright, that should do it. *MARKER* for any possible runtimes
+
 /obj/item/weapon/storage/pillbottlebox/New()
 	new /obj/item/weapon/storage/pill_bottle( src )
 	new /obj/item/weapon/storage/pill_bottle( src )

icons/changelog.html

@@ -45,7 +45,16 @@ Stuff which is in development and not yet visible to players or just code relate
 (is. code improvements for expandability, etc.) should not be listed here. They 
 should be listed in the changelog upon commit tho. Thanks. -->
 
-
+<b><font color='blue'>7 June 2011.</font><b>
+<ul>
+	<li><b>Agouri updated:</b>
+	<ul>
+		<li>Bugfixes: The reagent grinding now works, allowing the miners to FINALLY bring plasma to the chemistry.</li>
+		<li>Bugfixes: Pill bottles and clipboards can now be removed from the pockets once placed there.</li>
+	</ul>
+	</li>
+</ul>
+<br>
 <b><font color='blue'>7 June 2011.</font><b>
 <ul>
 	<li><b>TLE updated:</b>