cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-27 06:00:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6056 from Very-Soft/mining-tweaks

Browse Source 
Adds a small cargo office to mining, and adds a glorious cargo pipeline
This commit is contained in:
Novacat
2019-10-14 22:15:41 -04:00
committed by GitHub
parent 410d560676 6f19bee46e
commit 64ef018ca0
8 changed files with 3927 additions and 2442 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maps/tether/tether-01-surface1.dmm
+1653 -798
View File
File diff suppressed because it is too large Load Diff
maps/tether/tether-02-surface2.dmm
+66 -27
View File
@@ -4548,10 +4548,21 @@
/turf/simulated/floor/plating,
/area/maintenance/lower/rnd)
"jO" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/symbol/da{
pixel_x = 32
/obj/structure/cable{
icon_state = "16-0"
},
/obj/structure/cable{
icon_state = "0-8"
},
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/structure/disposalpipe/up,
/turf/simulated/floor/plating,
/area/maintenance/lower/rnd)
"jP" = (
@@ -6100,20 +6111,8 @@
/turf/simulated/floor/plating,
/area/maintenance/lower/rnd)
"my" = (
/obj/structure/cable{
icon_state = "16-0"
},
/obj/structure/cable{
icon_state = "0-8"
},
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/lower/rnd)
"mz" = (
@@ -25644,6 +25643,14 @@
},
/turf/simulated/floor,
/area/tether/surfacebase/security/gasstorage)
"UE" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/lower/rnd)
"UF" = (
/obj/machinery/atmospherics/pipe/simple/hidden/green{
icon_state = "intact";
@@ -27380,6 +27387,30 @@
},
/turf/simulated/floor/tiled/dark,
/area/tether/surfacebase/security/interrogation)
"WQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
/turf/simulated/floor/plating,
/area/maintenance/lower/rnd)
"WR" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
},
/turf/simulated/floor/plating,
/area/maintenance/lower/rnd)
"WS" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/symbol/da{
pixel_x = 32
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/lower/rnd)
"WT" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
@@ -27398,6 +27429,14 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/lowerhallway)
"WU" = (
/obj/structure/lattice,
/obj/machinery/door/firedoor/glass,
/obj/structure/disposalpipe/down{
dir = 4
},
/turf/simulated/open,
/area/maintenance/lower/rnd)
"Xa" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -37757,7 +37796,7 @@ ii
ii
ii
ii
il
WU
il
oA
oY
@@ -37893,13 +37932,13 @@ im
mx
iV
jk
il
il
jO
il
il
il
il
WQ
my
WS
my
my
my
WR
il
dY
oZ
@@ -38032,10 +38071,10 @@ iA
lP
ge
il
jO
my
il
jf
il
UE
WR
ii
ii
dY
maps/tether/tether-03-surface3.dmm
+678 -480
View File
File diff suppressed because it is too large Load Diff
maps/tether/tether-04-transit.dmm
+69 -47
View File
@@ -21,6 +21,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
/obj/machinery/alarm{
pixel_y = 26
},
/turf/simulated/floor/plating,
/area/maintenance/tether_midpoint)
"d" = (
@@ -49,23 +52,15 @@
/turf/simulated/floor/holofloor/tiled/dark,
/area/tether/elevator)
"g" = (
/obj/structure/disposalpipe/segment{
dir = 4
/obj/structure/grille,
/obj/structure/window/reinforced/full,
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/door/airlock/maintenance/engi,
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/plating,
/area/maintenance/tether_midpoint)
/area/tether/midpoint)
"h" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -92,6 +87,7 @@
},
/obj/structure/disposalpipe/down,
/obj/effect/ceiling,
/obj/machinery/door/firedoor/glass,
/turf/simulated/open,
/area/maintenance/tether_midpoint)
"j" = (
@@ -214,7 +210,10 @@
icon_state = "1-2";
pixel_y = 0
},
/turf/simulated/floor/plating,
/obj/structure/lattice,
/obj/structure/disposalpipe/down,
/obj/machinery/door/firedoor/glass,
/turf/simulated/open,
/area/maintenance/tether_midpoint)
"u" = (
/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b,
@@ -229,15 +228,19 @@
/obj/structure/window/reinforced{
dir = 4
},
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/plating,
/area/tether/midpoint)
"w" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 8
},
/obj/structure/window/reinforced{
dir = 4
},
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/plating,
/area/tether/midpoint)
"x" = (
@@ -271,10 +274,17 @@
pixel_x = -24
},
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
},
/turf/simulated/floor/plating,
/area/maintenance/tether_midpoint)
"A" = (
/obj/effect/ceiling,
/obj/structure/disposalpipe/up{
dir = 8
},
/turf/simulated/floor/plating,
/area/maintenance/tether_midpoint)
"B" = (
@@ -313,19 +323,32 @@
/turf/simulated/floor/plating,
/area/maintenance/tether_midpoint)
"H" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 1
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/door/airlock/maintenance/engi,
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/plating,
/area/tether/midpoint)
/area/maintenance/tether_midpoint)
"I" = (
/obj/structure/closet,
/obj/random/plushie,
/turf/simulated/floor/plating,
/area/maintenance/tether_midpoint)
"J" = (
/turf/simulated/floor/wood,
/area/space)
"K" = (
/obj/structure/cable{
d1 = 1;
@@ -341,15 +364,14 @@
},
/turf/simulated/floor/wood,
/area/tether/midpoint)
"N" = (
"M" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
/obj/structure/window/reinforced{
dir = 8
},
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 4
},
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/plating,
/area/tether/midpoint)
"O" = (
@@ -10177,7 +10199,7 @@ u
u
u
b
g
H
d
d
f
@@ -10601,7 +10623,7 @@ u
u
u
u
H
g
k
q
q
@@ -10612,7 +10634,7 @@ F
q
E
p
H
g
u
u
u
@@ -10743,10 +10765,10 @@ u
u
u
u
H
g
U
q
q
J
T
n
n
@@ -10754,7 +10776,7 @@ R
q
q
U
H
g
u
u
u
@@ -10885,7 +10907,7 @@ u
u
u
u
H
g
n
q
q
@@ -10896,7 +10918,7 @@ F
q
q
n
H
g
u
u
u
@@ -11027,7 +11049,7 @@ u
u
u
u
H
g
L
q
q
@@ -11038,7 +11060,7 @@ q
q
q
L
H
g
u
u
u
@@ -11170,17 +11192,17 @@ u
u
u
v
N
N
N
N
N
N
N
N
N
N
w
w
w
w
w
w
w
w
w
w
M
u
u
u
maps/tether/tether-05-station1.dmm
+129 -115
View File
@@ -1486,6 +1486,16 @@
},
/turf/simulated/floor/grass,
/area/hallway/station/atrium)
"adb" = (
/obj/machinery/door/blast/shutters{
dir = 2;
id = "surfcargooffice";
layer = 3.3;
name = "Cargo Office Shutters"
},
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/dark,
/area/gateway)
"adc" = (
/obj/structure/bed/chair/wood{
dir = 8
@@ -5646,11 +5656,22 @@
/turf/simulated/floor/tiled/dark,
/area/gateway/prep_room)
"akc" = (
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/blast/shutters{
dir = 8;
id = "PubPrep";
dir = 2;
id = "surfcargooffice";
layer = 3.3;
name = "Public Access Shutter"
name = "Cargo Office Shutters"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/dark,
@@ -5831,26 +5852,15 @@
/turf/simulated/floor/tiled,
/area/gateway/prep_room)
"akv" = (
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/blast/shutters{
dir = 8;
id = "PubPrep";
layer = 3.3;
name = "Public Access Shutter"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/lattice,
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/dark,
/area/gateway)
/obj/structure/disposalpipe/down{
dir = 8
},
/turf/simulated/open,
/area/maintenance/station/eng_lower)
"akw" = (
/obj/structure/cable/green{
d1 = 2;
@@ -6995,6 +7005,49 @@
/obj/item/weapon/reagent_containers/food/snacks/donut/jelly,
/turf/simulated/floor/wood,
/area/hallway/station/atrium)
"amz" = (
/obj/machinery/alarm{
pixel_y = 22
},
/obj/structure/table/rack{
dir = 8;
layer = 2.9
},
/obj/effect/decal/cleanable/dirt,
/obj/random/maintenance/clean,
/obj/random/maintenance/engineering,
/obj/random/tool,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
/obj/random/maintenance/engineering,
/obj/random/maintenance/clean,
/turf/simulated/floor,
/area/maintenance/station/eng_lower)
"amA" = (
/obj/structure/disposalpipe/up{
dir = 4
},
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor,
/area/maintenance/station/eng_lower)
"amB" = (
/obj/machinery/atmospherics/valve/digital/open,
/obj/structure/railing{
dir = 8
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor,
/area/maintenance/station/eng_lower)
"amC" = (
/obj/structure/table/woodentable,
/obj/machinery/door/blast/shutters{
@@ -9408,6 +9461,20 @@
/area/maintenance/abandonedlibraryconference)
"arb" = (
/obj/machinery/atmospherics/valve/digital/open,
/obj/structure/railing{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2";
pixel_y = 0
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor,
/area/maintenance/station/eng_lower)
"arc" = (
@@ -9417,8 +9484,15 @@
/turf/simulated/floor/wood,
/area/maintenance/abandonedlibraryconference)
"ard" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
/obj/structure/reagent_dispensers/watertank,
/obj/structure/railing{
icon_state = "railing0";
dir = 1
},
/turf/simulated/floor,
/area/maintenance/station/eng_lower)
"are" = (
@@ -10029,6 +10103,28 @@
/obj/machinery/floodlight,
/turf/simulated/floor,
/area/storage/emergency_storage/emergency4)
"asv" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2";
pixel_y = 0
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
/obj/structure/railing,
/obj/random/junk,
/turf/simulated/floor/plating,
/area/maintenance/station/eng_lower)
"asw" = (
/obj/machinery/atmospherics/pipe/simple/visible/green,
/obj/machinery/atmospherics/pipe/simple/visible/green{
@@ -14242,30 +14338,6 @@
},
/turf/simulated/floor,
/area/maintenance/station/eng_lower)
"aIq" = (
/obj/machinery/alarm{
pixel_y = 22
},
/obj/structure/table/rack{
dir = 8;
layer = 2.9
},
/obj/effect/decal/cleanable/dirt,
/obj/random/maintenance/clean,
/obj/random/maintenance/engineering,
/obj/random/tool,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
/turf/simulated/floor,
/area/maintenance/station/eng_lower)
"aIs" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -15325,27 +15397,6 @@
/obj/structure/railing,
/turf/simulated/floor,
/area/maintenance/station/eng_lower)
"aMu" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2";
pixel_y = 0
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
/obj/structure/railing,
/turf/simulated/floor/plating,
/area/maintenance/station/eng_lower)
"aMx" = (
/obj/structure/cable{
d1 = 4;
@@ -15652,35 +15703,6 @@
},
/turf/simulated/floor/carpet,
/area/engineering/foyer)
"aPG" = (
/obj/structure/railing{
dir = 1
},
/obj/structure/table/rack{
dir = 8;
layer = 2.9
},
/obj/effect/decal/cleanable/dirt,
/obj/random/maintenance/clean,
/obj/random/maintenance/engineering,
/obj/random/junk,
/turf/simulated/floor,
/area/maintenance/station/eng_lower)
"aPH" = (
/obj/machinery/atmospherics/valve/digital/open,
/obj/structure/railing{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2";
pixel_y = 0
},
/turf/simulated/floor,
/area/maintenance/station/eng_lower)
"aQa" = (
/obj/structure/table/rack{
dir = 8;
@@ -15866,14 +15888,6 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos/backup)
"aRi" = (
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
/obj/structure/reagent_dispensers/watertank,
/turf/simulated/floor,
/area/maintenance/station/eng_lower)
"aRr" = (
/obj/machinery/atmospherics/valve/open,
/obj/structure/railing{
@@ -31155,8 +31169,8 @@ atp
api
aMt
aqs
aPG
aRi
amA
ard
arZ
aUE
aqs
@@ -31297,7 +31311,7 @@ aIo
aKr
aMr
aqt
arb
amB
arA
asa
asD
@@ -31435,11 +31449,11 @@ aaV
aaV
aaV
aaV
aIq
amz
aUX
aMx
aOj
aPH
arb
aRr
aSO
aUI
@@ -31579,9 +31593,9 @@ apU
aGy
aIp
aKz
aMu
asv
aYf
ard
akv
arC
asc
aUF
@@ -36108,9 +36122,9 @@ adO
adO
adO
adP
adb
akc
akv
akc
adb
adP
adP
adP
maps/tether/tether-06-station2.dmm
+704 -510
View File
File diff suppressed because it is too large Load Diff
maps/tether/tether-07-station3.dmm
+625 -465
View File
File diff suppressed because it is too large Load Diff
maps/tether/tether_areas2.dm
+3
View File
@@ -132,6 +132,9 @@
name = "\improper Mining Bathroom"
/area/tether/surfacebase/mining_main/lobby
name = "\improper Mining Lobby"
/area/tether/surfacebase/mining_main/surfacecargo
name = "\improper Surface Cargo Office"
lightswitch = 0
// Mining Underdark
/area/mine/unexplored/underdark