Skip to content

Commit

Permalink
Merge pull request #374 from dwasint/oops-ocean
Browse files Browse the repository at this point in the history
oshan coding the sequel
  • Loading branch information
dwasint authored Sep 26, 2023
2 parents 0df75c4 + eae7e63 commit f1c7d61
Show file tree
Hide file tree
Showing 107 changed files with 13,642 additions and 3,789 deletions.
647 changes: 312 additions & 335 deletions _maps/map_files/Deltastation/DeltaStation2.dmm

Large diffs are not rendered by default.

686 changes: 139 additions & 547 deletions _maps/map_files/IceBoxStation/IceBoxStation.dmm

Large diffs are not rendered by default.

21 changes: 15 additions & 6 deletions _maps/map_files/MetaStation/MetaStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -26881,7 +26881,10 @@
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"jLG" = (
/obj/structure/railing/corner,
/obj/structure/railing{
dir = 4;
layer = 4.1
},
/turf/open/floor/plating/airless,
/area/space/nearstation)
"jMo" = (
Expand Down Expand Up @@ -29940,9 +29943,6 @@
/turf/open/floor/iron,
/area/station/cargo/miningoffice)
"kRf" = (
/obj/structure/railing{
dir = 6
},
/obj/effect/turf_decal/trimline/yellow/filled/end,
/obj/effect/turf_decal/trimline/yellow/warning{
dir = 10
Expand All @@ -29953,6 +29953,11 @@
pixel_y = 4
},
/obj/structure/cable,
/obj/structure/railing{
dir = 4;
layer = 4.1
},
/obj/structure/railing,
/turf/open/floor/iron,
/area/station/engineering/atmos)
"kRi" = (
Expand Down Expand Up @@ -41864,8 +41869,10 @@
/area/station/hallway/secondary/entry)
"pdU" = (
/obj/structure/railing{
dir = 6
dir = 4;
layer = 4.1
},
/obj/structure/railing,
/turf/open/floor/plating/airless,
/area/space/nearstation)
"pdX" = (
Expand Down Expand Up @@ -60993,8 +61000,10 @@
/obj/structure/railing{
dir = 4
},
/obj/structure/railing,
/obj/structure/railing{
dir = 10
dir = 8;
layer = 4.1
},
/turf/open/floor/iron/dark/textured,
/area/station/engineering/atmos)
Expand Down
76 changes: 13 additions & 63 deletions _maps/map_files/Mining/Lavaland.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -560,10 +560,11 @@
/turf/open/floor/plating,
/area/mine/maintenance/production)
"dw" = (
/obj/effect/turf_decal/sand/plating/volcanic,
/obj/structure/railing{
dir = 10
dir = 8
},
/obj/effect/turf_decal/sand/plating/volcanic,
/obj/structure/railing,
/turf/open/floor/plating/lavaland_atmos,
/area/lavaland/surface/outdoors)
"dx" = (
Expand Down Expand Up @@ -745,13 +746,6 @@
/obj/structure/fans/tiny,
/turf/open/floor/plating,
/area/mine/laborcamp/security/maintenance)
"fb" = (
/obj/structure/railing/corner{
dir = 4
},
/obj/structure/lattice/catwalk/mining,
/turf/open/lava/smooth/lava_land_surface,
/area/lavaland/surface/outdoors)
"fe" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
Expand Down Expand Up @@ -3215,13 +3209,6 @@
"rF" = (
/turf/closed/wall/r_wall,
/area/mine/maintenance/labor)
"rG" = (
/obj/structure/railing/corner{
dir = 4
},
/obj/effect/turf_decal/sand/plating/volcanic,
/turf/open/floor/plating/lavaland_atmos,
/area/lavaland/surface/outdoors)
"rH" = (
/obj/machinery/mineral/processing_unit{
dir = 1;
Expand Down Expand Up @@ -3762,13 +3749,6 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/open/floor/plating,
/area/mine/maintenance/service)
"vd" = (
/obj/structure/railing/corner{
dir = 1
},
/obj/effect/turf_decal/sand/plating/volcanic,
/turf/open/floor/plating/lavaland_atmos,
/area/lavaland/surface/outdoors)
"ve" = (
/obj/structure/cable,
/obj/machinery/power/terminal{
Expand Down Expand Up @@ -4106,13 +4086,6 @@
dir = 1
},
/area/mine/mechbay)
"xh" = (
/obj/structure/railing/corner{
dir = 8
},
/obj/effect/turf_decal/sand/plating/volcanic,
/turf/open/floor/plating/lavaland_atmos,
/area/lavaland/surface/outdoors)
"xi" = (
/obj/structure/table,
/obj/item/paper,
Expand Down Expand Up @@ -4713,12 +4686,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth_edge,
/area/mine/laborcamp/production)
"AQ" = (
/obj/structure/railing/corner{
dir = 8
},
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"AV" = (
/obj/structure/closet/secure_closet/freezer/fridge,
/obj/item/reagent_containers/cup/glass/bottle/beer,
Expand All @@ -4739,10 +4706,6 @@
},
/turf/open/floor/iron/dark,
/area/mine/production)
"Bd" = (
/obj/structure/railing/corner,
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"By" = (
/obj/machinery/door/poddoor/preopen{
id = "labor";
Expand Down Expand Up @@ -6581,9 +6544,6 @@
/turf/open/floor/iron/checker,
/area/mine/cafeteria)
"MQ" = (
/obj/structure/railing/corner{
dir = 4
},
/obj/structure/sign/directions/security/directional/west{
pixel_x = 32;
pixel_y = -8
Expand Down Expand Up @@ -7288,20 +7248,10 @@
/obj/structure/closet/toolcloset,
/turf/open/floor/plating,
/area/mine/maintenance/service)
"RB" = (
/obj/structure/railing/corner{
dir = 1
},
/obj/structure/lattice/catwalk/mining,
/turf/open/lava/smooth/lava_land_surface,
/area/lavaland/surface/outdoors)
"RD" = (
/turf/closed/wall,
/area/mine/maintenance/labor)
"RF" = (
/obj/structure/railing/corner{
dir = 1
},
/obj/structure/sign/directions/security/directional/west{
pixel_x = 0;
pixel_y = 24
Expand Down Expand Up @@ -34609,7 +34559,7 @@ pU
pU
pU
pU
AQ
pU
ZM
ZM
ZM
Expand All @@ -34622,8 +34572,8 @@ ZM
ZM
ZM
Ka
vd
xh
BP
BP
dw
pU
aj
Expand Down Expand Up @@ -34864,7 +34814,7 @@ pU
pU
pU
pU
Bd
pU
VK
VK
VK
Expand Down Expand Up @@ -35137,7 +35087,7 @@ aj
aj
aj
FH
rG
BP
ol
aj
aj
Expand Down Expand Up @@ -37451,7 +37401,7 @@ px
DI
oS
BP
xh
BP
ZM
ZM
ZM
Expand Down Expand Up @@ -37711,7 +37661,7 @@ xt
VK
VK
VK
fb
tF
BP
dx
Kf
Expand Down Expand Up @@ -44383,7 +44333,7 @@ pU
nm
Nc
nm
RB
tF
Yq
aj
aj
Expand Down Expand Up @@ -47193,7 +47143,7 @@ pU
pU
pU
pU
AQ
pU
ZM
ZM
ZM
Expand Down Expand Up @@ -47450,7 +47400,7 @@ pU
pU
pU
pU
Bd
pU
VK
VK
VK
Expand Down
Loading

0 comments on commit f1c7d61

Please sign in to comment.