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

Merge pull request #3468 from Citadel-Station-13/upstream-merge-31791

Browse Source 
[MIRROR] Fixes mapping issues introduced in #30909
This commit is contained in:
LetterJay
2017-10-18 07:37:35 -04:00
committed by GitHub
parent c8cd79c175 da43e2cd46
commit 9e61ff1333
4 changed files with 175038 additions and 174954 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/BoxStation/BoxStation.dmm
+12 -4
View File
@@ -57018,12 +57018,14 @@
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 8
},
/obj/structure/window/plasma/reinforced/spawner/east,
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
},
/obj/structure/window/plasma/reinforced{
dir = 4
},
/turf/open/floor/engine,
/area/engine/supermatter)
"cEw" = (
@@ -57042,12 +57044,14 @@
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 4
},
/obj/structure/window/plasma/reinforced/spawner/west,
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable/yellow{
d2 = 4;
icon_state = "0-4"
},
/obj/structure/window/plasma/reinforced{
dir = 8
},
/turf/open/floor/engine,
/area/engine/supermatter)
"cEz" = (
@@ -57229,24 +57233,28 @@
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 5
},
/obj/structure/window/plasma/reinforced/spawner/east,
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable/yellow{
d2 = 8;
icon_state = "0-8"
},
/obj/structure/window/plasma/reinforced{
dir = 4
},
/turf/open/floor/engine,
/area/engine/supermatter)
"cFh" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 9
},
/obj/structure/window/plasma/reinforced/spawner/west,
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable/yellow{
d2 = 4;
icon_state = "0-4"
},
/obj/structure/window/plasma/reinforced{
dir = 8
},
/turf/open/floor/engine,
/area/engine/supermatter)
"cFj" = (
_maps/map_files/Deltastation/DeltaStation2.dmm
+174996 -174932
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/MetaStation/MetaStation.dmm
+8 -4
View File
@@ -80884,9 +80884,9 @@
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 1
},
/obj/structure/window/plasma/reinforced/spawner,
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable,
/obj/structure/window/plasma/reinforced,
/turf/open/floor/engine,
/area/engine/supermatter)
"dbb" = (
@@ -82698,9 +82698,9 @@
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 10
},
/obj/structure/window/plasma/reinforced/spawner,
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable,
/obj/structure/window/plasma/reinforced,
/turf/open/floor/engine,
/area/engine/supermatter)
"deU" = (
@@ -82811,24 +82811,28 @@
/area/engine/supermatter)
"dfk" = (
/obj/machinery/atmospherics/pipe/manifold/general/visible,
/obj/structure/window/plasma/reinforced/spawner/north,
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
},
/obj/structure/window/plasma/reinforced{
dir = 1
},
/turf/open/floor/engine,
/area/engine/supermatter)
"dfm" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 9
},
/obj/structure/window/plasma/reinforced/spawner/north,
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
},
/obj/structure/window/plasma/reinforced{
dir = 1
},
/turf/open/floor/engine,
/area/engine/supermatter)
"dfp" = (
_maps/map_files/OmegaStation/OmegaStation.dmm
+22 -14
View File
@@ -22161,7 +22161,7 @@
network = list("Engine");
pixel_x = 23
},
/obj/structure/cable/yellow{
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
@@ -22172,13 +22172,15 @@
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 8
},
/obj/structure/window/plasma/reinforced/spawner/east,
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable/yellow{
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/turf/open/floor/engine,
/obj/structure/window/plasma/reinforced{
dir = 4
},
/turf/open/floor/circuit/green,
/area/engine/supermatter)
"aMT" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
@@ -22199,16 +22201,18 @@
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 4
},
/obj/structure/window/plasma/reinforced/spawner/west,
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable/yellow{
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
},
/turf/open/floor/engine,
/obj/structure/window/plasma/reinforced{
dir = 8
},
/turf/open/floor/circuit/green,
/area/engine/supermatter)
"aMX" = (
/obj/structure/cable/yellow{
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
@@ -23109,25 +23113,29 @@
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 5
},
/obj/structure/window/plasma/reinforced/spawner/east,
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable/yellow{
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/turf/open/floor/engine,
/obj/structure/window/plasma/reinforced{
dir = 4
},
/turf/open/floor/circuit/green,
/area/engine/supermatter)
"aOD" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 9
},
/obj/structure/window/plasma/reinforced/spawner/west,
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable/yellow{
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
},
/turf/open/floor/engine,
/obj/structure/window/plasma/reinforced{
dir = 8
},
/turf/open/floor/circuit/green,
/area/engine/supermatter)
"aOE" = (
/obj/structure/cable{