Merge remote-tracking branch 'origin/dev' into ofBotsAndMobs

code/game/objects/effects/landmarks.dm

@@ -79,6 +79,14 @@
 			xeno_spawn += loc
 			del(src)
 
+		if("endgame_exit")
+			endgame_safespawns += loc
+			del(src)
+
+		if("bluespacerift")
+			endgame_exits += loc
+			del(src)
+
 	landmarks_list += src
 	return 1
 

code/game/objects/effects/overlays.dm

@@ -3,6 +3,10 @@
 	unacidable = 1
 	var/i_attached//Added for possible image attachments to objects. For hallucinations and the like.
 
+/obj/effect/overlay/Destroy()
+	PlaceInPool(src)
+	return 1 //cancels the GCing
+
 /obj/effect/overlay/beam//Not actually a projectile, just an effect.
 	name="beam"
 	icon='icons/effects/beam.dmi'
@@ -31,4 +35,10 @@
 /obj/effect/overlay/coconut
 	name = "Coconuts"
 	icon = 'icons/misc/beach.dmi'
-	icon_state = "coconuts"
+	icon_state = "coconuts"
+
+/obj/effect/overlay/bluespacify
+	name = "Bluespace"
+	icon = 'icons/turf/space.dmi'
+	icon_state = "bluespacify"
+	layer = LIGHTING_LAYER