Merge branch 'master' into familyport

2022-02-11 14:04:57 -05:00
parent 632b1b36cc e25aa3cf61
commit f1ca283318
1209 changed files with 276175 additions and 55667 deletions
@@ -759,6 +759,8 @@

 	if(isobj(target) && !istype(target, /obj/effect/decal/cleanable/crayon/gang))
 		if(actually_paints)
+			if(istype(target, /obj/item/canvas)) //dont color our canvas neon green when im trying to paint please
+				return
 			var/list/hsl = rgb2hsl(hex2num(copytext(paint_color,2,4)),hex2num(copytext(paint_color,4,6)),hex2num(copytext(paint_color,6,8)))
 			var/static/whitelisted = typecacheof(list(/obj/structure/window,
 										/obj/effect/decal/cleanable/crayon,