shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265

Browse Source
This commit is contained in:
Ghommie
2020-01-18 22:14:06 +01:00
parent 9c0b78bc09 4d06c2d2d3
commit 3ee855ab77
54 changed files with 4114 additions and 2584 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/BoxStation/BoxStation.dmm
+72 -34
View File
@@ -6672,12 +6672,6 @@
/obj/structure/closet/emcloset,
/turf/open/floor/plating,
/area/maintenance/port/fore)
"aoZ" = (
/obj/machinery/atmospherics/components/binary/valve/digital{
name = "Waste Release"
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"apa" = (
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 4
@@ -6916,7 +6910,7 @@
/turf/open/floor/plasteel,
/area/janitor)
"apI" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{
/obj/machinery/atmospherics/components/unary/relief_valve/atmos/atmos_waste{
dir = 1
},
/obj/structure/lattice/catwalk,
@@ -25394,6 +25388,7 @@
/obj/structure/sign/poster/official/state_laws{
pixel_y = -32
},
/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel,
/area/science/robotics/mechbay)
"blu" = (
@@ -25550,7 +25545,7 @@
/area/science/lab)
"blM" = (
/obj/effect/turf_decal/bot,
/obj/effect/landmark/start/roboticist,
/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel,
/area/science/robotics/lab)
"blO" = (
@@ -26059,6 +26054,7 @@
/area/maintenance/aft)
"bnb" = (
/obj/machinery/recharge_station,
/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel,
/area/science/robotics/mechbay)
"bnc" = (
@@ -49658,6 +49654,7 @@
/area/ai_monitored/turret_protected/aisat_interior)
"cum" = (
/obj/machinery/recharge_station,
/obj/effect/landmark/start/cyborg,
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/aisat/service)
"cun" = (
@@ -52362,6 +52359,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/landmark/start/roboticist,
/turf/open/floor/plasteel,
/area/science/robotics/lab)
"cHT" = (
@@ -52438,7 +52436,7 @@
"cIc" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/bot,
/obj/effect/landmark/start/roboticist,
/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel,
/area/science/robotics/lab)
"cId" = (
@@ -53471,14 +53469,11 @@
/turf/open/floor/wood,
/area/crew_quarters/bar)
"est" = (
/obj/machinery/light{
dir = 1
},
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-03"
/obj/machinery/computer/shuttle/mining/common{
dir = 4
},
/turf/open/floor/plasteel/white/corner{
dir = 1
@@ -53625,6 +53620,10 @@
},
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"eZP" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/space/basic,
/area/hallway/secondary/entry)
"fbm" = (
/obj/structure/chair/comfy/brown{
dir = 4
@@ -54818,6 +54817,15 @@
},
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"jnX" = (
/obj/machinery/door/airlock/external{
name = "Common Mining Shuttle Bay"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plating,
/area/hallway/secondary/entry)
"job" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -55374,6 +55382,10 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"kRw" = (
/obj/effect/landmark/start/roboticist,
/turf/open/floor/plasteel/white,
/area/science/robotics/lab)
"kSb" = (
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -56831,6 +56843,18 @@
},
/turf/open/floor/plasteel/dark,
/area/maintenance/port)
"rHa" = (
/obj/docking_port/stationary{
dir = 8;
dwidth = 3;
height = 5;
id = "commonmining_home";
name = "SS13: Common Mining Dock";
roundstart_template = /datum/map_template/shuttle/mining_common/meta;
width = 7
},
/turf/open/space/basic,
/area/space)
"rKc" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -58110,6 +58134,11 @@
"vYa" = (
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"vZs" = (
/obj/structure/lattice,
/obj/structure/lattice,
/turf/open/space,
/area/space/nearstation)
"wcy" = (
/obj/structure/reagent_dispensers/water_cooler,
/obj/structure/cable{
@@ -58551,6 +58580,15 @@
},
/turf/open/floor/plasteel,
/area/science/circuit)
"ycF" = (
/obj/machinery/door/airlock/external{
name = "Common Mining Shuttle Bay"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plating,
/area/hallway/secondary/entry)
"ydD" = (
/obj/effect/turf_decal/bot,
/obj/machinery/suit_storage_unit/rd,
@@ -66662,7 +66700,7 @@ aaa
aaa
aaa
aaa
aaf
aoV
aaa
aaa
aaa
@@ -66919,12 +66957,12 @@ aaa
aaa
aaa
aaa
aaf
aoV
aaa
rHa
aaa
aaa
aaa
aaa
aaf
aoV
aaa
aaa
aaa
@@ -67176,12 +67214,12 @@ aaa
aaa
aaa
aaa
aaf
aaa
aaa
aaa
aaf
aaf
asE
asE
ycF
asE
asE
aoV
aaa
aaa
aaa
@@ -67434,11 +67472,11 @@ aaa
aaa
aaa
aaf
aaa
aaf
aaa
aAC
eZP
auP
eZP
aaf
vZs
aaa
aaa
aaa
@@ -67691,10 +67729,10 @@ aaa
aaa
aaa
arB
awW
awW
asE
arB
jnX
asE
aAC
aaf
aaa
aaa
@@ -91636,7 +91674,7 @@ bMK
cbB
alk
alX
aoZ
cbA
bQt
apa
cgX
@@ -102905,7 +102943,7 @@ aYV
bfV
bhw
cHM
biL
kRw
blB
blF
cHS
_maps/map_files/Deltastation/DeltaStation2.dmm
+71 -16
View File
@@ -159,7 +159,9 @@
/area/construction/mining/aux_base)
"abe" = (
/obj/effect/turf_decal/delivery,
/obj/item/twohanded/required/kirbyplants/random,
/obj/effect/turf_decal/stripes/end{
dir = 1
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"abf" = (
@@ -182,7 +184,7 @@
pixel_x = -23
},
/obj/effect/turf_decal/stripes/line{
dir = 9
dir = 8
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
@@ -108781,6 +108783,7 @@
"dCs" = (
/obj/effect/decal/cleanable/oil,
/obj/effect/turf_decal/bot,
/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel,
/area/science/robotics/lab)
"dCt" = (
@@ -108800,6 +108803,7 @@
"dCu" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/bot,
/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel,
/area/science/robotics/lab)
"dCv" = (
@@ -110235,6 +110239,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/bot,
/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel,
/area/science/robotics/lab)
"dEL" = (
@@ -110253,6 +110258,7 @@
/area/science/robotics/lab)
"dEM" = (
/obj/effect/turf_decal/bot,
/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel,
/area/science/robotics/lab)
"dEN" = (
@@ -125760,6 +125766,17 @@
},
/turf/open/floor/plasteel/dark,
/area/science/mixing)
"eYg" = (
/obj/machinery/door/airlock/external{
name = "External Docking Port"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"faI" = (
/obj/structure/cable/white{
icon_state = "1-2"
@@ -125918,6 +125935,15 @@
},
/turf/open/floor/engine,
/area/science/mixing)
"gdb" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"giN" = (
/obj/structure/window/reinforced{
dir = 8
@@ -125929,6 +125955,19 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall/r_wall,
/area/science/circuit)
"gmn" = (
/obj/machinery/door/airlock/external{
name = "External Docking Port"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"gut" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -126063,6 +126102,11 @@
/obj/structure/sign/warning/vacuum,
/turf/closed/wall/r_wall,
/area/chapel/office)
"hlu" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/computer/shuttle/mining/common,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"hrP" = (
/obj/structure/cable/white{
icon_state = "1-2"
@@ -127466,6 +127510,17 @@
},
/turf/open/floor/plasteel,
/area/science/research/abandoned)
"xDY" = (
/obj/docking_port/stationary{
dwidth = 3;
height = 5;
id = "commonmining_home";
name = "SS13: Common Mining Dock";
roundstart_template = /datum/map_template/shuttle/mining_common/meta;
width = 7
},
/turf/open/space/basic,
/area/space)
"xDZ" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1
@@ -159473,8 +159528,8 @@ aaa
aaa
aaa
aaa
aaa
aaa
rqh
rqh
aad
aad
aaa
@@ -159729,8 +159784,8 @@ aaa
aaa
aaa
aaa
aaa
aaa
aaO
aaO
aaO
aaO
abf
@@ -159985,10 +160040,10 @@ aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaO
xDY
eYg
gdb
gmn
abe
abp
abC
@@ -160243,10 +160298,10 @@ aaa
aaa
aaa
aaa
aaa
aaa
aaO
abe
aaO
aaO
hlu
abq
abD
abD
@@ -160501,7 +160556,7 @@ aaa
aaa
aaa
aaa
aaa
rqh
aaO
aaO
abf
@@ -160758,8 +160813,8 @@ aaa
aaa
aaa
aaa
aaa
aaa
rqh
rqh
aad
aad
aaa
_maps/map_files/MetaStation/MetaStation.dmm
+954 -923
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/Mining/Lavaland.dmm
+1918 -1040
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/PubbyStation/PubbyStation.dmm
+7 -4
View File
@@ -25468,6 +25468,7 @@
"biw" = (
/obj/machinery/recharge_station,
/obj/effect/turf_decal/bot,
/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/dark,
/area/science/robotics/mechbay)
"bix" = (
@@ -26658,6 +26659,7 @@
/obj/effect/turf_decal/tile/green{
dir = 4
},
/obj/effect/landmark/start/roboticist,
/turf/open/floor/plasteel,
/area/science/robotics/lab)
"blJ" = (
@@ -27579,6 +27581,7 @@
/area/science/robotics/lab)
"bnQ" = (
/obj/effect/turf_decal/bot,
/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel,
/area/science/robotics/lab)
"bnR" = (
@@ -28095,8 +28098,8 @@
/turf/open/floor/plasteel/dark,
/area/science/robotics/lab)
"boY" = (
/obj/effect/landmark/start/roboticist,
/obj/effect/turf_decal/bot,
/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel,
/area/science/robotics/lab)
"boZ" = (
@@ -98808,8 +98811,8 @@ beI
bkt
blH
bmO
bnQ
bnQ
boY
boY
bqi
bry
bsZ
@@ -99065,7 +99068,7 @@ bju
bkt
blI
bmO
bnQ
boY
boY
bqi
brz
_maps/shuttles/mining_common_meta.dmm
+124
View File
@@ -0,0 +1,124 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/closed/wall/mineral/titanium,
/area/shuttle/mining)
"b" = (
/obj/effect/spawner/structure/window/shuttle,
/turf/open/floor/plating,
/area/shuttle/mining)
"c" = (
/obj/structure/table,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/mining)
"d" = (
/obj/machinery/computer/shuttle/mining/common,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/mining)
"e" = (
/turf/open/floor/mineral/titanium,
/area/shuttle/mining)
"f" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/mining)
"g" = (
/obj/machinery/light{
dir = 8
},
/turf/open/floor/mineral/titanium,
/area/shuttle/mining)
"h" = (
/obj/machinery/door/airlock/titanium{
name = "Lavaland Shuttle Airlock"
},
/obj/docking_port/mobile{
dir = 8;
dwidth = 3;
height = 5;
id = "mining_common";
name = "lavaland shuttle";
port_direction = 4;
width = 7
},
/turf/open/floor/plating,
/area/shuttle/mining)
"i" = (
/obj/structure/closet/crate,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/mining)
"j" = (
/obj/structure/shuttle/engine/heater,
/obj/structure/window/reinforced{
dir = 1;
layer = 2.9
},
/obj/structure/window/reinforced{
dir = 8
},
/obj/structure/window/reinforced{
dir = 4
},
/turf/open/floor/plating,
/area/shuttle/mining)
"k" = (
/obj/structure/ore_box,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/mining)
"l" = (
/obj/structure/shuttle/engine/propulsion/burst,
/turf/open/floor/plating/airless,
/area/shuttle/mining)
"Q" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium,
/area/shuttle/mining)
(1,1,1) = {"
a
a
b
a
b
a
a
"}
(2,1,1) = {"
a
c
e
g
f
i
a
"}
(3,1,1) = {"
b
d
Q
e
f
j
l
"}
(4,1,1) = {"
a
c
e
e
f
k
a
"}
(5,1,1) = {"
a
a
b
h
b
a
a
"}