From b1c74fc9db75b4fd77e44775ac84c9dfcb51a364 Mon Sep 17 00:00:00 2001
From: RKF45 <rkf45codes@gmail.com>
Date: Sun, 25 Jan 2015 03:12:52 +0100
Subject: [PATCH] Grinding crayons

---
 code/modules/reagents/Chemistry-Machinery.dm | 20 +++++++-
 code/modules/reagents/Chemistry-Reagents.dm  | 51 ++++++++++++++++++++
 2 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm
index a2ea7c6f0c0..bad9360c4cc 100644
--- a/code/modules/reagents/Chemistry-Machinery.dm
+++ b/code/modules/reagents/Chemistry-Machinery.dm
@@ -851,7 +851,10 @@
 
 		//All types that you can put into the grinder to transfer the reagents to the beaker. !Put all recipes above this.!
 		/obj/item/weapon/reagent_containers/pill = list(),
-		/obj/item/weapon/reagent_containers/food = list()
+		/obj/item/weapon/reagent_containers/food = list(),
+
+		//Crayons
+		/obj/item/toy/crayon = list()
 	)
 
 	var/list/juice_items = list (
@@ -1186,6 +1189,21 @@
 				break
 		remove_object(O)
 
+	//crayons
+	for (var/obj/item/toy/crayon/O in holdingitems)
+		if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
+			break
+		var/amount = round(O.uses/3) //full crayon gives 10 juice
+		var/dustcolour = "red"
+		if (O.colourName == "mime")
+			dustcolour = "grey" //black+white
+		else if (O.colourName == "rainbow")
+			dustcolour = "brown" //mix of all colours
+		else if (!isnull(O.colourName)) //all other defined colours
+			dustcolour = O.colourName
+		beaker.reagents.add_reagent("crayon_dust_[dustcolour]",amount)
+		remove_object(O)
+
 	//Everything else - Transfers reagents from it into beaker
 	for (var/obj/item/weapon/reagent_containers/O in holdingitems)
 		if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index 1e7d7bdd56f..40ebeb09d0e 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -1515,6 +1515,57 @@ datum
 				..()
 				return
 
+//////////////////////////Ground crayons/////////////////////
+
+
+		crayon_dust
+			name = "Crayon dust"
+			id = "crayon_dust"
+			description = "Intensely coloured powder obtained by grinding crayons."
+			reagent_state = LIQUID
+			color = "#888888"
+			overdose = 5
+
+		crayon_dust/red
+			name = "Red crayon dust"
+			id = "crayon_dust_red"
+			color = "#DA0000"
+
+		crayon_dust/orange
+			name = "Orange crayon dust"
+			id = "crayon_dust_orange"
+			color = "#FF9300"
+
+		crayon_dust/yellow
+			name = "Yellow crayon dust"
+			id = "crayon_dust_yellow"
+			color = "#FFF200"
+
+		crayon_dust/green
+			name = "Green crayon dust"
+			id = "crayon_dust_green"
+			color = "#A8E61D"
+
+		crayon_dust/blue
+			name = "Blue crayon dust"
+			id = "crayon_dust_blue"
+			color = "#00B7EF"
+
+		crayon_dust/purple
+			name = "Purple crayon dust"
+			id = "crayon_dust_purple"
+			color = "#DA00FF"
+
+		crayon_dust/grey
+			name = "Grey crayon dust"
+			id = "crayon_dust_grey"
+			color = "#808080"
+
+		crayon_dust/brown
+			name = "Brown crayon dust"
+			id = "crayon_dust_brown"
+			color = "#846F35"
+
 //////////////////////////Poison stuff///////////////////////
 
 		toxin