Merge branch 'master' of https://github.com/tgstation/-tg-station into revert_revert_revert_come_on_revert_please_rever_please_shit_REVERT_JESUS_TAPDANCING_CHRIST_REVERT_YOU_FUCKING_PIECE_OF_GODDAMN_PISS

Conflicts:
	code/_onclick/hud/plane_master.dm
	code/modules/lighting/lighting_object.dm

code/game/objects/effects/anomalies.dm

@@ -126,6 +126,7 @@
 	density = 1
 	var/canshock = 0
 	var/shockdamage = 20
+	var/explosive = 1
 
 /obj/effect/anomaly/flux/New()
 	..()
@@ -162,7 +163,10 @@
 		"<span class='italics'>You hear a heavy electrical crack.</span>")
 
 /obj/effect/anomaly/flux/detonate()
-	explosion(src, 1, 4, 16, 18) //Low devastation, but hits a lot of stuff.
+	if(explosive)
+		explosion(src, 1, 4, 16, 18) //Low devastation, but hits a lot of stuff.
+	else
+		new /obj/effect/particle_effect/sparks(loc)
 
 
 /////////////////////

code/game/objects/effects/glowshroom.dm

@@ -122,6 +122,8 @@ var/list/blacklisted_glowshroom_turfs = typecacheof(list(
 			shrooms_planted++
 
 			CHECK_TICK
+		else
+			shrooms_planted++ //if we failed due to generation, don't try to plant one later
 	if(shrooms_planted < myseed.yield) //if we didn't get all possible shrooms planted, try again later
 		myseed.yield -= shrooms_planted
 		addtimer(CALLBACK(src, .proc/Spread), delay)

code/game/objects/effects/portals.dm

@@ -36,8 +36,7 @@
 		qdel(src)
 		return
 	if(lifespan > 0)
-		spawn(lifespan)
-			qdel(src)
+		QDEL_IN(src, lifespan)
 
 /obj/effect/portal/Destroy()
 	portals -= src

code/game/objects/effects/spawners/lootdrop.dm

@@ -188,3 +188,9 @@
 		/obj/item/organ/body_egg/alien_embryo = 1,
 		/obj/item/organ/hivelord_core = 2)
 	lootcount = 3
+
+/obj/effect/spawner/lootdrop/two_percent_xeno_egg_spawner
+	name = "2% chance xeno egg spawner"
+	loot = list(
+		/obj/effect/decal/remains/xeno = 49,
+		/obj/effect/spawner/xeno_egg_delivery = 1)

code/game/objects/effects/spawners/xeno_egg_delivery.dm

@@ -0,0 +1,20 @@
+/obj/effect/spawner/xeno_egg_delivery
+	name = "xeno egg delivery"
+	icon = 'icons/mob/alien.dmi'
+	icon_state = "egg_growing"
+	var/announcement_time = 1200
+
+/obj/effect/spawner/xeno_egg_delivery/Initialize(mapload)
+	..()
+	var/turf/T = get_turf(src)
+	var/area/A = get_area(T)
+
+	new /obj/structure/alien/egg(T)
+	new /obj/effect/overlay/temp/gravpush(T)
+	playsound(T, 'sound/items/party_horn.ogg', 50, 1, -1)
+
+	message_admins("An alien egg has been delivered to [A] at [ADMIN_COORDJMP(T)].")
+	log_game("An alien egg has been delivered to [A] at [COORD(T)]")
+	var/message = "Attention [station_name()], we have entrusted you with a research specimen in [A]. Remember to follow all safety precautions when dealing with the specimen."
+	addtimer(CALLBACK(GLOBAL_PROC, /.proc/print_command_report, message), announcement_time)
+	qdel(src)