Fixed cpu lock when low pop revolution fails to start.

Fixed some runtime errors.
Improved golden cup.

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

code/WorkInProgress/Chemistry-Tools.dm

@@ -1751,10 +1751,9 @@
 		..()
 		reagents.add_reagent("cryoxadone", 30)
 
-/obj/item/weapon/reagent_containers/glass/golden_cup
+/obj/item/weapon/reagent_containers/food/drinks/golden_cup
 	desc = "A golden cup"
 	name = "golden cup"
-	icon = 'drinks.dmi'
 	icon_state = "golden_cup"
 	item_state = "" //nope :(
 	w_class = 4
@@ -1762,11 +1761,12 @@
 	throwforce = 10
 	amount_per_transfer_from_this = 20
 	possible_transfer_amounts = null
-	volume = 100
+	volume = 150
 	flags = FPRINT | CONDUCT | TABLEPASS | OPENCONTAINER
 
-/obj/item/weapon/reagent_containers/glass/golden_cup/tournament_26_06_2011
-	desc = "A golden cup. It will be presented to a winner of tournament 26 june and name of the winner will be graved on it."
+/obj/item/weapon/reagent_containers/food/drinks/golden_cup/tournament_26_06_2011
+	name = "The Quinn Tei's golden cup"
+	desc = "The graving says: Quinn Tei is the glorious winner of Animus Station Tournament. His gun is loud, his mop is fast, his oxygentank is devastating!"
 
 //Syringes
 /obj/item/weapon/reagent_containers/syringe/robot