Skip to content

Commit 2b46074

Browse files
tgstation-ci[bot]tgstation-ci[bot]
committed
Merge remote-tracking branch 'upstream/master'
2 parents ed34cb3 + 7169c51 commit 2b46074

87 files changed

Lines changed: 1386 additions & 456 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎_maps/RandomRuins/LavaRuins/lavaland_surface_shuttle_wreckage.dmm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@
284284
/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace,
285285
/area/ruin/unpowered)
286286
"KN" = (
287-
/obj/structure/spawner/lavaland/legion,
287+
/mob/living/basic/mining/tendril,
288288
/turf/open/misc/asteroid/basalt/lava_land_surface/biome_replace,
289289
/area/ruin/unpowered)
290290
"Lz" = (

‎_maps/templates/lazy_templates/nukie_base.dmm‎

Lines changed: 62 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@
254254
/area/centcom/syndicate_mothership)
255255
"du" = (
256256
/obj/structure/chair/stool/directional/north,
257-
/obj/effect/landmark/start/nukeop,
257+
/obj/effect/landmark/start/nukeop_base,
258258
/obj/structure/sign/poster/contraband/donk_co/directional/south,
259259
/turf/open/floor/wood/tile,
260260
/area/centcom/syndicate_mothership/control)
@@ -1110,7 +1110,7 @@
11101110
/turf/open/floor/mineral/plastitanium/red,
11111111
/area/centcom/syndicate_mothership/expansion_bioterrorism)
11121112
"my" = (
1113-
/obj/effect/landmark/start/nukeop_leader,
1113+
/obj/effect/landmark/start/nukeop_base/leader,
11141114
/obj/effect/turf_decal/tile/bar/opposingcorners,
11151115
/turf/open/floor/iron,
11161116
/area/centcom/syndicate_mothership/control)
@@ -1168,7 +1168,8 @@
11681168
/obj/structure/fans/tiny,
11691169
/obj/machinery/door/poddoor/shutters/syndicate{
11701170
id = "FBBZ1";
1171-
name = "Security Shutters"
1171+
name = "Security Shutters";
1172+
dir = 1
11721173
},
11731174
/turf/open/floor/mineral/titanium,
11741175
/area/centcom/syndicate_mothership/control)
@@ -1425,7 +1426,7 @@
14251426
/obj/structure/chair/greyscale{
14261427
dir = 4
14271428
},
1428-
/obj/effect/landmark/start/nukeop_overwatch,
1429+
/obj/effect/landmark/start/nukeop_base/overwatch,
14291430
/turf/open/floor/mineral/plastitanium,
14301431
/area/centcom/syndicate_mothership)
14311432
"pU" = (
@@ -1612,10 +1613,19 @@
16121613
},
16131614
/obj/effect/turf_decal/siding/wideplating,
16141615
/obj/machinery/door/poddoor/shutters/syndicate/indestructible{
1615-
name = "Subterrainian Cargo Lift"
1616+
name = "Base Lift";
1617+
dir = 1;
1618+
id_tag = "nukiespawnlift";
1619+
id = "nukiespawnlift"
16161620
},
16171621
/turf/open/floor/iron/dark/textured_half,
16181622
/area/centcom/syndicate_mothership/control)
1623+
"rw" = (
1624+
/obj/effect/turf_decal/siding/thinplating_new/dark{
1625+
dir = 6
1626+
},
1627+
/turf/open/floor/mineral/plastitanium/red,
1628+
/area/centcom/syndicate_mothership/control)
16191629
"rA" = (
16201630
/obj/effect/turf_decal/siding/purple{
16211631
dir = 1
@@ -2016,6 +2026,12 @@
20162026
/obj/effect/turf_decal/siding/thinplating_new/dark,
20172027
/turf/open/floor/mineral/titanium,
20182028
/area/centcom/syndicate_mothership/control)
2029+
"we" = (
2030+
/obj/effect/turf_decal/siding/thinplating_new/dark{
2031+
dir = 5
2032+
},
2033+
/turf/open/floor/mineral/plastitanium/red,
2034+
/area/centcom/syndicate_mothership/control)
20192035
"wg" = (
20202036
/obj/structure/fence/corner{
20212037
dir = 6
@@ -2080,6 +2096,10 @@
20802096
dir = 8
20812097
},
20822098
/area/centcom/syndicate_mothership/control)
2099+
"wS" = (
2100+
/obj/effect/landmark/nukeop_elevator/exterior,
2101+
/turf/closed/indestructible/syndicate,
2102+
/area/centcom/syndicate_mothership/control)
20832103
"wW" = (
20842104
/obj/structure/flora/rock/pile/style_random,
20852105
/obj/effect/light_emitter{
@@ -2376,7 +2396,9 @@
23762396
},
23772397
/obj/structure/fans/tiny,
23782398
/obj/effect/turf_decal/tile/bar/opposingcorners,
2379-
/obj/machinery/door/poddoor/shutters/syndicate,
2399+
/obj/machinery/door/poddoor/shutters/syndicate{
2400+
dir = 1
2401+
},
23802402
/turf/open/floor/iron,
23812403
/area/centcom/syndicate_mothership/control)
23822404
"AO" = (
@@ -2405,7 +2427,7 @@
24052427
icon_state = "map-left-MS";
24062428
pixel_y = 32
24072429
},
2408-
/obj/effect/landmark/start/nukeop,
2430+
/obj/effect/landmark/start/nukeop_base,
24092431
/turf/open/floor/wood/tile,
24102432
/area/centcom/syndicate_mothership/control)
24112433
"AW" = (
@@ -2721,9 +2743,6 @@
27212743
/obj/structure/flora/rock/icy/style_random,
27222744
/turf/open/misc/asteroid/snow/icemoon,
27232745
/area/centcom/syndicate_mothership/control)
2724-
"Ev" = (
2725-
/turf/open/floor/plating/elevatorshaft,
2726-
/area/centcom/syndicate_mothership/control)
27272746
"Ez" = (
27282747
/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden,
27292748
/obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/hidden/layer2,
@@ -3206,6 +3225,12 @@
32063225
},
32073226
/turf/open/floor/iron/dark/textured_large,
32083227
/area/centcom/syndicate_mothership/control)
3228+
"Ja" = (
3229+
/obj/machinery/light/small/red/directional/north{
3230+
allow_break_on_init = 0
3231+
},
3232+
/turf/open/floor/mineral/plastitanium,
3233+
/area/centcom/syndicate_mothership/control)
32093234
"Jc" = (
32103235
/obj/structure/table/wood,
32113236
/obj/machinery/chem_dispenser/drinks/beer{
@@ -3596,7 +3621,7 @@
35963621
dir = 8
35973622
},
35983623
/obj/structure/chair/stool/directional/east,
3599-
/obj/effect/landmark/start/nukeop,
3624+
/obj/effect/landmark/start/nukeop_base,
36003625
/turf/open/floor/wood/tile,
36013626
/area/centcom/syndicate_mothership/control)
36023627
"Nb" = (
@@ -3883,15 +3908,6 @@
38833908
/obj/structure/flora/grass/both/style_random,
38843909
/turf/open/misc/asteroid/snow/airless,
38853910
/area/centcom/syndicate_mothership)
3886-
"Qe" = (
3887-
/obj/machinery/button/door/directional/south{
3888-
desc = "Looks like the elevator is under maintenance..";
3889-
name = "Elevator Button"
3890-
},
3891-
/turf/open/floor/iron/smooth_half{
3892-
dir = 1
3893-
},
3894-
/area/centcom/syndicate_mothership/control)
38953911
"Qh" = (
38963912
/obj/structure/window/reinforced/survival_pod/spawner/directional/south{
38973913
name = "Frosted Window"
@@ -4336,6 +4352,12 @@
43364352
},
43374353
/turf/open/floor/wood/tile,
43384354
/area/centcom/syndicate_mothership/control)
4355+
"TH" = (
4356+
/obj/effect/turf_decal/siding/thinplating_new/dark{
4357+
dir = 10
4358+
},
4359+
/turf/open/floor/mineral/plastitanium/red,
4360+
/area/centcom/syndicate_mothership/control)
43394361
"TK" = (
43404362
/obj/structure/barricade/sandbags,
43414363
/obj/effect/light_emitter{
@@ -4643,7 +4665,7 @@
46434665
/area/centcom/syndicate_mothership)
46444666
"Xu" = (
46454667
/obj/structure/chair/stool/directional/west,
4646-
/obj/effect/landmark/start/nukeop,
4668+
/obj/effect/landmark/start/nukeop_base,
46474669
/turf/open/floor/wood/tile,
46484670
/area/centcom/syndicate_mothership/control)
46494671
"Xv" = (
@@ -4726,6 +4748,12 @@
47264748
dir = 1
47274749
},
47284750
/area/centcom/syndicate_mothership/control)
4751+
"XZ" = (
4752+
/obj/effect/turf_decal/siding/thinplating_new/dark{
4753+
dir = 9
4754+
},
4755+
/turf/open/floor/mineral/plastitanium/red,
4756+
/area/centcom/syndicate_mothership/control)
47294757
"Yd" = (
47304758
/obj/machinery/camera/autoname/directional/south{
47314759
network = list("nukie")
@@ -6727,7 +6755,7 @@ sk
67276755
DW
67286756
RD
67296757
EM
6730-
RD
6758+
EM
67316759
RD
67326760
Ox
67336761
sU
@@ -9569,10 +9597,10 @@ ZZ
95699597
Me
95709598
wc
95719599
wG
9572-
Qe
9600+
wG
95739601
DZ
9574-
Ev
9575-
Ev
9602+
Ja
9603+
Ov
95769604
DZ
95779605
DZ
95789606
nS
@@ -9673,9 +9701,9 @@ zH
96739701
wG
96749702
wG
96759703
ru
9676-
Ev
9677-
Ev
9678-
Ev
9704+
XZ
9705+
TH
9706+
Ov
96799707
DZ
96809708
Ox
96819709
Vm
@@ -9775,9 +9803,9 @@ zH
97759803
wG
97769804
wG
97779805
ru
9778-
Ev
9779-
Ev
9780-
Ev
9806+
we
9807+
rw
9808+
Ov
97819809
DZ
97829810
Ox
97839811
To
@@ -9877,8 +9905,8 @@ wc
98779905
wG
98789906
lE
98799907
DZ
9880-
Ev
9881-
Ev
9908+
Ja
9909+
Ov
98829910
DZ
98839911
DZ
98849912
Ox
@@ -9978,7 +10006,7 @@ go
997810006
as
997910007
wG
998010008
wG
9981-
DZ
10009+
wS
998210010
DZ
998310011
DZ
998410012
DZ

‎_maps/templates/lazy_templates/nukie_elevator.dmm‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
2+
"a" = (
3+
/turf/closed/indestructible/syndicate,
4+
/area/centcom/syndicate_mothership/control)
5+
"j" = (
6+
/obj/effect/landmark/start/nukeop_elevator,
7+
/obj/machinery/light/small/red/directional/north{
8+
allow_break_on_init = 0
9+
},
10+
/turf/open/floor/mineral/plastitanium,
11+
/area/centcom/syndicate_mothership/control)
12+
"l" = (
13+
/obj/effect/turf_decal/siding/thinplating_new/dark{
14+
dir = 6
15+
},
16+
/turf/open/floor/mineral/plastitanium/red,
17+
/area/centcom/syndicate_mothership/control)
18+
"s" = (
19+
/turf/open/floor/plating,
20+
/area/centcom/syndicate_mothership/control)
21+
"u" = (
22+
/obj/effect/turf_decal/siding/thinplating_new/dark{
23+
dir = 5
24+
},
25+
/turf/open/floor/mineral/plastitanium/red,
26+
/area/centcom/syndicate_mothership/control)
27+
"w" = (
28+
/obj/effect/landmark/start/nukeop_elevator,
29+
/turf/open/floor/mineral/plastitanium,
30+
/area/centcom/syndicate_mothership/control)
31+
"F" = (
32+
/obj/effect/turf_decal/siding/thinplating_new/dark{
33+
dir = 10
34+
},
35+
/turf/open/floor/mineral/plastitanium/red,
36+
/area/centcom/syndicate_mothership/control)
37+
"I" = (
38+
/obj/effect/turf_decal/siding/thinplating_new/dark{
39+
dir = 9
40+
},
41+
/turf/open/floor/mineral/plastitanium/red,
42+
/area/centcom/syndicate_mothership/control)
43+
"T" = (
44+
/obj/effect/landmark/nukeop_elevator/interior,
45+
/turf/closed/indestructible/syndicate,
46+
/area/centcom/syndicate_mothership/control)
47+
"W" = (
48+
/obj/effect/turf_decal/siding/wideplating{
49+
dir = 1
50+
},
51+
/obj/effect/turf_decal/siding/wideplating,
52+
/obj/machinery/door/poddoor/shutters/syndicate/indestructible{
53+
name = "Base Lift";
54+
dir = 1
55+
},
56+
/turf/open/floor/iron/dark/textured_half,
57+
/area/centcom/syndicate_mothership/control)
58+
59+
(1,1,1) = {"
60+
a
61+
a
62+
a
63+
a
64+
s
65+
"}
66+
(2,1,1) = {"
67+
a
68+
j
69+
w
70+
a
71+
a
72+
"}
73+
(3,1,1) = {"
74+
W
75+
I
76+
F
77+
w
78+
a
79+
"}
80+
(4,1,1) = {"
81+
W
82+
u
83+
l
84+
w
85+
a
86+
"}
87+
(5,1,1) = {"
88+
a
89+
j
90+
w
91+
a
92+
a
93+
"}
94+
(6,1,1) = {"
95+
T
96+
a
97+
a
98+
a
99+
s
100+
"}

‎code/__DEFINES/ai/monsters.dm‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@
5252
/// Key where goliath stores a hole it wants to get into
5353
#define BB_GOLIATH_HOLE_TARGET "BB_goliath_hole"
5454

55+
// Tendril AI keys
56+
#define BB_TENDRIL_LASH "tendril_lash"
57+
#define BB_TENDRIL_CHASER "tendril_chaser"
58+
#define BB_TENDRIL_SPIKES "tendril_spikes"
59+
5560
// bee keys
5661
///the bee hive we live inside
5762
#define BB_CURRENT_HOME "BB_current_home"

‎code/__DEFINES/dcs/signals/signals_mining.dm‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
/// Fired by a mob which has been grabbed by a goliath
55
#define COMSIG_GOLIATH_TENTACLED_GRABBED "comsig_goliath_tentacle_grabbed"
66
#define COMPONENT_GOLIATH_CANCEL_TENTACLE_GRAB (1<<0)
7+
/// Fired by a mob which has been grabbed by a tendril
8+
#define COMSIG_TENDRIL_TENTACLED_GRABBED "comsig_tendril_tentacle_grabbed"
9+
#define COMPONENT_TENDRIL_CANCEL_TENTACLE_GRAB (1<<0)
710
/// Fired by a goliath tentacle which is returning to the earth
811
#define COMSIG_GOLIATH_TENTACLE_RETRACTING "comsig_goliath_tentacle_retracting"
912
/// Fired by a mob which has triggered a brimdust explosion from itself (not the mobs that get hit)

‎code/__DEFINES/lazy_templates.dm‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#define LAZY_TEMPLATE_KEY_NUKIEELEVATOR "LT_NUKIEELEVATOR"
12
#define LAZY_TEMPLATE_KEY_NUKIEBASE "LT_NUKIEBASE"
23
#define LAZY_TEMPLATE_KEY_WIZARDDEN "LT_WIZARDDEN"
34
#define LAZY_TEMPLATE_KEY_NINJA_HOLDING_FACILITY "LT_NINJAHOLDING"
@@ -6,6 +7,7 @@
67
#define LAZY_TEMPLATE_KEY_VOIDWALKER_VOID "LT_VOIDWALKERVOID"
78

89
#define LAZY_TEMPLATE_KEY_LIST_ALL(...) list( \
10+
"Nukie Elevator" = LAZY_TEMPLATE_KEY_NUKIEELEVATOR, \
911
"Nukie Base" = LAZY_TEMPLATE_KEY_NUKIEBASE, \
1012
"Wizard Den" = LAZY_TEMPLATE_KEY_WIZARDDEN, \
1113
"Ninja Holding" = LAZY_TEMPLATE_KEY_NINJA_HOLDING_FACILITY, \

0 commit comments

Comments
 (0)