Skip to content

Commit

Permalink
Merge branch 'master220' into SpaceRuinAstroak
Browse files Browse the repository at this point in the history
  • Loading branch information
@KA8EP
KA8EP authored Jul 26, 2024
2 parents 22d053f + d6e0e8b commit 8ef6dad
Show file tree
Hide file tree
Showing 830 changed files with 23,802 additions and 28,571 deletions.
140 changes: 70 additions & 70 deletions _maps/map_files/Delta/Lavaland.dmm
View file

Large diffs are not rendered by default.

174 changes: 73 additions & 101 deletions _maps/map_files/Delta/delta.dmm
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions _maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_1.dmm
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/simulated/wall/clockwork{
baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface
baseturf = /turf/simulated/floor/lava/lava_land_surface
},
/area/lavaland/surface/outdoors/unexplored/danger)
"b" = (
/turf/simulated/floor/clockwork{
baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface;
baseturf = /turf/simulated/floor/lava/lava_land_surface;
temperature = 300;
oxygen = 14;
nitrogen = 23
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_2.dmm
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/simulated/wall/cult{
baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface
baseturf = /turf/simulated/floor/lava/lava_land_surface
},
/area/lavaland/surface/outdoors/unexplored/danger)
"b" = (
/turf/simulated/floor/engine/cult{
baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface;
baseturf = /turf/simulated/floor/lava/lava_land_surface;
nitrogen = 23;
temperature = 300;
oxygen = 14
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_3.dmm
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/simulated/wall/cult{
baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface
baseturf = /turf/simulated/floor/lava/lava_land_surface
},
/area/lavaland/surface/outdoors/unexplored/danger)
"b" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_4.dmm
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/simulated/wall/indestructible/hierophant{
baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface
baseturf = /turf/simulated/floor/lava/lava_land_surface
},
/area/lavaland/surface/outdoors/unexplored/danger)
"b" = (
/turf/simulated/floor/indestructible/hierophant{
baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface
baseturf = /turf/simulated/floor/lava/lava_land_surface
},
/area/lavaland/surface/outdoors/unexplored/danger)
"c" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_5.dmm
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/simulated/wall/mineral/wood/nonmetal{
baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface
baseturf = /turf/simulated/floor/lava/lava_land_surface
},
/area/lavaland/surface/outdoors/unexplored/danger)
"c" = (
/turf/template_noop,
/area/lavaland/surface/outdoors/unexplored/danger)
"C" = (
/turf/simulated/floor/wood/cold{
baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface;
baseturf = /turf/simulated/floor/lava/lava_land_surface;
oxygen = 14;
nitrogen = 23;
temperature = 300
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_1.dmm
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/simulated/wall/clockwork{
baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface
baseturf = /turf/simulated/floor/lava/lava_land_surface
},
/area/lavaland/surface/outdoors/unexplored/danger)
"b" = (
/turf/simulated/floor/clockwork{
baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface;
baseturf = /turf/simulated/floor/lava/lava_land_surface;
temperature = 300;
oxygen = 14;
nitrogen = 23
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_2.dmm
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/simulated/wall/cult{
baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface
baseturf = /turf/simulated/floor/lava/lava_land_surface
},
/area/lavaland/surface/outdoors/unexplored/danger)
"b" = (
/turf/simulated/floor/engine/cult{
baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface;
baseturf = /turf/simulated/floor/lava/lava_land_surface;
nitrogen = 23;
temperature = 300;
oxygen = 14
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_3.dmm
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/simulated/wall/cult{
baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface
baseturf = /turf/simulated/floor/lava/lava_land_surface
},
/area/lavaland/surface/outdoors/unexplored/danger)
"b" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_4.dmm
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/simulated/floor/indestructible/hierophant{
baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface
baseturf = /turf/simulated/floor/lava/lava_land_surface
},
/area/lavaland/surface/outdoors/unexplored/danger)
"c" = (
/turf/template_noop,
/area/lavaland/surface/outdoors/unexplored/danger)
"y" = (
/turf/simulated/wall/indestructible/hierophant{
baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface
baseturf = /turf/simulated/floor/lava/lava_land_surface
},
/area/lavaland/surface/outdoors/unexplored/danger)

Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_vertical_5.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
/area/lavaland/surface/outdoors/unexplored/danger)
"q" = (
/turf/simulated/floor/wood/cold{
baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface;
baseturf = /turf/simulated/floor/lava/lava_land_surface;
oxygen = 14;
nitrogen = 23;
temperature = 300
},
/area/lavaland/surface/outdoors/unexplored/danger)
"y" = (
/turf/simulated/wall/mineral/wood/nonmetal{
baseturf = /turf/simulated/floor/plating/lava/smooth/lava_land_surface
baseturf = /turf/simulated/floor/lava/lava_land_surface
},
/area/lavaland/surface/outdoors/unexplored/danger)

Expand Down
Loading

0 comments on commit 8ef6dad

Please sign in to comment.