diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm
index e936cc8c4c2..ad220a5f275 100644
--- a/code/modules/food/food.dm
+++ b/code/modules/food/food.dm
@@ -185,6 +185,51 @@
 		src.visible_message("\red [src.name] has been squashed.","\red You hear a smack.")
 		del(src)
 
+	attackby(obj/item/weapon/W as obj, mob/user as mob)
+		if(istype( W, /obj/item/toy/crayon ))
+			var/obj/item/toy/crayon/C = W
+			var/clr = C.colourName
+
+			if(!(clr in list("blue","green","mime","orange","purple","rainbow","red","yellow")))
+				usr << "\blue The egg refuses to take on this color!"
+				return
+
+			usr << "\blue You color \the [C] [clr]"
+			icon_state = "egg-[clr]"
+			color = clr
+
+/obj/item/weapon/reagent_containers/food/snacks/egg/blue
+	icon_state = "egg-blue"
+	color = "blue"
+
+/obj/item/weapon/reagent_containers/food/snacks/egg/green
+	icon_state = "egg-green"
+	color = "green"
+
+/obj/item/weapon/reagent_containers/food/snacks/egg/mime
+	icon_state = "egg-mime"
+	color = "mime"
+
+/obj/item/weapon/reagent_containers/food/snacks/egg/orange
+	icon_state = "egg-orange"
+	color = "orange"
+
+/obj/item/weapon/reagent_containers/food/snacks/egg/purple
+	icon_state = "egg-purple"
+	color = "purple"
+
+/obj/item/weapon/reagent_containers/food/snacks/egg/rainbow
+	icon_state = "egg-rainbow"
+	color = "rainbow"
+
+/obj/item/weapon/reagent_containers/food/snacks/egg/red
+	icon_state = "egg-red"
+	color = "red"
+
+/obj/item/weapon/reagent_containers/food/snacks/egg/yellow
+	icon_state = "egg-yellow"
+	color = "yellow"
+
 /obj/item/weapon/reagent_containers/food/snacks/friedegg
 	name = "Fried egg"
 	desc = "A fried egg, with a touch of salt and pepper."
diff --git a/html/changelog.html b/html/changelog.html
index b4857f643b5..f1fd49fa5a9 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -47,7 +47,15 @@ should be listed in the changelog upon commit tho. Thanks. -->
 
 <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
 
+
+
 <div class="commit sansserif">
+	<h2 class="date">29 July 2012</h2>
+	<h3 class="author">Errorage updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="rscadd">You can now use crayons to color eggs</li>
+	</ul>
+</div>
 
 <div class="commit sansserif">
 	<h2 class="date">26 July 2012</h2>
@@ -57,7 +65,7 @@ should be listed in the changelog upon commit tho. Thanks. -->
 	</ul>
 </div>
 
-
+<div class="commit sansserif">
 	<h2 class="date">July 25, 2012: The day of updates!</h2>
 	<h3 class="author">Nodrak updated:</h3>
 	<ul class="changes bgimages16">
diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi
index bb38afed7f1..28ec0dcab6c 100644
Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ