The big kahuna - Map Standardisation

This commit is contained in:
AffectedArc07
2021-01-24 23:57:55 +00:00
parent 4f6b481265
commit 7245f86b2d
12 changed files with 11575 additions and 11715 deletions
+5 -6
View File
@@ -3,20 +3,19 @@ All z-levels should be identical in size. Their numbers should not matter.
The order of z-levels should not matter as long as their attributes are properly defined at MAP_TRANSITION_CONFIG.
Old code checked for the number of the z-level (for example whether there are any revheads on Z1),
currently it should check for the define (for example whether there are any revheads on any z-levels defined as STATION_LEVEL).
z1 = station
z2 = centcomm
z3 = engineering stuff (called Z4, dont question it)
z4 = lavaland
z1 = centcomm
z2 = station
z3 = lavaland
*/
#if !defined(USING_MAP_DATUM)
#include "map_files\generic\centcomm.dmm"
#include "map_files\cyberiad\cyberiad.dmm"
#include "map_files\cyberiad\z2.dmm"
#include "map_files\generic\Lavaland.dmm"
#define MAP_TRANSITION_CONFIG list(\
DECLARE_LEVEL(MAIN_STATION, CROSSLINKED, list(STATION_LEVEL, STATION_CONTACT, REACHABLE, AI_OK)),\
DECLARE_LEVEL(CENTCOMM, SELFLOOPING, list(ADMIN_LEVEL, BLOCK_TELEPORT, IMPEDES_MAGIC)),\
DECLARE_LEVEL(MAIN_STATION, CROSSLINKED, list(STATION_LEVEL, STATION_CONTACT, REACHABLE, AI_OK)),\
DECLARE_LEVEL(MINING, SELFLOOPING, list(ORE_LEVEL, REACHABLE, STATION_CONTACT, HAS_WEATHER, AI_OK)))
#define USING_MAP_DATUM /datum/map/cyberiad
+5 -6
View File
@@ -3,25 +3,24 @@ All z-levels should be identical in size. Their numbers should not matter.
The order of z-levels should not matter as long as their attributes are properly defined at MAP_TRANSITION_CONFIG.
Old code checked for the number of the z-level (for example whether there are any revheads on Z1),
currently it should check for the define (for example whether there are any revheads on any z-levels defined as STATION_LEVEL).
z1 = station
z2 = centcomm
z3 = space (empty)
z4 = lavaland
z1 = centcomm
z2 = station
z3 = lavaland
Original design by Okand37 of TG Station
Lovingly ported by Purpose2 to Paradise
*/
#if !defined(USING_MAP_DATUM)
#include "map_files\generic\centcomm.dmm"
#include "map_files\delta\delta.dmm"
#include "map_files\cyberiad\z2.dmm"
#include "map_files\generic\Lavaland.dmm"
#define MAP_FILE "delta.dmm"
#define MAP_NAME "Kerberos"
#define MAP_TRANSITION_CONFIG list(\
DECLARE_LEVEL(MAIN_STATION, CROSSLINKED, list(STATION_LEVEL, STATION_CONTACT, REACHABLE, AI_OK)),\
DECLARE_LEVEL(CENTCOMM, SELFLOOPING, list(ADMIN_LEVEL, BLOCK_TELEPORT, IMPEDES_MAGIC)),\
DECLARE_LEVEL(MAIN_STATION, CROSSLINKED, list(STATION_LEVEL, STATION_CONTACT, REACHABLE, AI_OK)),\
DECLARE_LEVEL(MINING, SELFLOOPING, list(ORE_LEVEL, REACHABLE, STATION_CONTACT, HAS_WEATHER, AI_OK)))
#define USING_MAP_DATUM /datum/map/delta
File diff suppressed because it is too large Load Diff
+423 -102
View File
@@ -78,8 +78,8 @@
/area/lavaland/surface/outdoors)
"ao" = (
/obj/machinery/computer/shuttle/labor/one_way{
icon_state = "computer";
dir = 4
dir = 4;
icon_state = "computer"
},
/obj/effect/decal/cleanable/cobweb,
/turf/simulated/floor/plasteel,
@@ -277,6 +277,13 @@
},
/turf/simulated/floor/plasteel,
/area/mine/production)
"aO" = (
/obj/structure/grille,
/obj/structure/window/full/shuttle{
icon_state = "window8"
},
/turf/simulated/floor/plating,
/area/shuttle/siberia)
"aP" = (
/obj/structure/table,
/obj/item/storage/firstaid/ancient,
@@ -778,6 +785,21 @@
/turf/simulated/floor/plating,
/area/mine/production)
"bO" = (
/obj/machinery/door/airlock/shuttle{
id_tag = "s_docking_airlock";
name = "Labor Shuttle Airlock";
req_access_txt = "0"
},
/obj/docking_port/mobile{
dir = 8;
dwidth = 2;
height = 5;
id = "laborcamp";
name = "labor camp shuttle";
rebuildable = 1;
width = 9
},
/obj/structure/fans/tiny,
/obj/docking_port/stationary{
area_type = /area/lavaland/surface/outdoors;
dir = 8;
@@ -788,8 +810,8 @@
turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface;
width = 9
},
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors/explored)
/turf/simulated/shuttle/floor,
/area/shuttle/siberia)
"bP" = (
/obj/item/radio/beacon,
/obj/effect/turf_decal/tile/purple{
@@ -896,8 +918,8 @@
},
/obj/effect/decal/cleanable/cobweb,
/obj/machinery/computer/prisoner{
icon_state = "computer";
dir = 1
dir = 1;
icon_state = "computer"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
@@ -2441,8 +2463,8 @@
dir = 2
},
/obj/machinery/computer/mech_bay_power_console{
icon_state = "computer";
dir = 1
dir = 1;
icon_state = "computer"
},
/turf/simulated/floor/plasteel,
/area/mine/production)
@@ -2688,6 +2710,20 @@
/turf/simulated/floor/plasteel,
/area/mine/living_quarters)
"fJ" = (
/obj/machinery/door/airlock/shuttle{
id_tag = "s_docking_airlock";
req_access_txt = "48"
},
/obj/docking_port/mobile{
dir = 8;
dwidth = 3;
height = 5;
id = "mining";
name = "mining shuttle";
rebuildable = 1;
width = 7
},
/obj/structure/fans/tiny,
/obj/docking_port/stationary{
area_type = /area/lavaland/surface/outdoors;
dir = 8;
@@ -2698,8 +2734,8 @@
turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface;
width = 7
},
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
/turf/simulated/shuttle/floor,
/area/shuttle/mining)
"fK" = (
/obj/structure/table,
/obj/machinery/reagentgrinder,
@@ -3233,12 +3269,41 @@
},
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"he" = (
/turf/simulated/shuttle/wall,
/area/shuttle/siberia)
"hf" = (
/obj/machinery/flasher_button{
id = "gulagshuttleflasher";
name = "Flash Control";
pixel_x = 0;
pixel_y = -26;
req_access_txt = "1"
},
/turf/simulated/shuttle/floor{
icon_state = "floor4"
},
/area/shuttle/siberia)
"hg" = (
/obj/structure/stone_tile/surrounding,
/obj/structure/stone_tile/center/cracked,
/mob/living/simple_animal/hostile/megafauna/legion,
/turf/simulated/floor/indestructible/boss,
/area/lavaland/surface/outdoors)
"hj" = (
/obj/machinery/flasher{
id = "gulagshuttleflasher";
pixel_x = 25
},
/obj/machinery/light{
dir = 4;
icon_state = "tube1"
},
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor,
/area/shuttle/siberia)
"hs" = (
/obj/structure/stone_tile/block{
dir = 1
@@ -3371,6 +3436,12 @@
/obj/structure/stone_tile/block/cracked,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"iG" = (
/turf/simulated/shuttle/wall{
dir = 2;
icon_state = "swall_f5"
},
/area/shuttle/siberia)
"iK" = (
/obj/structure/stone_tile/block,
/obj/structure/stone_tile/cracked{
@@ -3633,6 +3704,12 @@
/obj/structure/stone_tile/center/cracked,
/turf/simulated/floor/plating/lava/smooth/lava_land_surface,
/area/lavaland/surface/outdoors)
"kI" = (
/turf/simulated/shuttle/wall{
dir = 2;
icon_state = "swall_f6"
},
/area/shuttle/siberia)
"kJ" = (
/obj/structure/stone_tile/surrounding_tile{
dir = 4
@@ -4263,6 +4340,16 @@
},
/turf/simulated/floor/indestructible/boss,
/area/lavaland/surface/outdoors)
"nT" = (
/obj/machinery/mineral/stacking_machine/laborstacker{
input_dir = 2;
output_dir = 1
},
/turf/simulated/shuttle/floor{
icon = 'icons/turf/floors.dmi';
icon_state = "dark"
},
/area/shuttle/siberia)
"on" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -4272,6 +4359,12 @@
},
/turf/simulated/floor/plasteel,
/area/mine/living_quarters)
"op" = (
/turf/simulated/shuttle/wall{
dir = 2;
icon_state = "swall_f9"
},
/area/shuttle/mining)
"oA" = (
/obj/effect/decal/cleanable/cobweb2,
/obj/machinery/atmospherics/unary/tank/air{
@@ -4294,6 +4387,19 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel,
/area/mine/living_quarters)
"pq" = (
/turf/simulated/shuttle/floor,
/area/shuttle/siberia)
"pt" = (
/obj/machinery/mineral/labor_claim_console{
machinedir = 2;
pixel_x = 30;
pixel_y = 30
},
/turf/simulated/shuttle/floor{
icon_state = "floor4"
},
/area/shuttle/siberia)
"qw" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/cigbutt,
@@ -4319,6 +4425,14 @@
icon_state = "brown"
},
/area/mine/laborcamp)
"qL" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/shuttle/floor{
icon_state = "floor4"
},
/area/shuttle/siberia)
"qT" = (
/turf/simulated/wall/rust,
/area/mine/laborcamp)
@@ -4411,6 +4525,11 @@
},
/turf/simulated/floor/plasteel,
/area/mine/laborcamp)
"tb" = (
/obj/structure/window/full/shuttle,
/obj/structure/grille,
/turf/simulated/shuttle/plating,
/area/shuttle/mining)
"tj" = (
/obj/effect/decal/cleanable/ash,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
@@ -4473,8 +4592,8 @@
dir = 8
},
/turf/simulated/floor/wood{
tag = "icon-wood-broken6";
icon_state = "wood-broken6"
icon_state = "wood-broken6";
tag = "icon-wood-broken6"
},
/area/mine/laborcamp)
"ug" = (
@@ -4491,6 +4610,16 @@
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/mine/laborcamp)
"vk" = (
/obj/machinery/door/airlock/external{
name = "Labor Shuttle Airlock";
req_access_txt = "2"
},
/turf/simulated/shuttle/floor{
icon = 'icons/turf/floors.dmi';
icon_state = "dark"
},
/area/shuttle/siberia)
"vq" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel,
@@ -4535,14 +4664,30 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel/dark,
/area/mine/laborcamp)
"wt" = (
/obj/structure/shuttle/engine/propulsion,
/turf/simulated/shuttle/plating,
/area/shuttle/siberia)
"wD" = (
/obj/effect/decal/remains/human,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"wP" = (
/obj/structure/shuttle/engine/heater,
/obj/structure/window/reinforced{
dir = 1;
layer = 2.9
},
/turf/simulated/shuttle/plating,
/area/shuttle/siberia)
"wY" = (
/obj/item/clothing/mask/gas/clown_hat,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"xo" = (
/obj/structure/shuttle/engine/propulsion/burst,
/turf/simulated/shuttle/plating,
/area/shuttle/mining)
"xx" = (
/obj/machinery/light/small{
dir = 1
@@ -4559,6 +4704,12 @@
},
/turf/simulated/floor/plasteel,
/area/mine/production)
"xC" = (
/turf/simulated/shuttle/wall{
dir = 2;
icon_state = "swall_f6"
},
/area/shuttle/mining)
"xL" = (
/obj/machinery/atmospherics/unary/outlet_injector/on{
dir = 4;
@@ -4567,6 +4718,13 @@
/obj/structure/lattice/catwalk,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/mine/laborcamp)
"xM" = (
/obj/structure/ore_box,
/obj/machinery/light/small{
dir = 4
},
/turf/simulated/shuttle/floor,
/area/shuttle/mining)
"xR" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -4621,6 +4779,11 @@
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel,
/area/mine/production)
"Bg" = (
/turf/simulated/shuttle/floor{
icon_state = "floor4"
},
/area/shuttle/siberia)
"BD" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -4639,6 +4802,15 @@
},
/turf/simulated/floor/plasteel,
/area/mine/living_quarters)
"BY" = (
/obj/machinery/computer/shuttle/labor,
/turf/simulated/shuttle/floor{
icon_state = "floor4"
},
/area/shuttle/siberia)
"Cf" = (
/turf/simulated/shuttle/floor,
/area/shuttle/mining)
"Cy" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -4646,6 +4818,14 @@
icon_state = "brown"
},
/area/mine/laborcamp)
"CF" = (
/obj/structure/closet/crate,
/turf/simulated/shuttle/floor,
/area/shuttle/mining)
"CK" = (
/obj/structure/closet/crate,
/turf/simulated/shuttle/floor,
/area/shuttle/siberia)
"CT" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -4676,8 +4856,8 @@
dir = 8
},
/turf/simulated/floor/wood{
tag = "icon-wood-broken6";
icon_state = "wood-broken6"
icon_state = "wood-broken6";
tag = "icon-wood-broken6"
},
/area/mine/laborcamp)
"DX" = (
@@ -4721,6 +4901,14 @@
},
/turf/simulated/floor/plasteel,
/area/mine/living_quarters)
"Fc" = (
/obj/structure/grille,
/obj/structure/window/full/shuttle{
dir = 10;
icon_state = "9"
},
/turf/simulated/floor/plating,
/area/shuttle/siberia)
"Fe" = (
/obj/structure/sink{
dir = 8;
@@ -4739,10 +4927,15 @@
/obj/item/bedsheet/orange,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/wood{
tag = "icon-wood-broken7";
icon_state = "wood-broken7"
icon_state = "wood-broken7";
tag = "icon-wood-broken7"
},
/area/mine/laborcamp)
"FE" = (
/obj/structure/grille,
/obj/structure/window/full/shuttle,
/turf/simulated/floor/plating,
/area/shuttle/siberia)
"FO" = (
/obj/structure/rack,
/obj/item/storage/bag/ore,
@@ -4763,6 +4956,17 @@
icon_state = "brown"
},
/area/mine/laborcamp)
"FW" = (
/obj/machinery/door/airlock/shuttle{
id_tag = "s_docking_airlock";
name = "Labor Shuttle Airlock";
req_access_txt = "2"
},
/obj/structure/fans/tiny,
/turf/simulated/shuttle/floor{
icon_state = "floor4"
},
/area/shuttle/siberia)
"Gp" = (
/obj/structure/sign/poster/contraband/clown,
/turf/simulated/wall/rust,
@@ -4828,6 +5032,26 @@
/obj/machinery/vending/cola/free,
/turf/simulated/floor/plasteel/dark,
/area/mine/laborcamp)
"It" = (
/turf/simulated/shuttle/wall{
dir = 2;
icon_state = "swall12"
},
/area/shuttle/mining)
"Iv" = (
/obj/structure/table,
/obj/machinery/light/small{
dir = 1
},
/turf/simulated/shuttle/floor,
/area/shuttle/mining)
"Ix" = (
/turf/simulated/shuttle/wall{
dir = 2;
icon_state = "swall_f10";
tag = "icon-swall_f10"
},
/area/shuttle/siberia)
"IK" = (
/obj/structure/toilet{
dir = 8
@@ -4837,6 +5061,19 @@
},
/turf/simulated/floor/plasteel/freezer,
/area/mine/living_quarters)
"IZ" = (
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/shuttle/engine/heater,
/obj/structure/window/reinforced{
dir = 8
},
/obj/structure/window/reinforced{
dir = 4
},
/turf/simulated/shuttle/plating,
/area/shuttle/mining)
"Jl" = (
/obj/effect/spawner/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -4853,8 +5090,8 @@
network = list("Labor Camp")
},
/turf/simulated/floor/wood{
tag = "icon-wood-broken3";
icon_state = "wood-broken3"
icon_state = "wood-broken3";
tag = "icon-wood-broken3"
},
/area/mine/laborcamp)
"JQ" = (
@@ -4873,6 +5110,12 @@
/obj/machinery/vending/sustenance,
/turf/simulated/floor/plasteel/dark,
/area/mine/laborcamp)
"JX" = (
/obj/machinery/light/small{
dir = 8
},
/turf/simulated/shuttle/floor,
/area/shuttle/mining)
"JZ" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
@@ -4901,6 +5144,14 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel/white,
/area/mine/laborcamp)
"KR" = (
/obj/machinery/mineral/labor_claim_console{
machinedir = 1;
pixel_x = 30;
pixel_y = 0
},
/turf/simulated/shuttle/floor,
/area/shuttle/siberia)
"Lz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
@@ -4932,6 +5183,12 @@
icon_state = "brown"
},
/area/mine/laborcamp)
"Mn" = (
/turf/simulated/shuttle/wall{
dir = 2;
icon_state = "swall_f9"
},
/area/shuttle/siberia)
"ME" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -4973,8 +5230,8 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/wood{
tag = "icon-wood-broken3";
icon_state = "wood-broken3"
icon_state = "wood-broken3";
tag = "icon-wood-broken3"
},
/area/mine/laborcamp)
"NG" = (
@@ -4992,6 +5249,17 @@
},
/turf/simulated/floor/plasteel/white,
/area/mine/laborcamp)
"NP" = (
/obj/machinery/computer/shuttle/mining,
/turf/simulated/shuttle/floor,
/area/shuttle/mining)
"NW" = (
/obj/structure/grille,
/obj/structure/window/full/shuttle{
icon_state = "window4"
},
/turf/simulated/floor/plating,
/area/shuttle/siberia)
"NZ" = (
/obj/structure/toilet,
/obj/effect/decal/cleanable/cobweb,
@@ -5015,6 +5283,19 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/mine/living_quarters)
"Qp" = (
/turf/simulated/shuttle/wall{
dir = 2;
icon_state = "swall_f10";
tag = "icon-swall_f10"
},
/area/shuttle/mining)
"Qq" = (
/turf/simulated/shuttle/wall{
dir = 2;
icon_state = "swall3"
},
/area/shuttle/mining)
"QE" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
@@ -5052,6 +5333,22 @@
icon_state = "brown"
},
/area/mine/laborcamp)
"Rs" = (
/obj/structure/table,
/turf/simulated/shuttle/floor,
/area/shuttle/mining)
"Rw" = (
/turf/simulated/shuttle/wall{
dir = 2;
icon_state = "swall_f5"
},
/area/shuttle/mining)
"Sa" = (
/turf/simulated/shuttle/wall{
dir = 2;
icon_state = "swall3"
},
/area/shuttle/siberia)
"Ss" = (
/obj/structure/rack,
/obj/item/storage/bag/ore,
@@ -5124,6 +5421,12 @@
},
/turf/simulated/floor/plasteel,
/area/mine/production)
"Uy" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor,
/area/shuttle/siberia)
"UQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -5172,8 +5475,8 @@
/area/mine/production)
"VJ" = (
/obj/machinery/computer/secure_data{
icon_state = "computer";
dir = 1
dir = 1;
icon_state = "computer"
},
/turf/simulated/floor/plasteel{
dir = 1;
@@ -5184,8 +5487,8 @@
/obj/structure/bed,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/wood{
tag = "icon-wood-broken7";
icon_state = "wood-broken7"
icon_state = "wood-broken7";
tag = "icon-wood-broken7"
},
/area/mine/laborcamp)
"VO" = (
@@ -5195,6 +5498,12 @@
icon_state = "brown"
},
/area/mine/laborcamp)
"Wo" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/shuttle/floor,
/area/shuttle/mining)
"Wt" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -5205,6 +5514,18 @@
/obj/machinery/hologram/holopad,
/turf/simulated/floor/plasteel,
/area/mine/eva)
"Wx" = (
/obj/structure/table,
/obj/item/folder/red,
/obj/item/restraints/handcuffs,
/obj/machinery/light{
dir = 4;
icon_state = "tube1"
},
/turf/simulated/shuttle/floor{
icon_state = "floor4"
},
/area/shuttle/siberia)
"WJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
@@ -8580,15 +8901,15 @@ aj
aw
aw
aw
aD
aD
aD
aD
aD
aD
aD
aD
aD
kI
Sa
FE
Sa
Sa
FE
Sa
Sa
iG
aw
aj
aj
@@ -8837,15 +9158,15 @@ aw
aw
aw
aw
aD
aD
aD
aD
aD
aD
aD
aD
aD
NW
BY
Bg
vk
pq
Uy
CK
wP
wt
aw
aw
ab
@@ -9094,15 +9415,15 @@ aw
aw
aw
aw
aD
aD
aD
aD
aD
aD
aD
aD
aD
Fc
qL
hf
he
pq
pq
pq
wP
wt
aw
aw
aw
@@ -9351,15 +9672,15 @@ aj
aw
aw
aw
aD
aD
aD
aD
aD
aD
aD
aD
aD
aO
Wx
pt
nT
KR
hj
pq
wP
wt
aw
aj
aj
@@ -9608,15 +9929,15 @@ qT
aw
aw
aw
aD
aD
aD
aD
aD
aD
Ix
Sa
FW
Sa
Sa
Sa
bO
aD
aD
Sa
Mn
xL
ab
aj
@@ -18094,13 +18415,13 @@ aj
aj
aj
ab
ab
ab
ab
ab
ab
ab
ab
xC
Qq
tb
Qq
tb
Qq
Rw
ab
aj
aj
@@ -18351,13 +18672,13 @@ aj
aj
ab
ab
ab
ab
ab
ab
ab
ab
ab
It
Rs
Cf
JX
Wo
CF
It
ab
aj
aj
@@ -18608,13 +18929,13 @@ ab
aj
ab
ab
ab
ab
ab
ab
ab
ab
ab
tb
NP
Wo
Cf
Wo
IZ
xo
ab
ab
aj
@@ -18865,13 +19186,13 @@ aj
aj
aj
ab
ab
ab
ab
ab
ab
ab
ab
It
Iv
Cf
Cf
Wo
xM
It
ab
ab
aj
@@ -19122,13 +19443,13 @@ aj
aj
aj
ab
ab
ab
ab
Qp
Qq
tb
fJ
ab
ab
ab
tb
Qq
op
ab
aj
aj
File diff suppressed because it is too large Load Diff
+5 -9
View File
@@ -3,26 +3,22 @@ All z-levels should be identical in size. Their numbers should not matter.
The order of z-levels should not matter as long as their attributes are properly defined at MAP_TRANSITION_CONFIG.
Old code checked for the number of the z-level (for example whether there are any revheads on Z1),
currently it should check for the define (for example whether there are any revheads on any z-levels defined as STATION_LEVEL).
z1 = station
z2 = centcomm
z3 = derelict telecomms satellite
z4 = derelict station
z5 = mining
z6 = empty space
z7 = empty space
z1 = centcomm
z2 = station
z3 = lavaland
*/
#if !defined(USING_MAP_DATUM)
#include "map_files\generic\centcomm.dmm"
#include "map_files\MetaStation\MetaStation.v41A.II.dmm"
#include "map_files\MetaStation\z2.dmm"
#include "map_files\generic\Lavaland.dmm"
#define MAP_FILE "MetaStation.v41A.II.dmm"
#define MAP_NAME "MetaStation"
#define MAP_TRANSITION_CONFIG list(\
DECLARE_LEVEL(MAIN_STATION, CROSSLINKED, list(STATION_LEVEL, STATION_CONTACT, REACHABLE, AI_OK)),\
DECLARE_LEVEL(CENTCOMM, SELFLOOPING, list(ADMIN_LEVEL, BLOCK_TELEPORT, IMPEDES_MAGIC)),\
DECLARE_LEVEL(MAIN_STATION, CROSSLINKED, list(STATION_LEVEL, STATION_CONTACT, REACHABLE, AI_OK)),\
DECLARE_LEVEL(MINING, SELFLOOPING, list(ORE_LEVEL, REACHABLE, STATION_CONTACT, HAS_WEATHER, AI_OK)))
#define USING_MAP_DATUM /datum/map/metastation
-3
View File
@@ -84,7 +84,6 @@
height = 11
dir = 4
travelDir = 0
roundstart_move = "emergency_away"
var/sound_played = 0 //If the launch sound has been sent to all players on the shuttle itself
var/datum/announcement/priority/emergency_shuttle_docked = new(0, new_sound = sound('sound/AI/shuttledock.ogg'))
@@ -364,8 +363,6 @@
height = 8
dir = 4
roundstart_move = "backup_away"
/obj/docking_port/mobile/emergency/backup/register()
var/current_emergency = SSshuttle.emergency
..()
-2
View File
@@ -25,6 +25,4 @@
y_offset = 0
resistance_flags = INDESTRUCTIBLE
flags = NODECONSTRUCT
access_tcomms = FALSE
access_construction = FALSE
access_mining = FALSE
+3 -10
View File
@@ -11,10 +11,7 @@
var/shuttlePortName = "custom location"
var/list/jumpto_ports = list() //list of ports to jump to
var/access_station = TRUE //can we park near X?
var/access_tcomms = TRUE
var/access_construction = TRUE
var/access_mining = TRUE
var/access_derelict = FALSE
var/obj/docking_port/stationary/my_port //the custom docking port placed by this console
var/obj/docking_port/mobile/shuttle_port //the mobile docking port of the connected shuttle
var/view_range = 7
@@ -29,17 +26,13 @@
. = ..()
GLOB.navigation_computers += src
if(access_station)
jumpto_ports += list("nav_z1" = 1)
if(access_tcomms)
jumpto_ports += list("nav_z3" = 1)
jumpto_ports += list("nav_z2" = level_name_to_num(MAIN_STATION))
if(access_mining)
jumpto_ports += list("nav_z5" = 1)
if(access_derelict)
jumpto_ports += list("nav_z6" = 1)
jumpto_ports += list("nav_z3" = level_name_to_num(MINING))
/obj/machinery/computer/camera_advanced/shuttle_docker/Destroy()
. = ..()
GLOB.navigation_computers -= src
return ..()
/obj/machinery/computer/camera_advanced/shuttle_docker/attack_hand(mob/user)
if(!shuttle_port && !SSshuttle.getShuttle(shuttleId))
-2
View File
@@ -912,8 +912,6 @@
x_offset = 0
y_offset = 0
resistance_flags = INDESTRUCTIBLE
access_tcomms = TRUE
access_construction = TRUE
access_mining = TRUE
/obj/machinery/computer/shuttle/trade
-1
View File
@@ -14,7 +14,6 @@
width = 12
dwidth = 5
height = 7
roundstart_move = "supply_away"
/obj/docking_port/mobile/supply/register()
if(!..())
-1
View File
@@ -18,4 +18,3 @@
y_offset = -10
resistance_flags = INDESTRUCTIBLE
flags = NODECONSTRUCT
access_derelict = TRUE