diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_swarmer_crash.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_swarmer_crash.dmm
new file mode 100644
index 00000000000..30fb823af7b
--- /dev/null
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_swarmer_crash.dmm
@@ -0,0 +1,24 @@
+"a" = (/turf/template_noop,/area/template_noop)
+"b" = (/turf/closed/mineral/volcanic/lava_land_surface,/area/template_noop)
+"c" = (/turf/closed/wall/mineral/plastitanium{baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface},/area/ruin/unpowered)
+"d" = (/turf/open/floor/mineral/plastitanium/brig{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/unpowered)
+"e" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion"; dir = 8},/turf/template_noop,/area/ruin/unpowered)
+"f" = (/mob/living/simple_animal/hostile/megafauna/swarmer_swarm_beacon,/turf/open/floor/mineral/plastitanium/brig{baseturf = /turf/open/floor/plating/lava/smooth},/area/ruin/unpowered)
+
+(1,1,1) = {"
+aaaaaaaaaaaaaaa
+aaabbaaaaaaaaaa
+aaabbbbbaaaaaaa
+aabbbbbbbbbaaaa
+abbbbbbaaabbaaa
+bbbbbbcccaaacca
+abbbbcddddddcea
+acdaaadddddceaa
+aaddaaddfddceaa
+acddaddddddceaa
+aacbbcdddddacea
+abbbbacccccacca
+abbbbbbbbbbaaaa
+aaaabbbbbbbaaaa
+aaaaaaaabbaaaaa
+"}
diff --git a/code/datums/ruins/lavaland.dm b/code/datums/ruins/lavaland.dm
index fb07a531e3f..7f8ae53abe4 100644
--- a/code/datums/ruins/lavaland.dm
+++ b/code/datums/ruins/lavaland.dm
@@ -209,3 +209,11 @@
 	suffix = "lavaland_surface_hermit.dmm"
 	allow_duplicates = FALSE
 	cost = 10
+
+/datum/map_template/ruin/lavaland/swarmer_boss
+	name = "Crashed Shuttle"
+	id = "swarmerboss"
+	description = "A Syndicate shuttle had an unfortunate stowaway..."
+	suffix = "lavaland_surface_swarmer_crash.dmm"
+	allow_duplicates = FALSE
+	cost = 20
\ No newline at end of file
diff --git a/code/game/turfs/simulated/floor/plating/asteroid.dm b/code/game/turfs/simulated/floor/plating/asteroid.dm
index cd37653cd35..e2581e6c863 100644
--- a/code/game/turfs/simulated/floor/plating/asteroid.dm
+++ b/code/game/turfs/simulated/floor/plating/asteroid.dm
@@ -150,8 +150,8 @@
 /turf/open/floor/plating/asteroid/airless/cave
 	var/length = 100
 	var/mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/goldgrub = 1, /mob/living/simple_animal/hostile/asteroid/goliath = 5, /mob/living/simple_animal/hostile/asteroid/basilisk = 4, /mob/living/simple_animal/hostile/asteroid/hivelord = 3)
-	var/megafauna_spawn_list = list(/mob/living/simple_animal/hostile/megafauna/dragon = 4, /mob/living/simple_animal/hostile/megafauna/colossus = 2, \
-	/mob/living/simple_animal/hostile/megafauna/bubblegum = SPAWN_BUBBLEGUM, /mob/living/simple_animal/hostile/megafauna/swarmer_swarm_beacon = 2)
+	var/list/megafauna_spawn_list = list(/mob/living/simple_animal/hostile/megafauna/dragon = 4, /mob/living/simple_animal/hostile/megafauna/colossus = 2, \
+	/mob/living/simple_animal/hostile/megafauna/bubblegum = SPAWN_BUBBLEGUM)
 	var/flora_spawn_list = list(/obj/structure/flora/ash/leaf_shroom = 2 , /obj/structure/flora/ash/cap_shroom = 2 , /obj/structure/flora/ash/stem_shroom = 2 , /obj/structure/flora/ash/cacti = 1, /obj/structure/flora/ash/tall_shroom = 2)
 	var/sanity = 1
 	var/forward_cave_dir = 1
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index 6f0f34ad7bc..7193997d7fa 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -267,7 +267,6 @@
 	. = ..()
 	if(!ckey && !stat && search_objects < 3 && damage > 0)//Not unconscious, and we don't ignore mobs
 		if(search_objects)//Turn off item searching and ignore whatever item we were looking at, we're more concerned with fight or flight
-			search_objects = 0
 			target = null
 			LoseSearchObjects()
 		if(AIStatus == AI_IDLE)