From 030fe0703f9c38cf7705c77f1fe15011b7e02e5b Mon Sep 17 00:00:00 2001
From: uporotiy <uporotiy@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Thu, 5 May 2011 11:55:15 +0000
Subject: [PATCH] Forgot to make crayons eatable. Plus clown spawns with a
 regular box as well, since the rainbow crayon is somewhat unwieldy.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1534 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/game/jobs/jobprocs.dm |  1 +
 code/game/objects/toys.dm  | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/code/game/jobs/jobprocs.dm b/code/game/jobs/jobprocs.dm
index ddee025d359..40111e2f056 100644
--- a/code/game/jobs/jobprocs.dm
+++ b/code/game/jobs/jobprocs.dm
@@ -340,6 +340,7 @@
 			src.equip_if_possible(new /obj/item/weapon/bikehorn(src), slot_in_backpack)
 			src.equip_if_possible(new /obj/item/weapon/stamp/clown(src), slot_in_backpack)
 			src.equip_if_possible(new /obj/item/toy/crayon/rainbow(src), slot_in_backpack)
+			src.equip_if_possible(new /obj/item/toy/crayonbox(src), slot_in_backpack)
 			src.mutations |= 16
 
 		if ("Mime")
diff --git a/code/game/objects/toys.dm b/code/game/objects/toys.dm
index 2f5b4613fce..89e1ae9d0ab 100644
--- a/code/game/objects/toys.dm
+++ b/code/game/objects/toys.dm
@@ -136,10 +136,22 @@ CRAYONS
 			if(uses)
 				uses--
 				if(!uses)
-					user << "You used up your crayon!"
+					user << "\red You used up your crayon!"
 					del(src)
 	return
 
+/obj/item/toy/crayon/attack(mob/M as mob, mob/user as mob)
+	if(M == user)
+		user << "You take a bite of the crayon. Delicious!"
+		user.nutrition += 5
+		if(uses)
+			uses -= 5
+			if(uses <= 0)
+				user << "\red You ate your crayon!"
+				del(src)
+	else
+		..()
+
 /obj/decal/cleanable/crayon
 	name = "rune"
 	desc = "A rune drawn in crayon."