Fixing conflicts

This commit is contained in:
Qustinnus
2017-07-19 11:19:52 +02:00
parent 58e5aa91da
commit 2312ff09be
14 changed files with 110 additions and 4 deletions
@@ -25,6 +25,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi
seed = /obj/item/seeds/reishi
name = "reishi"