Merge branch 'master' into mapsyncs43293845982

2018-01-07 20:23:00 +00:00
parent ca058b1266 cc0cb03046
commit d2ec28b1e6
29 changed files with 207 additions and 153 deletions
@@ -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"