Merge branch 'master' into development

This commit is contained in:
skull132
2017-01-23 15:52:13 -05:00
15 changed files with 48 additions and 15 deletions
+1 -1
View File
@@ -217,4 +217,4 @@
desc = "Prickly and overrated."
icon = 'icons/obj/christmas.dmi'
icon_state = "doorwreath"
layer = 5
layer = 5