Crayon rotation as a type var

code/game/objects/effects/decals/crayon.dm

@@ -5,20 +5,32 @@
 	icon_state = "rune1"
 	gender = NEUTER
 	var/do_icon_rotate = TRUE
+	var/rotation = 0
+	var/paint_colour = "#FFFFFF"
 
-/obj/effect/decal/cleanable/crayon/Initialize(mapload, main = "#FFFFFF", var/type = "rune1", var/e_name = "rune", var/rotation = 0, var/alt_icon = null)
+/obj/effect/decal/cleanable/crayon/Initialize(mapload, main, type, e_name, graf_rot, alt_icon = null)
 	. = ..()
 
-	name = e_name
+	if(e_name)
+		name = e_name
 	desc = "A [name] vandalizing the station."
 
 	if(alt_icon)
 		icon = alt_icon
-	icon_state = type
-
+	if(type)
+		icon_state = type
+	if(graf_rot)
+		rotation = graf_rot
 	if(rotation && do_icon_rotate)
 		var/matrix/M = matrix()
 		M.Turn(rotation)
 		src.transform = M
+<<<<<<< HEAD
 
 	add_atom_colour(main, FIXED_COLOUR_PRIORITY)
+=======
+	if(main)
+		paint_colour = main
+	add_atom_colour(paint_colour, FIXED_COLOUR_PRIORITY)
+
+>>>>>>> 8c3948b... Crayon rotation as a type var (#32441)