Merge branch 'master' of github.com:Baystation12/Baystation12

This commit is contained in:
SkyMarshal
2012-01-25 08:42:44 -07:00
6 changed files with 58 additions and 22 deletions
+11
View File
@@ -2128,6 +2128,17 @@
..()
reagents.add_reagent("cryoxadone", 30)
/obj/item/weapon/reagent_containers/glass/beaker/tricordrazine
name = "beaker"
desc = "A beaker. Can hold up to 50 units."
icon = 'chemical.dmi'
icon_state = "beaker0"
item_state = "beaker"
New()
..()
reagents.add_reagent("tricordrazine", 30)
/obj/item/weapon/reagent_containers/food/drinks/golden_cup
desc = "A golden cup"
name = "golden cup"