From d549641aec72785d690e0ca9cedaf019dd951f15 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Mon, 1 Jan 2018 19:58:59 -0500 Subject: [PATCH] allows multiple crayon decals on a single tile --- code/game/objects/effects/decals/crayon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/effects/decals/crayon.dm b/code/game/objects/effects/decals/crayon.dm index baad7136753..34263ef9a45 100644 --- a/code/game/objects/effects/decals/crayon.dm +++ b/code/game/objects/effects/decals/crayon.dm @@ -4,6 +4,7 @@ icon = 'icons/effects/crayondecal.dmi' icon_state = "rune1" gender = NEUTER + mergeable_decal = FALSE var/do_icon_rotate = TRUE var/rotation = 0 var/paint_colour = "#FFFFFF" @@ -27,4 +28,3 @@ if(main) paint_colour = main add_atom_colour(paint_colour, FIXED_COLOUR_PRIORITY) -