Merge pull request #328 from SueTheCake/developing

Even MORE CHRISTMAS!

code/game/gamemodes/events/holidays/Christmas.dm

@@ -61,3 +61,9 @@
 	flags = FPRINT|TABLEPASS
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
 
+/obj/item/clothing/head/festive/santahat
+	name = "Christmas hat"
+	desc = "Ho ho ho. Merrry X-mas!"
+	icon_state = "santahat"
+	flags = FPRINT|TABLEPASS
+

code/game/objects/items/toys.dm

@@ -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

code/game/objects/structures/signs.dm

@@ -199,3 +199,15 @@
 	name = "\improper Escape Arm"
 	desc = "A direction sign, pointing out which way the escape shuttle dock is."
 	icon_state = "direction_evac"
+
+/obj/structure/sign/christmas/lights
+	name = "Christmas lights"
+	desc = "Flashy."
+	icon = 'icons/obj/christmas.dmi'
+	icon_state = "xmaslights"
+
+/obj/structure/sign/christmas/wreath
+	name = "wreath"
+	desc = "Prickly and overrated."
+	icon = 'icons/obj/christmas.dmi'
+	icon_state = "doorwreath"

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -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."