diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm
index 3fd85755312..5b8fc955e73 100644
--- a/code/game/objects/items/crayons.dm
+++ b/code/game/objects/items/crayons.dm
@@ -136,7 +136,6 @@
busy = FALSE
/obj/item/toy/crayon/attack(mob/M, mob/user)
- var/huffable = istype(src,/obj/item/toy/crayon/spraycan)
if(M == user)
if(ishuman(user))
var/mob/living/carbon/human/H = user
@@ -147,7 +146,7 @@
playsound(loc, 'sound/items/eatfood.ogg', 50, 0)
user.adjust_nutrition(5)
if(times_eaten < max_bites)
- to_chat(user, "You take a [huffable ? "huff" : "bite"] of the [name]. Delicious!")
+ to_chat(user, "You take a bite of the [name]. Delicious!")
else
to_chat(user, "There is no more of [name] left!")
qdel(src)
@@ -302,7 +301,7 @@
/obj/item/toy/crayon/spraycan
name = "\improper Nanotrasen-brand Rapid Paint Applicator"
- desc = "A metallic container containing tasty paint."
+ desc = "A metallic container containing spray paint."
icon_state = "spraycan_cap"
var/capped = TRUE
instant = TRUE
@@ -312,6 +311,9 @@
..()
update_icon()
+/obj/item/toy/crayon/spraycan/attack(mob/M, mob/user)
+ return // To stop you from eating spraycans. It's TOO SILLY!
+
/obj/item/toy/crayon/spraycan/attack_self(mob/living/user)
var/choice = tgui_input_list(user, "Do you want to...", "Spraycan Options", list("Toggle Cap","Change Drawing", "Change Color"))
switch(choice)
@@ -329,26 +331,26 @@
if(!proximity)
return
if(capped)
+ to_chat(user, "You cannot spray [target] while the cap is still on!")
return
- else
- if(iscarbon(target))
- if(uses - 10 > 0)
- uses = uses - 10
- var/mob/living/carbon/C = target
- user.visible_message(" [user] sprays [src] into the face of [target]!")
- if(C.client)
- C.EyeBlurry(6 SECONDS)
- C.EyeBlind(2 SECONDS)
- if(ishuman(target))
- var/mob/living/carbon/human/H = target
- if(H.check_eye_prot() <= 0) // no eye protection? ARGH IT BURNS.
- H.Confused(6 SECONDS)
- H.KnockDown(6 SECONDS)
- H.lip_style = "spray_face"
- H.lip_color = colour
- H.update_body()
- playsound(user, 'sound/effects/spray.ogg', 5, TRUE, 5)
- ..()
+ if(iscarbon(target))
+ if(uses - 10 > 0)
+ uses = uses - 10
+ var/mob/living/carbon/C = target
+ user.visible_message(" [user] sprays [src] into the face of [target]!")
+ if(C.client)
+ C.EyeBlurry(6 SECONDS)
+ C.EyeBlind(2 SECONDS)
+ if(ishuman(target))
+ var/mob/living/carbon/human/H = target
+ if(H.check_eye_prot() <= 0) // no eye protection? ARGH IT BURNS.
+ H.Confused(6 SECONDS)
+ H.KnockDown(6 SECONDS)
+ H.lip_style = "spray_face"
+ H.lip_color = colour
+ H.update_body()
+ playsound(user, 'sound/effects/spray.ogg', 5, TRUE, 5)
+ ..()
/obj/item/toy/crayon/spraycan/update_icon_state()
icon_state = "spraycan[capped ? "_cap" : ""]"