Mob Spawner Rework

_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm

@@ -608,7 +608,7 @@
 	dir = 9
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
+/obj/structure/spawner/burrow/lava_planet,
 /turf/open/floor/plasteel/white,
 /area/ruin/unpowered/winter_biodome/living_quarters)
 "fs" = (
@@ -896,7 +896,7 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
+/obj/structure/spawner/burrow/lava_planet,
 /turf/open/floor/plasteel/white,
 /area/ruin/unpowered/winter_biodome/living_quarters)
 "lq" = (
@@ -952,7 +952,7 @@
 "mD" = (
 /obj/effect/turf_decal/solgov/wood/center,
 /obj/effect/decal/cleanable/dirt/dust,
-/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
+/obj/structure/spawner/burrow/lava_planet,
 /turf/open/floor/wood,
 /area/ruin/unpowered/winter_biodome/living_quarters)
 "mX" = (
@@ -1081,7 +1081,7 @@
 	},
 /obj/effect/turf_decal/corner/opaque/solgovgold/diagonal,
 /obj/effect/decal/cleanable/dirt/dust,
-/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
+/obj/structure/spawner/burrow/lava_planet,
 /turf/open/floor/plasteel/white,
 /area/ruin/unpowered/winter_biodome/engineering)
 "qt" = (
@@ -1467,7 +1467,7 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/blood/gibs/up,
-/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
+/obj/structure/spawner/burrow/lava_planet,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 4
 	},
@@ -1925,7 +1925,7 @@
 /turf/open/floor/wood,
 /area/ruin/unpowered/winter_biodome/sauna)
 "Lf" = (
-/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
+/obj/structure/spawner/burrow/lava_planet,
 /turf/open/floor/grass/snow,
 /area/ruin/unpowered/winter_biodome)
 "Lt" = (

_maps/RandomRuins/LavaRuins/lavaland_surface_buried_shrine.dmm

@@ -542,7 +542,7 @@
 /area/ruin/unpowered/buried_shrine)
 "nq" = (
 /obj/structure/stone_tile/surrounding,
-/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
+/obj/structure/spawner/burrow/lava_planet,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/buried_shrine)
 "nz" = (
@@ -664,7 +664,7 @@
 	dir = 5
 	},
 /obj/structure/chair/wood,
-/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
+/obj/structure/spawner/burrow/lava_planet,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/buried_shrine)
 "qT" = (
@@ -931,7 +931,7 @@
 /area/ruin/unpowered/buried_shrine)
 "wM" = (
 /obj/structure/stone_tile/slab,
-/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
+/obj/structure/spawner/burrow/lava_planet,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/buried_shrine)
 "wS" = (
@@ -1647,7 +1647,7 @@
 /obj/structure/stone_tile/cracked{
 	dir = 1
 	},
-/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
+/obj/structure/spawner/burrow/lava_planet,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/buried_shrine)
 "QR" = (
@@ -1864,7 +1864,7 @@
 /obj/structure/stone_tile{
 	dir = 1
 	},
-/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
+/obj/structure/spawner/burrow/lava_planet,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface/lit,
 /area/ruin/unpowered/buried_shrine)
 "Xr" = (

_maps/RandomRuins/SpaceRuins/corporate_mining.dmm

@@ -1577,7 +1577,7 @@
 /turf/open/floor/plating/asteroid/airless,
 /area/ruin/space)
 "Iv" = (
-/obj/structure/spawner/mining/hivelord,
+/obj/structure/spawner/burrow/asteroid,
 /turf/open/floor/plating/asteroid/airless,
 /area/ruin/space)
 "IE" = (
@@ -2036,7 +2036,7 @@
 /turf/open/floor/plating/asteroid/airless,
 /area/ruin/space)
 "TO" = (
-/obj/structure/spawner/mining/goliath,
+/obj/structure/spawner/burrow/asteroid,
 /turf/open/floor/plating/asteroid/airless,
 /area/ruin/space)
 "TR" = (

_maps/RandomRuins/WasteRuins/wasteplanet_unhonorable.dmm

@@ -137,7 +137,7 @@
 /turf/open/floor/plating,
 /area/ruin/wasteplanet/wasteplanet_radiation/containment)
 "iT" = (
-/obj/structure/spawner/wasteplanet/hivebot/low_threat,
+/obj/structure/spawner/hivebot,
 /turf/open/floor/plating/asteroid/wasteplanet,
 /area/ruin/wasteplanet/wasteplanet_radiation)
 "jh" = (

code/__DEFINES/achievements.dm

@@ -28,7 +28,6 @@
 //Skill medal hub IDs
 #define MEDAL_LEGENDARY_MINER "Legendary Miner"
 
-
 //Boss medals
 
 // Medal hub IDs for boss medals (Pre-fixes)
@@ -40,10 +39,8 @@
 #define BOSS_MEDAL_DRAKE "Drake Killer"
 #define BOSS_MEDAL_HIEROPHANT "Hierophant Killer"
 #define BOSS_MEDAL_LEGION "Legion Killer"
-#define BOSS_MEDAL_TENDRIL "Tendril Exterminator"
-#define BOSS_MEDAL_SWARMERS "Swarmer Beacon Killer"
+#define BOSS_MEDAL_NEST "Nest Exterminator"
 #define BOSS_MEDAL_WENDIGO "Wendigo Killer"
-#define BOSS_MEDAL_KINGGOAT "King Goat Killer"
 
 #define BOSS_MEDAL_MINER_CRUSHER "Blood-drunk Miner Crusher"
 #define BOSS_MEDAL_FROSTMINER_CRUSHER "Demonic-frost Miner Crusher"
@@ -52,9 +49,7 @@
 #define BOSS_MEDAL_DRAKE_CRUSHER "Drake Crusher"
 #define BOSS_MEDAL_HIEROPHANT_CRUSHER "Hierophant Crusher"
 #define BOSS_MEDAL_LEGION_CRUSHER "Legion Crusher"
-#define BOSS_MEDAL_SWARMERS_CRUSHER "Swarmer Beacon Crusher"
 #define BOSS_MEDAL_WENDIGO_CRUSHER "Wendigo Crusher"
-#define BOSS_MEDAL_KINGGOAT_CRUSHER "King Goat Crusher"
 
 // Medal hub IDs for boss-kill scores
 #define BOSS_SCORE "Bosses Killed"
@@ -65,6 +60,5 @@
 #define DRAKE_SCORE "Drakes Killed"
 #define HIEROPHANT_SCORE "Hierophants Killed"
 #define LEGION_SCORE "Legion Killed"
-#define SWARMER_BEACON_SCORE "Swarmer Beacs Killed"
 #define WENDIGO_SCORE "Wendigos Killed"
-#define TENDRIL_CLEAR_SCORE "Tendrils Killed"
+#define NEST_CLEAR_SCORE "Nests Destroyed"

code/datums/achievements/boss_achievements.dm

@@ -2,10 +2,10 @@
 	category = "Bosses"
 	icon = "baseboss"
 
-/datum/award/achievement/boss/tendril_exterminator
-	name = "Tendril Exterminator"
+/datum/award/achievement/boss/nest_exterminator
+	name = "Nest Exterminator"
 	desc = "Watch your step"
-	database_id = BOSS_MEDAL_TENDRIL
+	database_id = BOSS_MEDAL_NEST
 	icon = "tendril"
 
 /datum/award/achievement/boss/boss_killer
@@ -55,23 +55,11 @@
 	database_id = BOSS_MEDAL_LEGION
 	icon = "legion"
 
-/datum/award/achievement/boss/swarmer_beacon_kill
-	name = "Swarm Beacon Killer"
-	desc = "GET THEM OFF OF ME!"
-	database_id = BOSS_MEDAL_SWARMERS
-	icon = "swarmer"
-
 /datum/award/achievement/boss/wendigo_kill
 	name = "Wendigo Killer"
 	desc = "You've now ruined years of mythical storytelling."
 	database_id = BOSS_MEDAL_WENDIGO
 
-/datum/award/achievement/boss/king_goat_kill
-	name = "King Goat Killer"
-	desc = "The king is dead, long live the king!"
-	database_id = BOSS_MEDAL_KINGGOAT
-	icon = "goatboss"
-
 /datum/award/achievement/boss/blood_miner_crusher
 	name = "Blood-drunk Miner Crusher"
 	desc = "I guess he couldn't handle his drink that well."
@@ -112,18 +100,7 @@
 	desc = "We were many... now we are none."
 	database_id = BOSS_MEDAL_LEGION_CRUSHER
 
-/datum/award/achievement/boss/swarmer_beacon_crusher
-	name = "Swarm Beacon Crusher"
-	desc = "GET THEM OFF OF ME!"
-	database_id = BOSS_MEDAL_SWARMERS_CRUSHER
-
 /datum/award/achievement/boss/wendigo_crusher
 	name = "Wendigo Crusher"
 	desc = "You've now ruined years of mythical storytelling."
 	database_id = BOSS_MEDAL_WENDIGO_CRUSHER
-
-/datum/award/achievement/boss/king_goat_crusher
-	name = "King Goat Crusher"
-	desc = "The king is dead, long live the king!"
-	database_id = BOSS_MEDAL_KINGGOAT_CRUSHER
-	icon = "goatboss"

code/datums/achievements/boss_scores.dm

@@ -1,7 +1,7 @@
-/datum/award/score/tendril_score
-	name = "Tendril Score"
+/datum/award/score/nest_score
+	name = "Nest Score"
 	desc = "Watch your step"
-	database_id = TENDRIL_CLEAR_SCORE
+	database_id = NEST_CLEAR_SCORE
 
 /datum/award/score/boss_score
 	name = "Bosses Killed"
@@ -43,11 +43,6 @@
 	desc = "You've killed HOW many?"
 	database_id = LEGION_SCORE
 
-/datum/award/score/swarmer_beacon_score
-	name = "Swarmer Beacons Killed"
-	desc = "You've killed HOW many?"
-	database_id = SWARMER_BEACON_SCORE
-
 /datum/award/score/wendigo_score
 	name = "Wendigos Killed"
 	desc = "You've killed HOW many?"

code/datums/components/chasm.dm

@@ -18,8 +18,6 @@
 		/obj/effect/hotspot,
 		/obj/effect/landmark,
 		/obj/effect/temp_visual,
-		/obj/effect/light_emitter/tendril,
-		/obj/effect/collapse,
 		/obj/effect/particle_effect/ion_trails,
 		/obj/effect/dummy/phased_mob,
 		/obj/effect/mapping_helpers,

code/datums/mapgen/planetary/AsteroidGenerator.dm

@@ -111,10 +111,8 @@
 	)
 
 	feature_spawn_list = list(
+		/obj/structure/spawner/burrow/asteroid = 3,
 		/obj/structure/geyser/random = 1,
-		/obj/structure/spawner/mining/goliath = 1,
-		/obj/structure/spawner/mining = 1,
-		/obj/structure/spawner/mining/hivelord = 1,
 		/obj/structure/vein/asteroid = 5,
 		/obj/structure/vein/classtwo/asteroid = 10,
 		/obj/structure/vein/classthree/asteroid = 5
@@ -161,7 +159,7 @@
 
 	feature_spawn_list = list(
 		/obj/structure/geyser/random = 5,
-		/obj/structure/spawner/mining/carp = 5,
+		/obj/structure/spawner/carp = 5,
 		/obj/structure/vein/asteroid = 10,
 		/obj/structure/vein/classtwo/asteroid = 15,
 		/obj/structure/vein/classthree/asteroid = 12

code/datums/mapgen/planetary/JungleGenerator.dm

@@ -180,7 +180,7 @@
 	feature_spawn_chance = 0.5
 	feature_spawn_list = list(
 		/obj/item/pickaxe/rusted = 1,
-		/obj/structure/spawner/ice_moon = 1,
+		/obj/structure/spawner/burrow/jungle_planet = 1,
 		/obj/effect/spawner/lootdrop/anomaly/jungle = 1
 	)
 

code/datums/mapgen/planetary/LavaGenerator.dm

@@ -120,9 +120,7 @@
 		/mob/living/simple_animal/hostile/asteroid/goliath/beast/ancient/crystal = 1,
 		/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/forgotten = 1,
 		/mob/living/simple_animal/hostile/asteroid/hivelord/legion/crystal = 1,
-		/obj/structure/spawner/lavaland/low_threat = 8,
-		/obj/structure/spawner/lavaland/medium_threat = 3,
-		/obj/structure/spawner/lavaland/high_threat = 1,
+		/obj/structure/spawner/burrow/lava_planet = 10
 	)
 
 /datum/biome/lavaland/forest
@@ -242,10 +240,7 @@
 		/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/random = 40,
 		/mob/living/simple_animal/hostile/asteroid/hivelord/legion/random = 30,
 		/mob/living/simple_animal/hostile/asteroid/goldgrub = 10,
-		/obj/structure/spawner/lavaland/low_threat = 8,
-		/obj/structure/spawner/lavaland/medium_threat = 3,
-		/obj/structure/spawner/lavaland/high_threat = 2,
-		/obj/structure/spawner/lavaland/extreme_threat = 1
+		/obj/structure/spawner/burrow/lava_planet = 10
 	)
 	flora_spawn_chance = 1
 	flora_spawn_list = list(

code/datums/mapgen/planetary/RockGenerator.dm

@@ -160,8 +160,8 @@
 		/obj/structure/vein/classtwo = 2,
 		/obj/structure/elite_tumor = 1,
 		/obj/structure/vein/classthree = 1,
+		/obj/structure/spawner/burrow/rock_plant = 4,
 		/obj/effect/spawner/minefield = 1,
-		/obj/structure/spawner/ice_moon/rockplanet = 4,
 		/obj/effect/spawner/lootdrop/anomaly/rock/cave = 1,
 	)
 	mob_spawn_chance = 6

code/datums/mapgen/planetary/SandGenerator.dm

@@ -217,9 +217,7 @@
 		/mob/living/simple_animal/hostile/asteroid/basilisk/whitesands = 40,
 		/mob/living/simple_animal/hostile/asteroid/hivelord/legion/random = 30,
 		/mob/living/simple_animal/hostile/asteroid/goldgrub = 20,
-		/obj/structure/spawner/lavaland/sand_world/low_threat = 14,
-		/obj/structure/spawner/lavaland/sand_world/medium_threat = 8,
-		/obj/structure/spawner/lavaland/sand_world/high_threat = 2,
+		/obj/structure/spawner/burrow/sand_planet = 25
 	)
 
 /datum/biome/cave/sand/volcanic