The Colony Was Preserved

This commit is contained in:
Captain277
2022-03-06 20:29:21 -08:00
parent d88421327f
commit 62e2d348d1
5 changed files with 11 additions and 98 deletions

View File

@@ -2,20 +2,11 @@
"map_name":"Lavaland",
"map_path":"map_levels/140x140",
"map_file":[
"lavaland_dungeon.dmm",
"lavaland_east.dmm",
"lavaland.dmm"
],
"traits":[
{
"Up":1,
"Station":false,
"Linkage":null,
"Gravity":true,
"Baseturf":"/turf/simulated/floor/outdoors/lava/lavaland"
},
{
"Down":-1,
"Station":false,
"Linkage":null,
"Gravity":true,

View File

@@ -485,11 +485,6 @@
},
/turf/simulated/floor/tiled/lavaland,
/area/lavaland/east/colony)
"gT" = (
/obj/machinery/artifact_scanpad,
/obj/item/soulstone,
/turf/simulated/floor/tiled,
/area/lavaland/east/lab/core)
"gV" = (
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 6
@@ -2005,22 +2000,6 @@
/obj/item/storage/toolbox/mechanical,
/turf/simulated/floor/plating,
/area/lavaland/east/lab/core)
"CK" = (
/obj/effect/floor_decal/industrial/outline/red,
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 8
},
/obj/machinery/door/window/brigdoor/eastleft,
/obj/item/archaeological_find,
/obj/structure/anomaly_container{
name = "ACH-S4-1Md"
},
/turf/simulated/floor/tiled,
/area/lavaland/east/lab/containment)
"Di" = (
/obj/structure/table/marble,
/obj/effect/floor_decal/spline/plain{
@@ -2056,21 +2035,6 @@
},
/turf/simulated/floor/tiled/steel_dirty/lavaland,
/area/lavaland/east/colony)
"Dx" = (
/obj/effect/floor_decal/industrial/outline/red,
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 4
},
/obj/machinery/door/window/brigdoor/westleft,
/obj/structure/anomaly_container{
name = "STX-S4-5Ts"
},
/turf/simulated/floor/tiled,
/area/lavaland/east/lab/containment)
"DA" = (
/obj/structure/fence/cut/large{
dir = 4
@@ -2557,22 +2521,6 @@
/obj/item/bedsheet/rainbow,
/turf/simulated/floor/tiled/lavaland,
/area/lavaland/east/colony)
"LX" = (
/obj/effect/floor_decal/industrial/outline/red,
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 4
},
/obj/machinery/door/window/brigdoor/westright,
/obj/item/soulstone,
/obj/structure/anomaly_container{
name = "STX-S4-5Tt"
},
/turf/simulated/floor/tiled,
/area/lavaland/east/lab/containment)
"Me" = (
/obj/structure/bed/chair/backed_red{
dir = 8
@@ -2701,7 +2649,8 @@
/area/lavaland/east/colony)
"Oi" = (
/obj/structure/railing,
/turf/simulated/open,
/obj/structure/boulder,
/turf/simulated/floor/lavaland,
/area/lavaland/east/colony)
"Oj" = (
/obj/structure/flora/tree/jungle_small,
@@ -2918,10 +2867,6 @@
dir = 4
},
/obj/machinery/door/window/brigdoor/westleft,
/obj/item/archaeological_find,
/obj/structure/anomaly_container{
name = "ACH-S4-2Kz"
},
/turf/simulated/floor/tiled,
/area/lavaland/east/lab/containment)
"QJ" = (
@@ -3144,22 +3089,6 @@
},
/turf/simulated/floor/tiled,
/area/lavaland/east/lab/core)
"Tj" = (
/obj/effect/floor_decal/industrial/outline/red,
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 8
},
/obj/machinery/door/window/brigdoor/eastright,
/obj/item/archaeological_find,
/obj/structure/anomaly_container{
name = "ACH-S4-3Bd"
},
/turf/simulated/floor/tiled,
/area/lavaland/east/lab/containment)
"Tl" = (
/obj/structure/bed/chair/wood,
/obj/effect/floor_decal/rust,
@@ -3446,10 +3375,6 @@
dir = 4
},
/obj/machinery/door/window/brigdoor/westright,
/obj/item/archaeological_find,
/obj/structure/anomaly_container{
name = "LET-S4-1Ob"
},
/turf/simulated/floor/tiled,
/area/lavaland/east/lab/containment)
"WU" = (
@@ -17922,11 +17847,11 @@ fk
fk
fk
TC
Tj
BD
ZT
ZP
BD
CK
ZT
TC
fk
fk
@@ -18351,8 +18276,8 @@ TC
QF
WT
Yi
Dx
LX
QF
WT
TC
fk
fk
@@ -18626,7 +18551,7 @@ Am
BB
fk
Au
gT
Ub
WC
wl
bL

View File

@@ -100,6 +100,7 @@
new /datum/random_map/noise/ore/lavaland(null, 1, 1, Z_LEVEL_LAVALAND, 64, 64) // Create the mining ore distribution map.
new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_LAVALAND, world.maxx - 4, world.maxy - 4) // Create the lavaland Z-level.
/*
// Lavaland Dungeon Z
// This one is not permanent. Comment this out once it's done.
/datum/map_template/triumph_lateload/lavaland_dungeon
@@ -118,6 +119,7 @@
seed_submaps(list(Z_LEVEL_LAVALAND_DUNGEON), 0, /area/lavaland/east/unexplored, /datum/map_template/submap/level_specific/lavaland)
new /datum/random_map/noise/ore/lavaland(null, 1, 1, Z_LEVEL_LAVALAND_DUNGEON, 64, 64)
new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_LAVALAND_DUNGEON, world.maxx - 4, world.maxy - 4)
*/
// Lavaland East
/datum/map_template/triumph_lateload/lavaland_east

View File

@@ -23,8 +23,7 @@
#define Z_LEVEL_TRADEPORT 20
#define Z_LEVEL_LAVALAND 21
#define Z_LEVEL_LAVALAND_DUNGEON 22
#define Z_LEVEL_LAVALAND_EAST 23
#define Z_LEVEL_LAVALAND_EAST 22
// Camera Networks
/datum/map/triumph
@@ -145,7 +144,6 @@
Z_LEVEL_ROGUEMINE_4)
lavaland_levels = list(Z_LEVEL_LAVALAND,
Z_LEVEL_LAVALAND_DUNGEON,
Z_LEVEL_LAVALAND_EAST)
lateload_z_levels = list(
@@ -159,7 +157,7 @@
list("Frozen Planet - Z4 Planet"), // Frozen Planet
list("Asteroid Belt 1","Asteroid Belt 2","Asteroid Belt 3","Asteroid Belt 4"),
list("Away Mission - Trade Port"), // Trading Post
list("Away Mission - Lava Land", "Away Mission - Lava Land (Dungeon)", "Away Mission - Lava Land (East)")
list("Away Mission - Lava Land", "Away Mission - Lava Land (East)")
)
ai_shell_restricted = TRUE
@@ -177,7 +175,6 @@
Z_LEVEL_FROZEN_PLANET,
Z_LEVEL_TRADEPORT,
Z_LEVEL_LAVALAND,
Z_LEVEL_LAVALAND_DUNGEON,
Z_LEVEL_LAVALAND_EAST)
lateload_single_pick = null //Nothing right now.

View File

@@ -761,7 +761,6 @@
#include "code\game\machinery\door_control.dm"
#include "code\game\machinery\doorbell_vr.dm"
#include "code\game\machinery\doppler_array.dm"
#include "code\game\machinery\event.dm"
#include "code\game\machinery\exonet_node.dm"
#include "code\game\machinery\flasher.dm"
#include "code\game\machinery\floodlight.dm"
@@ -1223,7 +1222,6 @@
#include "code\game\objects\items\weapons\circuitboards\machinery\biogenerator.dm"
#include "code\game\objects\items\weapons\circuitboards\machinery\cloning.dm"
#include "code\game\objects\items\weapons\circuitboards\machinery\engineering.dm"
#include "code\game\objects\items\weapons\circuitboards\machinery\event.dm"
#include "code\game\objects\items\weapons\circuitboards\machinery\jukebox.dm"
#include "code\game\objects\items\weapons\circuitboards\machinery\mech_recharger.dm"
#include "code\game\objects\items\weapons\circuitboards\machinery\mining_drill.dm"