Merge branch 'master' into upstream-merge-26760

2017-05-14 01:02:26 -04:00
parent e66cbfd7db 55dd3876e5
commit 52fa1f314f
531 changed files with 5863 additions and 3439 deletions
@@ -58,6 +58,12 @@
 	icon_state = "bottle12"
 	list_reagents = list("cyanide" = 30)

+/obj/item/weapon/reagent_containers/glass/bottle/spewium
+	name = "spewium bottle"
+	desc = "A small bottle of spewium."
+	icon_state = "bottle12"
+	list_reagents = list("spewium" = 30)
+
 /obj/item/weapon/reagent_containers/glass/bottle/morphine
 	name = "morphine bottle"
 	desc = "A small bottle of morphine."