diff --git a/code/modules/html_interface/paintTool/custom_painting_datum.dm b/code/modules/html_interface/paintTool/custom_painting_datum.dm index b217ca00bda..572e79e8de6 100644 --- a/code/modules/html_interface/paintTool/custom_painting_datum.dm +++ b/code/modules/html_interface/paintTool/custom_painting_datum.dm @@ -31,6 +31,15 @@ // Painting with a crayon if (istype(held_item, /obj/item/toy/crayon)) + for (var/obj/item/weapon/storage/fancy/crayons/box in user.held_items) + for (var/crayon in box) + var/obj/item/toy/crayon/c = crayon + max_strength = PENCIL_STRENGTH_MAX + min_strength = PENCIL_STRENGTH_MIN + palette += c.mainColour + palette += c.shadeColour + base_color = c.mainColour + var/obj/item/toy/crayon/c = held_item max_strength = PENCIL_STRENGTH_MAX min_strength = PENCIL_STRENGTH_MIN diff --git a/code/modules/painting/painting_brush.dm b/code/modules/painting/painting_brush.dm index f3892487bf5..17d87597353 100644 --- a/code/modules/painting/painting_brush.dm +++ b/code/modules/painting/painting_brush.dm @@ -55,3 +55,13 @@ paint_color = rgb(paint_color_rgb[1], paint_color_rgb[2], paint_color_rgb[3], mix_alpha_from_reagents(target.reagents.reagent_list)) to_chat(user, "You dip \the [name] in \the [target.name].") update_icon() + +//presumably this will allow painting on the floor, credit to Anonymous user No.453861032 + if(istype(target, /turf/simulated)) + var/turf/simulated/the_turf = target + var/datum/painting_utensil/p = new(user, src) + if (!the_turf.advanced_graffiti) + var/datum/custom_painting/advanced_graffiti = new(the_turf, 32, 32, base_color = "#00000000") + the_turf.advanced_graffiti = advanced_graffiti + the_turf.advanced_graffiti.interact(user, p) + return