Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit fe4c952

Browse files
cowbot92cowbot92
committed
Merge remote-tracking branch 'upstream/master' into PortsPsionics
2 parents 50ecbe0 + a495db7 commit fe4c952

File tree

191 files changed

+19232
-19415
lines changed

Some content is hidden

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

191 files changed

+19232
-19415
lines changed

‎_maps/RandomRuins/JungleRuins/jungleland_dead_bubblegum.dmm‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,33 @@
77
/obj/structure/stone_tile/block/cracked{
88
dir = 8
99
},
10-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
10+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
1111
/area/template_noop)
1212
"d" = (
1313
/obj/effect/decal/cleanable/blood/bubblegum,
1414
/obj/structure/stone_tile/block/cracked{
1515
dir = 1
1616
},
17-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
17+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
1818
/area/template_noop)
1919
"g" = (
2020
/obj/structure/stone_tile/block{
2121
dir = 1
2222
},
23-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
23+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
2424
/area/template_noop)
2525
"i" = (
2626
/obj/effect/decal/cleanable/blood/bubblegum,
2727
/obj/structure/stone_tile/surrounding/cracked,
2828
/obj/structure/stone_tile/surrounding_tile,
29-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
29+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
3030
/area/template_noop)
3131
"k" = (
3232
/obj/effect/decal/cleanable/blood/bubblegum,
3333
/obj/structure/stone_tile/block{
3434
dir = 4
3535
},
36-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
36+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
3737
/area/template_noop)
3838
"m" = (
3939
/obj/effect/decal/cleanable/blood/bubblegum,
@@ -44,13 +44,13 @@
4444
},
4545
/obj/structure/stone_tile/surrounding/cracked,
4646
/obj/structure/stone_tile/center/cracked,
47-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
47+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
4848
/area/template_noop)
4949
"p" = (
5050
/obj/effect/decal/cleanable/blood/bubblegum,
5151
/obj/structure/stone_tile/center/cracked,
5252
/obj/structure/stone_tile/surrounding/cracked,
53-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
53+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
5454
/area/template_noop)
5555
"r" = (
5656
/obj/effect/decal/cleanable/blood/bubblegum,
@@ -64,91 +64,91 @@
6464
/obj/structure/stone_tile/cracked{
6565
dir = 1
6666
},
67-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
67+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
6868
/area/template_noop)
6969
"s" = (
7070
/obj/effect/decal/cleanable/blood/bubblegum,
71-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
71+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
7272
/area/template_noop)
7373
"v" = (
7474
/obj/effect/decal/cleanable/blood/bubblegum,
7575
/obj/structure/stone_tile/block/cracked,
7676
/obj/structure/stone_tile/cracked{
7777
dir = 4
7878
},
79-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
79+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
8080
/area/template_noop)
8181
"z" = (
8282
/obj/effect/decal/cleanable/blood/bubblegum,
8383
/obj/effect/decal/cleanable/blood/bubblegum,
8484
/obj/structure/stone_tile/slab/cracked,
85-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
85+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
8686
/area/template_noop)
8787
"D" = (
8888
/mob/living/simple_animal/hostile/megafauna/bubblegum,
8989
/obj/effect/decal/cleanable/blood/bubblegum,
9090
/obj/effect/decal/cleanable/blood/bubblegum,
9191
/obj/structure/stone_tile/surrounding,
92-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
92+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
9393
/area/template_noop)
9494
"G" = (
9595
/obj/structure/stone_tile/slab,
96-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
96+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
9797
/area/template_noop)
9898
"H" = (
9999
/obj/effect/decal/cleanable/blood/bubblegum,
100100
/obj/effect/decal/cleanable/blood/bubblegum,
101101
/obj/structure/stone_tile/slab,
102-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
102+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
103103
/area/template_noop)
104104
"I" = (
105-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
105+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
106106
/area/template_noop)
107107
"L" = (
108108
/obj/structure/stone_tile/surrounding_tile{
109109
dir = 1
110110
},
111-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
111+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
112112
/area/template_noop)
113113
"N" = (
114114
/obj/structure/stone_tile/block/cracked{
115115
dir = 4
116116
},
117-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
117+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
118118
/area/template_noop)
119119
"Q" = (
120120
/obj/structure/stone_tile/block/cracked{
121121
dir = 8
122122
},
123-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
123+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
124124
/area/template_noop)
125125
"R" = (
126126
/obj/structure/stone_tile/block{
127127
dir = 4
128128
},
129-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
129+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
130130
/area/template_noop)
131131
"S" = (
132132
/obj/effect/decal/cleanable/blood/bubblegum,
133133
/obj/structure/stone_tile/slab/cracked,
134-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
134+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
135135
/area/template_noop)
136136
"T" = (
137137
/obj/structure/stone_tile/surrounding_tile{
138138
dir = 4
139139
},
140-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
140+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
141141
/area/template_noop)
142142
"X" = (
143143
/obj/structure/stone_tile/cracked{
144144
dir = 8
145145
},
146-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
146+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
147147
/area/template_noop)
148148
"Y" = (
149149
/obj/effect/decal/cleanable/blood/bubblegum,
150150
/obj/structure/stone_tile/slab,
151-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
151+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
152152
/area/template_noop)
153153

154154
(1,1,1) = {"

‎_maps/RandomRuins/JungleRuins/jungleland_dead_colossus.dmm‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,29 @@
44
/area/template_noop)
55
"b" = (
66
/obj/structure/stone_tile/slab,
7-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
7+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
88
/area/template_noop)
99
"c" = (
1010
/obj/structure/stone_tile/surrounding_tile{
1111
dir = 4
1212
},
1313
/obj/structure/stone_tile/surrounding_tile,
1414
/obj/structure/stone_tile/center,
15-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
15+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
1616
/area/template_noop)
1717
"g" = (
1818
/obj/structure/stone_tile/block{
1919
dir = 8
2020
},
2121
/obj/structure/stone_tile,
22-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
22+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
2323
/area/template_noop)
2424
"h" = (
25-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
25+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
2626
/area/template_noop)
2727
"l" = (
2828
/obj/effect/decal/cleanable/ash,
29-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
29+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
3030
/area/template_noop)
3131
"m" = (
3232
/obj/structure/stone_tile/block{
@@ -35,22 +35,22 @@
3535
/obj/structure/stone_tile/block{
3636
dir = 4
3737
},
38-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
38+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
3939
/area/template_noop)
4040
"o" = (
4141
/obj/structure/stone_tile/surrounding_tile,
4242
/obj/structure/stone_tile/surrounding_tile{
4343
dir = 4
4444
},
4545
/obj/structure/stone_tile/center,
46-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
46+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
4747
/area/template_noop)
4848
"p" = (
4949
/obj/structure/stone_tile/block,
5050
/obj/structure/stone_tile{
5151
dir = 1
5252
},
53-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
53+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
5454
/area/template_noop)
5555
"q" = (
5656
/obj/structure/stone_tile/block{
@@ -59,32 +59,32 @@
5959
/obj/structure/stone_tile{
6060
dir = 8
6161
},
62-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
62+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
6363
/area/template_noop)
6464
"u" = (
6565
/obj/structure/stone_tile{
6666
dir = 8
6767
},
6868
/obj/effect/decal/cleanable/molten_object/large,
69-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
69+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
7070
/area/template_noop)
7171
"v" = (
7272
/obj/structure/stone_tile{
7373
dir = 1
7474
},
75-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
75+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
7676
/area/template_noop)
7777
"w" = (
7878
/obj/structure/stone_tile/surrounding_tile{
7979
dir = 8
8080
},
81-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
81+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
8282
/area/template_noop)
8383
"x" = (
8484
/obj/structure/stone_tile/surrounding_tile{
8585
dir = 1
8686
},
87-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
87+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
8888
/area/template_noop)
8989
"y" = (
9090
/obj/structure/stone_tile/surrounding_tile{
@@ -94,13 +94,13 @@
9494
dir = 1
9595
},
9696
/obj/structure/stone_tile/center,
97-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
97+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
9898
/area/template_noop)
9999
"A" = (
100100
/obj/structure/stone_tile{
101101
dir = 4
102102
},
103-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
103+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
104104
/area/template_noop)
105105
"D" = (
106106
/obj/structure/stone_tile/surrounding_tile{
@@ -110,14 +110,14 @@
110110
dir = 8
111111
},
112112
/obj/structure/stone_tile/center,
113-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
113+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
114114
/area/template_noop)
115115
"E" = (
116116
/obj/structure/stone_tile/block,
117117
/obj/structure/stone_tile{
118118
dir = 4
119119
},
120-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
120+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
121121
/area/template_noop)
122122
"H" = (
123123
/obj/structure/stone_tile/block{
@@ -126,7 +126,7 @@
126126
/obj/structure/stone_tile{
127127
dir = 1
128128
},
129-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
129+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
130130
/area/template_noop)
131131
"I" = (
132132
/obj/structure/stone_tile/block{
@@ -135,31 +135,31 @@
135135
/obj/structure/stone_tile{
136136
dir = 8
137137
},
138-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
138+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
139139
/area/template_noop)
140140
"K" = (
141141
/obj/structure/stone_tile/surrounding,
142142
/obj/structure/stone_tile/center,
143143
/mob/living/simple_animal/hostile/megafauna/colossus,
144-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
144+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
145145
/area/template_noop)
146146
"L" = (
147147
/obj/structure/stone_tile/block,
148148
/obj/structure/stone_tile/block{
149149
dir = 1
150150
},
151-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
151+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
152152
/area/template_noop)
153153
"M" = (
154154
/obj/structure/stone_tile/block{
155155
dir = 4
156156
},
157-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
157+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
158158
/area/template_noop)
159159
"N" = (
160160
/obj/structure/stone_tile/surrounding_tile,
161161
/obj/effect/decal/cleanable/ash,
162-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
162+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
163163
/area/template_noop)
164164
"P" = (
165165
/obj/structure/stone_tile/block{
@@ -168,44 +168,44 @@
168168
/obj/structure/stone_tile{
169169
dir = 4
170170
},
171-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
171+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
172172
/area/template_noop)
173173
"R" = (
174174
/obj/structure/stone_tile,
175-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
175+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
176176
/area/template_noop)
177177
"S" = (
178178
/obj/structure/stone_tile/block{
179179
dir = 8
180180
},
181-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
181+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
182182
/area/template_noop)
183183
"T" = (
184184
/obj/structure/stone_tile/block,
185-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
185+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
186186
/area/template_noop)
187187
"W" = (
188188
/obj/structure/stone_tile/block{
189189
dir = 1
190190
},
191-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
191+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
192192
/area/template_noop)
193193
"X" = (
194194
/obj/structure/stone_tile/surrounding_tile{
195195
dir = 4
196196
},
197-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
197+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
198198
/area/template_noop)
199199
"Y" = (
200200
/obj/structure/stone_tile/block{
201201
dir = 1
202202
},
203203
/obj/structure/stone_tile,
204-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
204+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
205205
/area/template_noop)
206206
"Z" = (
207207
/obj/effect/decal/cleanable/molten_object/large,
208-
/turf/open/floor/plating/dirt/jungleland/dying_forest,
208+
/turf/open/floor/plating/dirt/jungleland/deep_sand,
209209
/area/template_noop)
210210

211211
(1,1,1) = {"

0 commit comments

Comments
 (0)