Merge remote-tracking branch 'upstream/master' into universal-damage

# Conflicts:
#	code/modules/clothing/suits/labcoat.dm
#	code/modules/clothing/under/miscellaneous.dm
#	code/modules/mob/living/carbon/human/species/golem.dm
#	code/modules/mob/living/simple_animal/bot/ed209bot.dm

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

@@ -6,6 +6,7 @@
 	layer = MID_TURF_LAYER
 	plane = GAME_PLANE //makes the graffiti visible over a wall.
 	anchored = TRUE
+	mergeable_decal = FALSE // Allows crayon drawings to overlap one another.
 
 
 /obj/effect/decal/cleanable/crayon/Initialize(mapload, main = "#FFFFFF", var/type = "rune1", var/e_name = "rune")

code/game/objects/effects/landmarks.dm

@@ -20,9 +20,6 @@
 			wizardstart += loc
 			qdel(src)
 
-		if("avatarspawn")
-			avatarspawn += loc
-
 		if("JoinLate")
 			latejoin += loc
 			qdel(src)