Merge pull request #328 from SueTheCake/developing

Even MORE CHRISTMAS!
This commit is contained in:
skull132
2014-12-24 22:47:34 +02:00
10 changed files with 11241 additions and 11151 deletions
@@ -1053,6 +1053,18 @@
reagents.add_reagent("nutriment", 10)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/pudding
name = "Figgy pudding"
icon_state = "pudding"
desc = "Bring it to me."
trash = /obj/item/trash/plate
filling_color = "#FFFEE0"
New()
..()
reagents.add_reagent("nutriment", 10)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/amanita_pie
name = "amanita pie"
desc = "Sweet and tasty poison pie."