Skip to content

Commit ec0f4b2

Browse files
dageavtobusnickactions-user
dageavtobusnick
and
actions-user
authored
Обновление электролизатора + Атмосфера лаваленда [MDB IGNORE] (#8788)
* Обновление электролизатора + Атмосфера лаваленда * фикс * Build Rust library * фикс * фикс * фикс линтера --------- Co-authored-by: Rust Builder <action@github.com>
1 parent da4d206 commit ec0f4b2

File tree

79 files changed

+1973
-2842
lines changed

Some content is hidden

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

79 files changed

+1973
-2842
lines changed

‎_maps/map_files/Delta/delta.dmm‎

Lines changed: 6 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,13 +1256,7 @@
12561256
/obj/machinery/light/small,
12571257
/obj/machinery/atmospherics/pipe/manifold/hidden,
12581258
/obj/effect/decal/remains/mouse/Pinkie,
1259-
/turf/simulated/floor/bluegrid{
1260-
icon_state = "dark";
1261-
name = "Mainframe Floor";
1262-
nitrogen = 100;
1263-
oxygen = 0;
1264-
temperature = 80
1265-
},
1259+
/turf/simulated/floor/bluegrid/telecomms/mainframe,
12661260
/area/toxins/server)
12671261
"aml" = (
12681262
/obj/machinery/navbeacon{
@@ -31591,13 +31585,7 @@
3159131585
/obj/machinery/atmospherics/pipe/simple/hidden{
3159231586
dir = 9
3159331587
},
31594-
/turf/simulated/floor/bluegrid{
31595-
icon_state = "gcircuit";
31596-
name = "Mainframe Floor";
31597-
nitrogen = 100;
31598-
oxygen = 0;
31599-
temperature = 80
31600-
},
31588+
/turf/simulated/floor/bluegrid/telecomms/mainframe/gcircuit,
3160131589
/area/toxins/server)
3160231590
"dyI" = (
3160331591
/obj/effect/decal/warning_stripes/southeast,
@@ -82895,13 +82883,7 @@
8289582883
pressure_checks = 0;
8289682884
releasing = 0
8289782885
},
82898-
/turf/simulated/floor/bluegrid{
82899-
icon_state = "gcircuit";
82900-
name = "Mainframe Floor";
82901-
nitrogen = 100;
82902-
oxygen = 0;
82903-
temperature = 80
82904-
},
82886+
/turf/simulated/floor/bluegrid/telecomms/mainframe/gcircuit,
8290582887
/area/toxins/server)
8290682888
"oyI" = (
8290782889
/obj/structure/disposalpipe/segment{
@@ -125857,13 +125839,7 @@
125857125839
/obj/machinery/atmospherics/pipe/simple/hidden{
125858125840
dir = 5
125859125841
},
125860-
/turf/simulated/floor/bluegrid{
125861-
icon_state = "gcircuit";
125862-
name = "Mainframe Floor";
125863-
nitrogen = 100;
125864-
oxygen = 0;
125865-
temperature = 80
125866-
},
125842+
/turf/simulated/floor/bluegrid/telecomms/mainframe/gcircuit,
125867125843
/area/toxins/server)
125868125844
"xSX" = (
125869125845
/obj/structure/window/reinforced{
@@ -125902,13 +125878,7 @@
125902125878
on = 1;
125903125879
pressure_checks = 0
125904125880
},
125905-
/turf/simulated/floor/bluegrid{
125906-
icon_state = "gcircuit";
125907-
name = "Mainframe Floor";
125908-
nitrogen = 100;
125909-
oxygen = 0;
125910-
temperature = 80
125911-
},
125881+
/turf/simulated/floor/bluegrid/telecomms/mainframe/gcircuit,
125912125882
/area/toxins/server)
125913125883
"xTp" = (
125914125884
/obj/structure/sign/poster/official/random{
@@ -127582,13 +127552,7 @@
127582127552
/area/engineering/engine)
127583127553
"yjC" = (
127584127554
/obj/machinery/atmospherics/pipe/simple/hidden,
127585-
/turf/simulated/floor/bluegrid{
127586-
icon_state = "dark";
127587-
name = "Mainframe Floor";
127588-
nitrogen = 100;
127589-
oxygen = 0;
127590-
temperature = 80
127591-
},
127555+
/turf/simulated/floor/bluegrid/telecomms/mainframe,
127592127556
/area/toxins/server)
127593127557
"yjD" = (
127594127558
/obj/machinery/disposal,

‎_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_1.dmm‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,8 @@
55
},
66
/area/lavaland/surface/outdoors/unexplored/danger)
77
"b" = (
8-
/turf/simulated/floor/clockwork{
9-
baseturf = /turf/simulated/floor/lava/lava_land_surface;
10-
temperature = 300;
11-
oxygen = 14;
12-
nitrogen = 23
8+
/turf/simulated/floor/clockwork/lavaland_air{
9+
baseturf = /turf/simulated/floor/lava/lava_land_surface
1310
},
1411
/area/lavaland/surface/outdoors/unexplored/danger)
1512
"c" = (

‎_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_2.dmm‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,8 @@
55
},
66
/area/lavaland/surface/outdoors/unexplored/danger)
77
"b" = (
8-
/turf/simulated/floor/engine/cult{
9-
baseturf = /turf/simulated/floor/lava/lava_land_surface;
10-
nitrogen = 23;
11-
temperature = 300;
12-
oxygen = 14
8+
/turf/simulated/floor/engine/cult/lavaland_air{
9+
baseturf = /turf/simulated/floor/lava/lava_land_surface
1310
},
1411
/area/lavaland/surface/outdoors/unexplored/danger)
1512
"c" = (

‎_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_5.dmm‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,7 @@
88
/turf/template_noop,
99
/area/lavaland/surface/outdoors/unexplored/danger)
1010
"C" = (
11-
/turf/simulated/floor/wood/cold{
12-
baseturf = /turf/simulated/floor/lava/lava_land_surface;
13-
oxygen = 14;
14-
nitrogen = 23;
15-
temperature = 300
16-
},
11+
/turf/simulated/floor/wood/lavaland_air,
1712
/area/lavaland/surface/outdoors/unexplored/danger)
1813

1914
(1,1,1) = {"

‎_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_1.dmm‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,8 @@
55
},
66
/area/lavaland/surface/outdoors/unexplored/danger)
77
"b" = (
8-
/turf/simulated/floor/clockwork{
9-
baseturf = /turf/simulated/floor/lava/lava_land_surface;
10-
temperature = 300;
11-
oxygen = 14;
12-
nitrogen = 23
8+
/turf/simulated/floor/clockwork/lavaland_air{
9+
baseturf = /turf/simulated/floor/lava/lava_land_surface
1310
},
1411
/area/lavaland/surface/outdoors/unexplored/danger)
1512
"c" = (

‎_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_2.dmm‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,8 @@
55
},
66
/area/lavaland/surface/outdoors/unexplored/danger)
77
"b" = (
8-
/turf/simulated/floor/engine/cult{
9-
baseturf = /turf/simulated/floor/lava/lava_land_surface;
10-
nitrogen = 23;
11-
temperature = 300;
12-
oxygen = 14
8+
/turf/simulated/floor/engine/cult/lavaland_air{
9+
baseturf = /turf/simulated/floor/lava/lava_land_surface
1310
},
1411
/area/lavaland/surface/outdoors/unexplored/danger)
1512
"c" = (

‎_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_5.dmm‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,7 @@
33
/turf/template_noop,
44
/area/lavaland/surface/outdoors/unexplored/danger)
55
"q" = (
6-
/turf/simulated/floor/wood/cold{
7-
baseturf = /turf/simulated/floor/lava/lava_land_surface;
8-
oxygen = 14;
9-
nitrogen = 23;
10-
temperature = 300
11-
},
6+
/turf/simulated/floor/wood/lavaland_air,
127
/area/lavaland/surface/outdoors/unexplored/danger)
138
"y" = (
149
/turf/simulated/wall/mineral/wood/nonmetal{

‎_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -226,11 +226,11 @@
226226
/obj/structure/stone_tile/surrounding_tile{
227227
dir = 8
228228
},
229-
/turf/simulated/floor/lava,
229+
/turf/simulated/floor/lava/lava_land_surface/lava_only,
230230
/area/ruin/unpowered/ash_walkers)
231231
"aI" = (
232232
/obj/structure/stone_tile/block/cracked,
233-
/turf/simulated/floor/lava,
233+
/turf/simulated/floor/lava/lava_land_surface/lava_only,
234234
/area/ruin/unpowered/ash_walkers)
235235
"aJ" = (
236236
/obj/structure/stone_tile/surrounding_tile/cracked,
@@ -241,7 +241,7 @@
241241
/obj/structure/stone_tile/surrounding_tile{
242242
dir = 8
243243
},
244-
/turf/simulated/floor/lava,
244+
/turf/simulated/floor/lava/lava_land_surface/lava_only,
245245
/area/ruin/unpowered/ash_walkers)
246246
"aM" = (
247247
/obj/structure/stone_tile/cracked{
@@ -298,17 +298,17 @@
298298
/obj/structure/stone_tile/block/cracked{
299299
dir = 4
300300
},
301-
/turf/simulated/floor/lava,
301+
/turf/simulated/floor/lava/lava_land_surface/lava_only,
302302
/area/ruin/unpowered/ash_walkers)
303303
"aU" = (
304304
/obj/structure/lavaland/ash_walker,
305-
/turf/simulated/floor/lava,
305+
/turf/simulated/floor/lava/lava_land_surface/lava_only,
306306
/area/ruin/unpowered/ash_walkers)
307307
"aV" = (
308308
/obj/structure/stone_tile/block{
309309
dir = 8
310310
},
311-
/turf/simulated/floor/lava,
311+
/turf/simulated/floor/lava/lava_land_surface/lava_only,
312312
/area/ruin/unpowered/ash_walkers)
313313
"aW" = (
314314
/obj/structure/stone_tile/block{
@@ -365,13 +365,13 @@
365365
/obj/structure/stone_tile/surrounding_tile{
366366
dir = 1
367367
},
368-
/turf/simulated/floor/lava,
368+
/turf/simulated/floor/lava/lava_land_surface/lava_only,
369369
/area/ruin/unpowered/ash_walkers)
370370
"be" = (
371371
/obj/structure/stone_tile/block{
372372
dir = 1
373373
},
374-
/turf/simulated/floor/lava,
374+
/turf/simulated/floor/lava/lava_land_surface/lava_only,
375375
/area/ruin/unpowered/ash_walkers)
376376
"bf" = (
377377
/obj/structure/stone_tile/surrounding_tile/cracked{
@@ -384,7 +384,7 @@
384384
/obj/structure/stone_tile/surrounding_tile{
385385
dir = 4
386386
},
387-
/turf/simulated/floor/lava,
387+
/turf/simulated/floor/lava/lava_land_surface/lava_only,
388388
/area/ruin/unpowered/ash_walkers)
389389
"bg" = (
390390
/obj/structure/stone_tile/block{

0 commit comments

Comments
 (0)