Merge pull request #826 from Overteh/Cringus16

Fix after merge (maps)

_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_ashwalker_shrine.dmm

@@ -530,7 +530,7 @@
 /area/ruin/unpowered/buried_shrine)
 "nq" = (
 /obj/structure/stone_tile/surrounding,
-/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
+/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/buried_shrine)
 "nP" = (
@@ -646,7 +646,7 @@
 	dir = 5
 	},
 /obj/structure/chair/wood,
-/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
+/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/buried_shrine)
 "qT" = (
@@ -908,7 +908,7 @@
 /area/ruin/unpowered/buried_shrine)
 "wM" = (
 /obj/structure/stone_tile/slab,
-/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
+/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/buried_shrine)
 "wS" = (
@@ -1569,7 +1569,7 @@
 /obj/structure/stone_tile/cracked{
 	dir = 1
 	},
-/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
+/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/buried_shrine)
 "QR" = (
@@ -1788,7 +1788,7 @@
 /obj/structure/stone_tile{
 	dir = 1
 	},
-/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
+/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface/lit,
 /area/ruin/unpowered/buried_shrine)
 "Xr" = (

_maps/_mod_celadon/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,
+/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
 /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,
+/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
 /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,
+/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
 /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,
+/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
 /turf/open/floor/plasteel/white,
 /area/ruin/unpowered/winter_biodome/engineering)
 "qt" = (
@@ -1467,10 +1467,10 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/blood/gibs/up,
-/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 4
 	},
+/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
 /turf/open/floor/wood,
 /area/ruin/unpowered/winter_biodome/entrance)
 "Ar" = (
@@ -1925,7 +1925,7 @@
 /turf/open/floor/wood,
 /area/ruin/unpowered/winter_biodome/sauna)
 "Lf" = (
-/mob/living/simple_animal/hostile/asteroid/hivelord/legion/tendril,
+/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
 /turf/open/floor/grass/snow,
 /area/ruin/unpowered/winter_biodome)
 "Lt" = (

_maps/_mod_celadon/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,
+/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
 /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,
+/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
 /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,
+/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
 /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,
+/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
 /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,
+/mob/living/simple_animal/hostile/asteroid/hivelord/legion/nest,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface/lit,
 /area/ruin/unpowered/buried_shrine)
 "Xr" = (

_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_dwarffortress.dmm

@@ -77,10 +77,6 @@
 /obj/effect/decal/cleanable/blood/old,
 /turf/open/floor/plating/asteroid/basalt,
 /area/overmap_encounter/planetoid/cave/explored)
-"sz" = (
-/obj/structure/spawner/lavaland/legion,
-/turf/open/floor/plating/asteroid/basalt,
-/area/overmap_encounter/planetoid/cave/explored)
 "sR" = (
 /obj/structure/fermenting_barrel,
 /turf/open/floor/plating/asteroid/basalt,
@@ -296,6 +292,7 @@
 /obj/effect/decal/cleanable/blood/old{
 	icon_state = "floor5-old"
 	},
+/mob/living/simple_animal/hostile/asteroid/hivelord/legion/dwarf,
 /turf/open/floor/plating/asteroid/basalt,
 /area/overmap_encounter/planetoid/cave/explored)
 
@@ -354,7 +351,7 @@ zY
 wm
 xR
 uW
-Ay
+GL
 Ay
 xi
 xi
@@ -374,7 +371,7 @@ Ay
 Dk
 xR
 Ay
-sz
+Ay
 Ay
 Ay
 xi
@@ -393,7 +390,7 @@ Dk
 XW
 Dk
 xR
-Ay
+GL
 Ay
 Zc
 Ay

_maps/_mod_celadon/RandomRuins/SpaceRuins/corporate_mining.dmm

@@ -1577,10 +1577,6 @@
 /mob/living/simple_animal/hostile/asteroid/hivelord,
 /turf/open/floor/plating/asteroid/airless,
 /area/ruin/space)
-"Iv" = (
-/obj/structure/spawner/mining/hivelord,
-/turf/open/floor/plating/asteroid/airless,
-/area/ruin/space)
 "IE" = (
 /obj/effect/decal/cleanable/blood/splatter,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
@@ -2037,7 +2033,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" = (
@@ -3622,7 +3618,7 @@ VM
 bl
 VM
 VM
-Iv
+TO
 Al
 VM
 kp
@@ -3825,7 +3821,7 @@ wi
 rr
 Al
 Al
-Iv
+TO
 VM
 VM
 VM

_maps/_mod_celadon/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" = (