Crayons

Updated the way they work.
Clown now starts with a rainbow crayon that can draw in any two colours.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1533 316c924e-a436-60f5-8080-3fe189b3f50e

code/game/objects/items/weapons/clown_items.dm

@@ -31,6 +31,15 @@ BIKE HORN
 		M.stunned = 8
 		M.weakened = 5
 
+/obj/item/weapon/soap/afterattack(atom/target, mob/user as mob)
+	if(istype(target,/obj/decal/cleanable))
+		del(target)
+		user << "\blue You scrub the [name] out."
+	else
+		target.clean_blood()
+		user << "\blue You clean the [target.name]."
+	return
+
 /obj/item/weapon/bikehorn/attack_self(mob/user as mob)
 	if (spam_flag == 0)
 		spam_flag = 1

code/game/objects/items/weapons/mops_cleaners.dm

@@ -73,10 +73,10 @@ MOP
 		A.clean_blood()
 		for(var/obj/rune/R in A)
 			del(R)
-		for(var/obj/crayonrune/R in A)
+		for(var/obj/decal/cleanable/crayon/R in A)
 			del(R)
 		mopcount++
-	else if (istype(A, /obj/decal/cleanable/blood) || istype(A, /obj/overlay) || istype(A, /obj/decal/cleanable/xenoblood) || istype(A, /obj/rune) || istype(A,/obj/crayonrune) )
+	else if (istype(A, /obj/decal/cleanable/blood) || istype(A, /obj/overlay) || istype(A, /obj/decal/cleanable/xenoblood) || istype(A, /obj/rune) || istype(A,/obj/decal/cleanable/crayon) )
 		for(var/mob/O in viewers(user, null))
 			O.show_message(text("\red <B>[user] begins to clean [A]</B>"), 1)
 		sleep(20)

code/game/objects/toys.dm

@@ -0,0 +1,161 @@
+/*--------
+//CONTAINS
+CRAYONS
+--------*/
+/obj/item/toy/crayonbox/New()
+	..()
+	new /obj/item/toy/crayon/red(src)
+	new /obj/item/toy/crayon/orange(src)
+	new /obj/item/toy/crayon/yellow(src)
+	new /obj/item/toy/crayon/green(src)
+	new /obj/item/toy/crayon/blue(src)
+	new /obj/item/toy/crayon/purple(src)
+	updateIcon()
+
+/obj/item/toy/crayonbox/proc/updateIcon()
+	overlays = list() //resets list
+	overlays += image('crayons.dmi',"crayonbox")
+	for(var/obj/item/toy/crayon/crayon in contents)
+		overlays += image('crayons.dmi',crayon.colourName)
+
+/obj/item/toy/crayonbox/attackby(obj/item/W as obj, mob/user as mob)
+	if(istype(W,/obj/item/toy/crayon))
+		switch(W:colourName)
+			if("mime")
+				usr << "This crayon is too sad to be contained in this box."
+				return
+			if("rainbow")
+				usr << "This crayon is too powerful to be contained in this box."
+				return
+			else
+				usr << "You add the crayon to the box."
+				user.u_equip(W)
+				W.loc = src
+				if ((user.client && user.s_active != src))
+					user.client.screen -= W
+				W.dropped(user)
+				add_fingerprint(user)
+				updateIcon()
+				return
+	else
+		..()
+
+/obj/item/toy/crayonbox/attack_hand(mob/user as mob)
+	if(user.r_hand == src || user.l_hand == src)
+		if(!contents.len)
+			user << "\red You're out of crayons!"
+			return
+		else
+			var/crayon = pick(contents)
+			user.contents += crayon
+			if(user.hand)
+				user.l_hand = crayon
+			else
+				user.r_hand = crayon
+			crayon:layer = 20
+			user << "You take the [crayon:colourName] crayon out of the box."
+			updateIcon()
+	else
+		return ..()
+	icon_state = "crayonbox[contents.len]"
+	return
+
+/obj/item/toy/crayon/red
+	icon_state = "crayonred"
+	colour = "#DA0000"
+	shadeColour = "#810C0C"
+	colourName = "red"
+
+/obj/item/toy/crayon/orange
+	icon_state = "crayonorange"
+	colour = "#FF9300"
+	shadeColour = "#A55403"
+	colourName = "orange"
+
+/obj/item/toy/crayon/yellow
+	icon_state = "crayonyellow"
+	colour = "#FFF200"
+	shadeColour = "#886422"
+	colourName = "yellow"
+
+/obj/item/toy/crayon/green
+	icon_state = "crayongreen"
+	colour = "#A8E61D"
+	shadeColour = "#61840F"
+	colourName = "green"
+
+/obj/item/toy/crayon/blue
+	icon_state = "crayonblue"
+	colour = "#00B7EF"
+	shadeColour = "#0082A8"
+	colourName = "blue"
+
+/obj/item/toy/crayon/purple
+	icon_state = "crayonpurple"
+	colour = "#DA00FF"
+	shadeColour = "#810CFF"
+	colourName = "purple"
+
+/obj/item/toy/crayon/mime
+	icon_state = "crayonmime"
+	desc = "A very sad-looking crayon."
+	colour = "#FFFFFF"
+	shadeColour = "#000000"
+	colourName = "mime"
+	uses = 0
+
+/obj/item/toy/crayon/mime/attack_self(mob/living/user as mob) //inversion
+	if(colour != "#FFFFFF" && shadeColour != "#000000")
+		colour = "#FFFFFF"
+		shadeColour = "#000000"
+		user << "You will now draw in white and black with this crayon."
+	else
+		colour = "#000000"
+		shadeColour = "#FFFFFF"
+		user << "You will now draw in black and white with this crayon."
+	return
+
+/obj/item/toy/crayon/rainbow
+	icon_state = "crayonrainbow"
+	colour = "#FFF000"
+	shadeColour = "#000FFF"
+	colourName = "rainbow"
+	uses = 0
+
+/obj/item/toy/crayon/rainbow/attack_self(mob/living/user as mob)
+	colour = input(user, "Please select the main colour.", "Crayon colour") as color
+	shadeColour = input(user, "Please select the shade colour.", "Crayon colour") as color
+	return
+
+/obj/item/toy/crayon/afterattack(atom/target, mob/user as mob)
+	if(istype(target,/turf/simulated/floor))
+		user << "You start drawing a rune on the [target.name]."
+		if(instant || do_after(user, 50))
+			new /obj/decal/cleanable/crayon(target,colour,shadeColour)
+			user << "You draw a rune on the [target.name]."
+			if(uses)
+				uses--
+				if(!uses)
+					user << "You used up your crayon!"
+					del(src)
+	return
+
+/obj/decal/cleanable/crayon
+	name = "rune"
+	desc = "A rune drawn in crayon."
+	icon = 'rune.dmi'
+	layer = 2.1
+
+/obj/decal/cleanable/crayon/New(location,main = "#FFFFFF",shade = "#000000")
+	..()
+	loc = location
+	var/runeShape = rand(1,6)
+
+	var/icon/mainOverlay = new/icon('rune.dmi',"main[runeShape]",2.1)
+	var/icon/shadeOverlay = new/icon('rune.dmi',"shade[runeShape]",2.1)
+
+	mainOverlay.Blend(main,ICON_ADD)
+	shadeOverlay.Blend(shade,ICON_ADD)
+
+	overlays += mainOverlay
+	overlays += shadeOverlay