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

This commit is contained in:
cib
2012-03-05 09:45:16 -08:00
2 changed files with 7 additions and 0 deletions
+7
View File
@@ -1 +1,8 @@
//add custom items you give to people here, and put their icons in custom_items.dmi
/obj/item/fluff // so that they don't spam up the object tree
icon = 'custom_items.dmi'
/obj/item/fluff/wes_solari_1
name = "Family Photograph"
desc = "A family photograph of a couple and a young child, Written on the back it says \"See you soon Dad -Roy\"."
icon_state = "wes_solari_1"