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
+10 -1
View File
@@ -637,4 +637,13 @@
icon_state = "monkey_head"
w_class = 1
force = 1
throwforce = 1
throwforce = 1
/obj/item/toy/xmastree
name = "miniature Christmas tree"
desc = "Now with 99% less pine needles."
icon = 'icons/obj/toy.dmi'
icon_state = "tinyxmastree"
w_class = 1
force = 1
throwforce = 1