Merge pull request #14083 from shellspeed1/alternative-xeno-hive

Removes the queen, and increases xeno variety in lavaland xenomorph ruin.

_maps/RandomRuins/LavaRuins/lavaland_surface_alien_nest.dmm

@@ -111,6 +111,17 @@
 /obj/structure/alien/resin/membrane,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/xenonest)
+"ax" = (
+/obj/structure/alien/weeds,
+/obj/effect/decal/cleanable/blood/gibs,
+/obj/structure/alien/weeds/node,
+/mob/living/simple_animal/hostile/alien/drone,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/ruin/unpowered/xenonest)
+"ay" = (
+/obj/structure/stone_tile/slab/cracked,
+/turf/open/indestructible/boss,
+/area/ruin/unpowered/xenonest)
 "aA" = (
 /obj/structure/alien/weeds,
 /obj/item/flamethrower,
@@ -130,6 +141,17 @@
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/xenonest)
+"aD" = (
+/obj/structure/stone_tile/surrounding_tile{
+	dir = 1
+	},
+/obj/structure/stone_tile/surrounding_tile,
+/obj/structure/stone_tile/surrounding_tile/cracked{
+	dir = 4
+	},
+/obj/structure/stone_tile/center,
+/turf/open/chasm/lavaland,
+/area/ruin/unpowered/xenonest)
 "aE" = (
 /obj/structure/alien/weeds,
 /obj/effect/decal/cleanable/ash,
@@ -160,6 +182,19 @@
 /obj/effect/decal/cleanable/blood,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/xenonest)
+"aK" = (
+/obj/structure/stone_tile/surrounding_tile/cracked{
+	dir = 4
+	},
+/obj/structure/stone_tile/surrounding_tile/cracked{
+	dir = 8
+	},
+/obj/structure/stone_tile/surrounding_tile/cracked{
+	dir = 1
+	},
+/obj/structure/stone_tile/center/cracked,
+/turf/open/chasm/lavaland,
+/area/ruin/unpowered/xenonest)
 "aL" = (
 /obj/structure/alien/weeds,
 /obj/item/tank/internals/plasma,
@@ -170,6 +205,26 @@
 /obj/effect/decal/cleanable/blood/xeno,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/xenonest)
+"aN" = (
+/obj/structure/stone_tile/block{
+	dir = 8
+	},
+/obj/structure/stone_tile{
+	dir = 1
+	},
+/obj/structure/stone_tile/cracked,
+/turf/open/indestructible/boss,
+/area/ruin/unpowered/xenonest)
+"aO" = (
+/obj/structure/alien/weeds,
+/obj/effect/mob_spawn/alien/corpse/humanoid/sentinel,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/ruin/unpowered/xenonest)
+"aP" = (
+/obj/structure/alien/weeds,
+/obj/effect/mob_spawn/alien/corpse/humanoid/hunter,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/ruin/unpowered/xenonest)
 "aQ" = (
 /obj/structure/alien/weeds,
 /obj/structure/bed/nest,
@@ -215,13 +270,6 @@
 /obj/effect/gibspawner/xeno,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/xenonest)
-"aY" = (
-/obj/structure/alien/weeds,
-/obj/effect/decal/cleanable/blood/gibs,
-/mob/living/simple_animal/hostile/alien/drone,
-/obj/structure/alien/weeds/node,
-/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/ruin/unpowered/xenonest)
 "aZ" = (
 /turf/closed/indestructible/riveted/boss,
 /area/ruin/unpowered/xenonest)
@@ -338,10 +386,6 @@
 /obj/structure/stone_tile,
 /turf/open/indestructible/boss,
 /area/ruin/unpowered/xenonest)
-"bm" = (
-/obj/structure/stone_tile/slab/cracked,
-/turf/open/indestructible/boss,
-/area/ruin/unpowered/xenonest)
 "bn" = (
 /obj/structure/stone_tile/block{
 	dir = 4
@@ -365,12 +409,6 @@
 /obj/structure/stone_tile/center,
 /turf/open/chasm/lavaland,
 /area/ruin/unpowered/xenonest)
-"bp" = (
-/obj/structure/stone_tile/block{
-	dir = 4
-	},
-/turf/open/chasm/lavaland,
-/area/ruin/unpowered/xenonest)
 "bq" = (
 /turf/open/chasm/lavaland,
 /area/ruin/unpowered/xenonest)
@@ -391,33 +429,6 @@
 	},
 /turf/open/chasm/lavaland,
 /area/ruin/unpowered/xenonest)
-"bt" = (
-/obj/structure/stone_tile/surrounding_tile{
-	dir = 1
-	},
-/obj/structure/stone_tile/surrounding_tile,
-/obj/structure/stone_tile/surrounding_tile/cracked{
-	dir = 4
-	},
-/obj/structure/stone_tile/center,
-/turf/open/chasm/lavaland,
-/area/ruin/unpowered/xenonest)
-"bu" = (
-/obj/structure/stone_tile/block/cracked{
-	dir = 1
-	},
-/turf/open/chasm/lavaland,
-/area/ruin/unpowered/xenonest)
-"bv" = (
-/obj/structure/stone_tile/block{
-	dir = 8
-	},
-/obj/structure/stone_tile{
-	dir = 1
-	},
-/obj/structure/stone_tile/cracked,
-/turf/open/indestructible/boss,
-/area/ruin/unpowered/xenonest)
 "bw" = (
 /obj/structure/stone_tile/cracked{
 	dir = 4
@@ -492,19 +503,6 @@
 /obj/structure/alien/weeds,
 /turf/template_noop,
 /area/ruin/unpowered/xenonest)
-"bE" = (
-/obj/structure/stone_tile/surrounding_tile/cracked{
-	dir = 4
-	},
-/obj/structure/stone_tile/surrounding_tile/cracked{
-	dir = 8
-	},
-/obj/structure/stone_tile/surrounding_tile/cracked{
-	dir = 1
-	},
-/obj/structure/stone_tile/center/cracked,
-/turf/open/chasm/lavaland,
-/area/ruin/unpowered/xenonest)
 "dE" = (
 /obj/structure/alien/weeds,
 /obj/structure/bed/nest,
@@ -514,6 +512,12 @@
 /obj/item/clothing/mask/facehugger/impregnated,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/xenonest)
+"gA" = (
+/obj/structure/alien/weeds,
+/obj/structure/bed/nest,
+/obj/effect/mob_spawn/alien/corpse/humanoid/sentinel,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/ruin/unpowered/xenonest)
 "iA" = (
 /obj/structure/alien/weeds,
 /obj/structure/bed/nest,
@@ -522,18 +526,24 @@
 /obj/item/clothing/mask/facehugger/impregnated,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/xenonest)
-"kp" = (
-/obj/structure/alien/weeds,
-/obj/item/reagent_containers/syringe/alien,
-/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/ruin/unpowered/xenonest)
 "lG" = (
 /obj/structure/alien/weeds,
 /obj/effect/mob_spawn/alien/corpse/humanoid/drone,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/xenonest)
-"pE" = (
+"lM" = (
-/obj/effect/mob_spawn/alien/corpse/humanoid/queen,
+/obj/structure/stone_tile/block{
+	dir = 4
+	},
+/turf/open/chasm/lavaland,
+/area/ruin/unpowered/xenonest)
+"nj" = (
+/obj/effect/mob_spawn/alien/corpse/humanoid/praetorian,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/ruin/unpowered/xenonest)
+"tY" = (
+/obj/structure/alien/weeds/node,
+/obj/effect/mob_spawn/alien/corpse/humanoid/hunter,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/xenonest)
 "wA" = (
@@ -546,12 +556,23 @@
 /mob/living/simple_animal/hostile/alien/sentinel,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/xenonest)
+"zj" = (
+/obj/structure/stone_tile/block/cracked{
+	dir = 1
+	},
+/turf/open/chasm/lavaland,
+/area/ruin/unpowered/xenonest)
 "Dd" = (
 /obj/structure/alien/weeds,
 /obj/effect/decal/cleanable/blood/gibs,
 /obj/item/storage/backpack/duffelbag/sec/surgery,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/xenonest)
+"Ha" = (
+/obj/structure/alien/weeds,
+/obj/item/reagent_containers/syringe/alien,
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
+/area/ruin/unpowered/xenonest)
 "JM" = (
 /obj/structure/alien/weeds/node,
 /obj/effect/mob_spawn/alien/corpse/humanoid/drone,
@@ -1075,7 +1096,7 @@ ac
 ac
 ac
 bi
-aY
+ax
 ac
 ac
 ac
@@ -1123,7 +1144,7 @@ an
 an
 ac
 ac
-am
+gA
 ac
 ac
 aJ
@@ -1278,10 +1299,10 @@ ac
 Dd
 ag
 ak
-ag
+aP
 af
 ac
-lG
+ag
 ac
 ac
 an
@@ -1357,7 +1378,7 @@ ab
 ac
 af
 ag
-ar
+tY
 lG
 ag
 ag
@@ -1511,7 +1532,7 @@ ac
 ah
 af
 ah
-JM
+ar
 Vi
 ak
 ag
@@ -1618,7 +1639,7 @@ ag
 wA
 ag
 ag
-pE
+nj
 ag
 at
 ag
@@ -1640,7 +1661,7 @@ ab
 aZ
 aZ
 aZ
-bm
+ay
 aZ
 aZ
 aZ
@@ -1718,7 +1739,7 @@ ah
 ar
 ah
 ak
-kp
+Ha
 at
 ag
 ag
@@ -1742,8 +1763,8 @@ ac
 aZ
 bc
 bj
-bp
+lM
-bt
+aD
 bx
 aZ
 ab
@@ -1794,7 +1815,7 @@ ba
 bd
 bk
 bq
-bu
+zj
 by
 aZ
 ab
@@ -1823,7 +1844,7 @@ ac
 ag
 ar
 ag
-ag
+aO
 ac
 ab
 ab
@@ -1845,7 +1866,7 @@ aZ
 be
 bo
 bs
-bE
+aK
 bz
 aZ
 ab
@@ -1896,7 +1917,7 @@ aZ
 bf
 bl
 br
-bv
+aN
 bA
 aZ
 ab

code/modules/ruins/lavalandruin_code/alien_nest.dm

@@ -5,6 +5,24 @@
 	name = "alien drone"
 	mob_name = "alien drone"
 
+/obj/effect/mob_spawn/alien/corpse/humanoid/hunter
+	mob_type = /mob/living/carbon/alien/humanoid/hunter
+	death = TRUE
+	name = "alien hunter"
+	mob_name = "alien hunter"
+
+/obj/effect/mob_spawn/alien/corpse/humanoid/sentinel
+	mob_type = /mob/living/carbon/alien/humanoid/sentinel
+	death = TRUE
+	name = "alien sentinel"
+	mob_name = "alien sentinel"
+
+/obj/effect/mob_spawn/alien/corpse/humanoid/praetorian
+	mob_type = /mob/living/carbon/alien/humanoid/royal/praetorian
+	death = TRUE
+	name = "alien praetorian"
+	mob_name = "alien praetorian"
+
 /obj/effect/mob_spawn/alien/corpse/humanoid/queen
 	mob_type = /mob/living/carbon/alien/humanoid/royal/queen
 	death = TRUE