Xeno landmark changes

code/game/gamemodes/colonialmarines/colonialmarines.dm

@@ -57,18 +57,6 @@
 	new /obj/structure/blocker/fog(loc, time_to_dispel)
 	qdel(src)
 
-/obj/effect/landmark/lv624/xeno_tunnel
-	name = "xeno tunnel"
-	icon_state = "xeno_tunnel"
-
-/obj/effect/landmark/lv624/xeno_tunnel/Initialize(mapload, ...)
-	. = ..()
-	GLOB.xeno_tunnels += src
-
-/obj/effect/landmark/lv624/xeno_tunnel/Destroy()
-	GLOB.xeno_tunnels -= src
-	return ..()
-
 ////////////////////////////////////////////////////////////////////////////////////////
 
 /* Pre-setup */
@@ -94,14 +82,6 @@
 		flags_round_type |= MODE_FOG_ACTIVATED
 
 	..()
-
-	var/obj/structure/tunnel/T
-	var/i = 0
-	var/turf/t
-	while(GLOB.xeno_tunnels.len && i++ < 3)
-		t = get_turf(pick_n_take(GLOB.xeno_tunnels))
-		T = new(t)
-		T.id = "hole[i]"
 	return TRUE
 
 ////////////////////////////////////////////////////////////////////////////////////////

code/game/objects/effects/landmarks/structure_spawners/setup_distress.dm

@@ -3,29 +3,107 @@
 	name = "abstract distress spawner"
 	mode_flags = MODE_INFESTATION
 
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall
+/obj/effect/landmark/structure_spawner/setup/distress/xeno
+	name = "abstract distress Xeno effects spawner"
+	var/hive_faction = XENO_HIVE_NORMAL
+
+///Sets the new item to the correct xeno faction
+/obj/effect/landmark/structure_spawner/setup/distress/xeno/proc/set_hive_faction(atom/xeno_item)
+	set_hive_data(xeno_item, hive_faction)
+
+/obj/effect/landmark/structure_spawner/setup/distress/xeno/apply(atom/target_location)
+	var/atom/xeno_item = ..()
+	if(!xeno_item)
+		return
+	if(!istypestrict(xeno_item, path_to_spawn))
+		return
+	set_hive_faction(xeno_item)
+
+/obj/effect/landmark/structure_spawner/setup/distress/xeno/wall
 	name = "Distress Xeno wall spawner"
 	icon_state = "wall"
 	path_to_spawn = /turf/closed/wall/resin
 	is_turf = TRUE
 
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_membrane
+/obj/effect/landmark/structure_spawner/setup/distress/xeno/wall/set_hive_faction(turf/closed/wall/resin/resin_wall)
+	. = ..()
+	resin_wall.hivenumber = hive_faction
+
+/obj/effect/landmark/structure_spawner/setup/distress/xeno/wall/thick
+	name = "Distress Xeno thick wall spawner"
+	path_to_spawn = /turf/closed/wall/resin/thick
+
+/obj/effect/landmark/structure_spawner/setup/distress/xeno/membrane
 	name = "Distress Xeno membrane spawner"
 	icon_state = "membrane"
 	path_to_spawn = /turf/closed/wall/resin/membrane
 	is_turf = TRUE
 
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_door
+/obj/effect/landmark/structure_spawner/setup/distress/xeno/membrane/set_hive_faction(turf/closed/wall/resin/membrane/resin_membrane)
+	. = ..()
+	resin_membrane.hivenumber = hive_faction
+
+/obj/effect/landmark/structure_spawner/setup/distress/xeno/membrane/thick
+	name = "Distress Xeno thick membrane spawner"
+	path_to_spawn = /turf/closed/wall/resin/membrane/thick
+
+/obj/effect/landmark/structure_spawner/setup/distress/xeno/door
 	name = "Distress Xeno door spawner"
 	icon_state = "door"
 	path_to_spawn = /obj/structure/mineral_door/resin
 
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest
-	name = "Distress Xeno nest spawner"
-	icon_state = "nest"
-	path_to_spawn = /obj/structure/bed/nest
+/obj/effect/landmark/structure_spawner/setup/distress/xeno/door/set_hive_faction(obj/structure/mineral_door/resin/resin_door)
+	. = ..()
+	resin_door.hivenumber = hive_faction
+
+/obj/effect/landmark/structure_spawner/setup/distress/xeno/door/thick
+	name = "Distress Xeno thick door spawner"
+	path_to_spawn = /obj/structure/mineral_door/resin/thick
 
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node
+/obj/effect/landmark/structure_spawner/setup/distress/xeno/weed_node
 	name = "Distress Xeno weed node spawner"
 	icon_state = "weednode"
 	path_to_spawn = /obj/effect/alien/weeds/node
+	///The minimum is_weedable required for the weeds to be planted normally
+	var/weed_strength_required = FULLY_WEEDABLE
+
+/obj/effect/landmark/structure_spawner/setup/distress/xeno/weed_node/set_hive_faction(obj/effect/alien/weeds/node/weed_node)
+	. = ..()
+	weed_node.hivenumber = hive_faction
+	weed_node.linked_hive = GLOB.hive_datum[hive_faction]
+
+/obj/effect/landmark/structure_spawner/setup/distress/xeno/weed_node/Initialize(mapload, ...)
+	. = ..()
+	if(!is_admin_level(z) && !is_ground_level(z) && !is_mainship_level(z) && !is_reserved_level(z)) //Is it a real area? for the create and destroy unit tests
+		return
+	var/turf/node_tile = loc
+	if(node_tile.is_weedable() >= weed_strength_required)
+		return
+	CRASH("[src] at [x],[y],[z] is on a turf where weeds cannot normally grow.")
+
+/obj/effect/landmark/structure_spawner/setup/distress/xeno/weed_node/hardy
+	name = "Distress Xeno hardy node spawner"
+	path_to_spawn = /obj/effect/alien/weeds/node/hardy
+	weed_strength_required = SEMI_WEEDABLE
+
+/obj/effect/landmark/structure_spawner/setup/distress/xeno/tunnel
+	name = "Distress Xeno tunnel spawner"
+	icon_state = "xeno_tunnel"
+	path_to_spawn = /obj/structure/tunnel
+
+/obj/effect/landmark/structure_spawner/setup/distress/xeno/tunnel/set_hive_faction(obj/structure/tunnel/tunnel)
+	. = ..()
+	tunnel.hivenumber = hive_faction
+
+/obj/effect/landmark/structure_spawner/setup/distress/xeno/tunnel/Initialize(mapload, ...)
+	. = ..()
+	if(!is_admin_level(z) && !is_ground_level(z) && !is_mainship_level(z) && !is_reserved_level(z)) //Is it a real area? for the create and destroy unit tests
+		return
+	var/turf/tunnel_tile = loc
+	if(tunnel_tile.can_dig_xeno_tunnel())
+		return
+	CRASH("[src] at [x],[y],[z] is on a turf where tunnels cannot normally be built.")
+
+/obj/effect/landmark/structure_spawner/setup/distress/xeno/tunnel/maintenance
+	name = "Distress Xeno maintenance tunnel spawner"
+	path_to_spawn = /obj/structure/tunnel/maint_tunnel

code/game/turfs/floor_types.dm

@@ -180,23 +180,21 @@
 /turf/open/floor/plating/plating_catwalk/shiva
 	icon = 'icons/turf/floors/ice_colony/shiva_floor.dmi'
 
-
-
 /turf/open/floor/plating/ironsand
 	name = "Iron Sand"
 
 /turf/open/floor/plating/ironsand/Initialize(mapload, ...)
 	. = ..()
 	icon_state = "ironsand[rand(1,15)]"
 
-
-
 /turf/open/floor/plating/catwalk
 	icon = 'icons/turf/floors/catwalks.dmi'
 	icon_state = "catwalk0"
 	name = "catwalk"
 	desc = "Cats really don't like these things."
 
+/turf/open/floor/plating/tunnelable //You can place a tunnel on these
+	name = "damaged plating"
 
 /turf/open/floor/almayer
 	icon = 'icons/turf/almayer.dmi'

code/game/turfs/turf.dm

@@ -666,6 +666,9 @@
 /turf/open/floor/corsat/can_dig_xeno_tunnel()
 	return TRUE
 
+/turf/open/floor/plating/tunnelable/can_dig_xeno_tunnel()
+	return TRUE
+
 /turf/closed/wall/almayer/research/containment/wall/divide/can_dig_xeno_tunnel()
 	return FALSE
 

code/modules/cm_aliens/structures/tunnel.dm

@@ -10,6 +10,7 @@
 	icon = 'icons/mob/xenos/effects.dmi'
 	icon_state = "hole"
 
+	health = 140
 	density = FALSE
 	opacity = FALSE
 	anchored = TRUE
@@ -23,8 +24,6 @@
 	var/hivenumber = XENO_HIVE_NORMAL
 	var/datum/hive_status/hive
 
-	health = 140
-	var/id = null //For mapping
 
 /obj/structure/tunnel/Initialize(mapload, h_number)
 	. = ..()

code/modules/cm_aliens/weeds.dm

@@ -586,6 +586,12 @@
 /obj/effect/alien/weeds/node/forsaken
 	hivenumber = XENO_HIVE_FORSAKEN
 
+/obj/effect/alien/weeds/node/hardy
+	name = "hardy resin node"
+	spread_on_semiweedable = TRUE
+	fruit_growth_multiplier = 0.8
+	weed_strength = WEED_LEVEL_HARDY
+
 /obj/effect/alien/weeds/node/pylon
 	health = WEED_HEALTH_HIVE
 	weed_strength = WEED_LEVEL_HIVE

code/modules/mob/living/carbon/xenomorph/mutators/strains/drone/gardener.dm

@@ -348,12 +348,7 @@
 	xeno_cooldown = 2 MINUTES
 	action_type = XENO_ACTION_CLICK
 	ability_primacy = XENO_PRIMARY_ACTION_2
-	node_type = /obj/effect/alien/weeds/node/gardener
-
-/obj/effect/alien/weeds/node/gardener
-	spread_on_semiweedable = TRUE
-	fruit_growth_multiplier = 0.8
-	weed_strength = WEED_LEVEL_HARDY
+	node_type = /obj/effect/alien/weeds/node/hardy
 
 /datum/action/xeno_action/verb/verb_plant_gardening_weeds()
 	set category = "Alien"