From dc937612d5116d4784b696cadd79e046f4e71344 Mon Sep 17 00:00:00 2001 From: "baloh.matevz" Date: Sun, 29 Jul 2012 03:50:57 +0000 Subject: [PATCH] - Added an easter egg to the game.... GET IT??? :D:D:D:D:D:D:D git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4207 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/food/food.dm | 45 ++++++++++++++++++++++++++++++++++++++ html/changelog.html | 10 ++++++++- icons/obj/food.dmi | Bin 84890 -> 86031 bytes 3 files changed, 54 insertions(+), 1 deletion(-) 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. --> + +
+

29 July 2012

+

Errorage updated:

+ +

26 July 2012

@@ -57,7 +65,7 @@ should be listed in the changelog upon commit tho. Thanks. -->
- +

July 25, 2012: The day of updates!

Nodrak updated: