Upstream

_maps/RandomRuins/LavaRuins/lavaland_surface_shuttle_wreckage.dmm

@@ -284,7 +284,7 @@
 /turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace,
 /area/ruin/unpowered)
 "KN" = (
-/obj/structure/spawner/lavaland/legion,
+/mob/living/basic/mining/tendril,
 /turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace,
 /area/ruin/unpowered)
 "Lz" = (

_maps/templates/lazy_templates/nukie_base.dmm

@@ -254,7 +254,7 @@
 /area/centcom/syndicate_mothership)
 "du" = (
 /obj/structure/chair/stool/directional/north,
-/obj/effect/landmark/start/nukeop,
+/obj/effect/landmark/start/nukeop_base,
 /obj/structure/sign/poster/contraband/donk_co/directional/south,
 /turf/open/floor/wood/tile,
 /area/centcom/syndicate_mothership/control)
@@ -1110,7 +1110,7 @@
 /turf/open/floor/mineral/plastitanium/red,
 /area/centcom/syndicate_mothership/expansion_bioterrorism)
 "my" = (
-/obj/effect/landmark/start/nukeop_leader,
+/obj/effect/landmark/start/nukeop_base/leader,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /turf/open/floor/iron,
 /area/centcom/syndicate_mothership/control)
@@ -1168,7 +1168,8 @@
 /obj/structure/fans/tiny,
 /obj/machinery/door/poddoor/shutters/syndicate{
 	id = "FBBZ1";
-	name = "Security Shutters"
+	name = "Security Shutters";
+	dir = 1
 	},
 /turf/open/floor/mineral/titanium,
 /area/centcom/syndicate_mothership/control)
@@ -1425,7 +1426,7 @@
 /obj/structure/chair/greyscale{
 	dir = 4
 	},
-/obj/effect/landmark/start/nukeop_overwatch,
+/obj/effect/landmark/start/nukeop_base/overwatch,
 /turf/open/floor/mineral/plastitanium,
 /area/centcom/syndicate_mothership)
 "pU" = (
@@ -1612,10 +1613,19 @@
 	},
 /obj/effect/turf_decal/siding/wideplating,
 /obj/machinery/door/poddoor/shutters/syndicate/indestructible{
-	name = "Subterrainian Cargo Lift"
+	name = "Base Lift";
+	dir = 1;
+	id_tag = "nukiespawnlift";
+	id = "nukiespawnlift"
 	},
 /turf/open/floor/iron/dark/textured_half,
 /area/centcom/syndicate_mothership/control)
+"rw" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 6
+	},
+/turf/open/floor/mineral/plastitanium/red,
+/area/centcom/syndicate_mothership/control)
 "rA" = (
 /obj/effect/turf_decal/siding/purple{
 	dir = 1
@@ -2016,6 +2026,12 @@
 /obj/effect/turf_decal/siding/thinplating_new/dark,
 /turf/open/floor/mineral/titanium,
 /area/centcom/syndicate_mothership/control)
+"we" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 5
+	},
+/turf/open/floor/mineral/plastitanium/red,
+/area/centcom/syndicate_mothership/control)
 "wg" = (
 /obj/structure/fence/corner{
 	dir = 6
@@ -2080,6 +2096,10 @@
 	dir = 8
 	},
 /area/centcom/syndicate_mothership/control)
+"wS" = (
+/obj/effect/landmark/nukeop_elevator/exterior,
+/turf/closed/indestructible/syndicate,
+/area/centcom/syndicate_mothership/control)
 "wW" = (
 /obj/structure/flora/rock/pile/style_random,
 /obj/effect/light_emitter{
@@ -2376,7 +2396,9 @@
 	},
 /obj/structure/fans/tiny,
 /obj/effect/turf_decal/tile/bar/opposingcorners,
-/obj/machinery/door/poddoor/shutters/syndicate,
+/obj/machinery/door/poddoor/shutters/syndicate{
+	dir = 1
+	},
 /turf/open/floor/iron,
 /area/centcom/syndicate_mothership/control)
 "AO" = (
@@ -2405,7 +2427,7 @@
 	icon_state = "map-left-MS";
 	pixel_y = 32
 	},
-/obj/effect/landmark/start/nukeop,
+/obj/effect/landmark/start/nukeop_base,
 /turf/open/floor/wood/tile,
 /area/centcom/syndicate_mothership/control)
 "AW" = (
@@ -2721,9 +2743,6 @@
 /obj/structure/flora/rock/icy/style_random,
 /turf/open/misc/asteroid/snow/icemoon,
 /area/centcom/syndicate_mothership/control)
-"Ev" = (
-/turf/open/floor/plating/elevatorshaft,
-/area/centcom/syndicate_mothership/control)
 "Ez" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/hidden/layer2,
@@ -3206,6 +3225,12 @@
 	},
 /turf/open/floor/iron/dark/textured_large,
 /area/centcom/syndicate_mothership/control)
+"Ja" = (
+/obj/machinery/light/small/red/directional/north{
+	allow_break_on_init = 0
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/centcom/syndicate_mothership/control)
 "Jc" = (
 /obj/structure/table/wood,
 /obj/machinery/chem_dispenser/drinks/beer{
@@ -3596,7 +3621,7 @@
 	dir = 8
 	},
 /obj/structure/chair/stool/directional/east,
-/obj/effect/landmark/start/nukeop,
+/obj/effect/landmark/start/nukeop_base,
 /turf/open/floor/wood/tile,
 /area/centcom/syndicate_mothership/control)
 "Nb" = (
@@ -3883,15 +3908,6 @@
 /obj/structure/flora/grass/both/style_random,
 /turf/open/misc/asteroid/snow/airless,
 /area/centcom/syndicate_mothership)
-"Qe" = (
-/obj/machinery/button/door/directional/south{
-	desc = "Looks like the elevator is under maintenance..";
-	name = "Elevator Button"
-	},
-/turf/open/floor/iron/smooth_half{
-	dir = 1
-	},
-/area/centcom/syndicate_mothership/control)
 "Qh" = (
 /obj/structure/window/reinforced/survival_pod/spawner/directional/south{
 	name = "Frosted Window"
@@ -4336,6 +4352,12 @@
 	},
 /turf/open/floor/wood/tile,
 /area/centcom/syndicate_mothership/control)
+"TH" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 10
+	},
+/turf/open/floor/mineral/plastitanium/red,
+/area/centcom/syndicate_mothership/control)
 "TK" = (
 /obj/structure/barricade/sandbags,
 /obj/effect/light_emitter{
@@ -4643,7 +4665,7 @@
 /area/centcom/syndicate_mothership)
 "Xu" = (
 /obj/structure/chair/stool/directional/west,
-/obj/effect/landmark/start/nukeop,
+/obj/effect/landmark/start/nukeop_base,
 /turf/open/floor/wood/tile,
 /area/centcom/syndicate_mothership/control)
 "Xv" = (
@@ -4726,6 +4748,12 @@
 	dir = 1
 	},
 /area/centcom/syndicate_mothership/control)
+"XZ" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 9
+	},
+/turf/open/floor/mineral/plastitanium/red,
+/area/centcom/syndicate_mothership/control)
 "Yd" = (
 /obj/machinery/camera/autoname/directional/south{
 	network = list("nukie")
@@ -6727,7 +6755,7 @@ sk
 DW
 RD
 EM
-RD
+EM
 RD
 Ox
 sU
@@ -9569,10 +9597,10 @@ ZZ
 Me
 wc
 wG
-Qe
+wG
 DZ
-Ev
-Ev
+Ja
+Ov
 DZ
 DZ
 nS
@@ -9673,9 +9701,9 @@ zH
 wG
 wG
 ru
-Ev
-Ev
-Ev
+XZ
+TH
+Ov
 DZ
 Ox
 Vm
@@ -9775,9 +9803,9 @@ zH
 wG
 wG
 ru
-Ev
-Ev
-Ev
+we
+rw
+Ov
 DZ
 Ox
 To
@@ -9877,8 +9905,8 @@ wc
 wG
 lE
 DZ
-Ev
-Ev
+Ja
+Ov
 DZ
 DZ
 Ox
@@ -9978,7 +10006,7 @@ go
 as
 wG
 wG
-DZ
+wS
 DZ
 DZ
 DZ

_maps/templates/lazy_templates/nukie_elevator.dmm

@@ -0,0 +1,100 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/indestructible/syndicate,
+/area/centcom/syndicate_mothership/control)
+"j" = (
+/obj/effect/landmark/start/nukeop_elevator,
+/obj/machinery/light/small/red/directional/north{
+	allow_break_on_init = 0
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/centcom/syndicate_mothership/control)
+"l" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 6
+	},
+/turf/open/floor/mineral/plastitanium/red,
+/area/centcom/syndicate_mothership/control)
+"s" = (
+/turf/open/floor/plating,
+/area/centcom/syndicate_mothership/control)
+"u" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 5
+	},
+/turf/open/floor/mineral/plastitanium/red,
+/area/centcom/syndicate_mothership/control)
+"w" = (
+/obj/effect/landmark/start/nukeop_elevator,
+/turf/open/floor/mineral/plastitanium,
+/area/centcom/syndicate_mothership/control)
+"F" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 10
+	},
+/turf/open/floor/mineral/plastitanium/red,
+/area/centcom/syndicate_mothership/control)
+"I" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 9
+	},
+/turf/open/floor/mineral/plastitanium/red,
+/area/centcom/syndicate_mothership/control)
+"T" = (
+/obj/effect/landmark/nukeop_elevator/interior,
+/turf/closed/indestructible/syndicate,
+/area/centcom/syndicate_mothership/control)
+"W" = (
+/obj/effect/turf_decal/siding/wideplating{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/wideplating,
+/obj/machinery/door/poddoor/shutters/syndicate/indestructible{
+	name = "Base Lift";
+	dir = 1
+	},
+/turf/open/floor/iron/dark/textured_half,
+/area/centcom/syndicate_mothership/control)
+
+(1,1,1) = {"
+a
+a
+a
+a
+s
+"}
+(2,1,1) = {"
+a
+j
+w
+a
+a
+"}
+(3,1,1) = {"
+W
+I
+F
+w
+a
+"}
+(4,1,1) = {"
+W
+u
+l
+w
+a
+"}
+(5,1,1) = {"
+a
+j
+w
+a
+a
+"}
+(6,1,1) = {"
+T
+a
+a
+a
+s
+"}

code/__DEFINES/ai/monsters.dm

@@ -52,6 +52,11 @@
 /// Key where goliath stores a hole it wants to get into
 #define BB_GOLIATH_HOLE_TARGET "BB_goliath_hole"
 
+// Tendril AI keys
+#define BB_TENDRIL_LASH "tendril_lash"
+#define BB_TENDRIL_CHASER "tendril_chaser"
+#define BB_TENDRIL_SPIKES "tendril_spikes"
+
 // bee keys
 ///the bee hive we live inside
 #define BB_CURRENT_HOME "BB_current_home"

code/__DEFINES/dcs/signals/signals_mining.dm

@@ -4,6 +4,9 @@
 /// Fired by a mob which has been grabbed by a goliath
 #define COMSIG_GOLIATH_TENTACLED_GRABBED "comsig_goliath_tentacle_grabbed"
 	#define COMPONENT_GOLIATH_CANCEL_TENTACLE_GRAB (1<<0)
+/// Fired by a mob which has been grabbed by a tendril
+#define COMSIG_TENDRIL_TENTACLED_GRABBED "comsig_tendril_tentacle_grabbed"
+	#define COMPONENT_TENDRIL_CANCEL_TENTACLE_GRAB (1<<0)
 /// Fired by a goliath tentacle which is returning to the earth
 #define COMSIG_GOLIATH_TENTACLE_RETRACTING 	"comsig_goliath_tentacle_retracting"
 /// Fired by a mob which has triggered a brimdust explosion from itself (not the mobs that get hit)

code/__DEFINES/lazy_templates.dm

@@ -1,3 +1,4 @@
+#define LAZY_TEMPLATE_KEY_NUKIEELEVATOR "LT_NUKIEELEVATOR"
 #define LAZY_TEMPLATE_KEY_NUKIEBASE "LT_NUKIEBASE"
 #define LAZY_TEMPLATE_KEY_WIZARDDEN "LT_WIZARDDEN"
 #define LAZY_TEMPLATE_KEY_NINJA_HOLDING_FACILITY "LT_NINJAHOLDING"
@@ -6,6 +7,7 @@
 #define LAZY_TEMPLATE_KEY_VOIDWALKER_VOID "LT_VOIDWALKERVOID"
 
 #define LAZY_TEMPLATE_KEY_LIST_ALL(...) list( \
+	"Nukie Elevator" = LAZY_TEMPLATE_KEY_NUKIEELEVATOR, \
 	"Nukie Base" = LAZY_TEMPLATE_KEY_NUKIEBASE, \
 	"Wizard Den" = LAZY_TEMPLATE_KEY_WIZARDDEN, \
 	"Ninja Holding" = LAZY_TEMPLATE_KEY_NINJA_HOLDING_FACILITY, \