Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods

code/game/objects/effects/decals/cleanable/misc.dm

@@ -219,7 +219,7 @@
 	name = "stabilized plasma"
 	desc = "A puddle of stabilized plasma."
 	icon_state = "flour"
-	color = "#C8A5DC"
+	color = "#9e0089"
 
 /obj/effect/decal/cleanable/insectguts
 	name = "insect guts"

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

@@ -3,6 +3,7 @@
 	desc = "Graffiti. Damn kids."
 	icon = 'icons/effects/crayondecal.dmi'
 	icon_state = "rune1"
+	plane = GAME_PLANE //makes the graffiti visible over a wall.
 	gender = NEUTER
 	mergeable_decal = FALSE
 	var/do_icon_rotate = TRUE