Merge pull request #6650 from Citadel-Station-13/upstream-merge-37659

[MIRROR] Crayons no longer use charge when used on a canvas

code/game/objects/items/crayons.dm

@@ -247,6 +247,8 @@
 	var/cost = 1
 	if(paint_mode == PAINT_LARGE_HORIZONTAL)
 		cost = 5
+	if(istype(target, /obj/item/canvas))
+		cost = 0
 	var/charges_used = use_charges(user, cost)
 	if(!charges_used)
 		return