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

Fixes mapping issues introduced in #30909

Browse Source
This commit is contained in:
ShizCalev
2017-10-17 14:35:24 -04:00
committed by CitadelStationBot
parent 9691c9130f
commit df524ddaa6
4 changed files with 117 additions and 60 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
+75 -38
View File
@@ -8739,13 +8739,7 @@
/turf/open/floor/plating,
/area/engine/supermatter)
"auC" = (
/obj/machinery/camera{
c_tag = "Supermatter Chamber";
dir = 2;
network = list("Engine");
pixel_x = 23
},
/obj/structure/cable/yellow{
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
@@ -8753,16 +8747,18 @@
/turf/open/floor/engine,
/area/engine/supermatter)
"auD" = (
/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/machinery/atmospherics/pipe/simple/general/visible{
dir = 6
},
/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)
"auE" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
@@ -8777,23 +8773,30 @@
/turf/open/floor/engine,
/area/engine/supermatter)
"auG" = (
/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/machinery/atmospherics/pipe/simple/general/visible{
dir = 10
},
/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)
"auH" = (
/obj/structure/cable/yellow{
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/camera{
c_tag = "Supermatter Chamber";
dir = 2;
network = list("Engine");
},
/turf/open/floor/engine,
/area/engine/supermatter)
"auI" = (
@@ -9314,32 +9317,36 @@
/turf/open/floor/plasteel,
/area/engine/atmospherics_engine)
"avP" = (
/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/machinery/atmospherics/pipe/manifold/general/visible{
dir = 8
},
/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)
"avQ" = (
/obj/machinery/power/supermatter_shard/crystal/engine,
/turf/open/floor/engine,
/area/engine/supermatter)
"avR" = (
/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/machinery/atmospherics/pipe/manifold/general/visible{
dir = 4
},
/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)
"avS" = (
/obj/structure/cable{
@@ -109387,6 +109394,7 @@
/turf/open/space/basic,
/area/space)
"YGJ" = (
<<<<<<< HEAD
/obj/machinery/vending/kink,
/turf/open/floor/plating,
/area/maintenance/port/fore)
@@ -109394,6 +109402,35 @@
/obj/machinery/vending/kink,
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
=======
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 8
},
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable{
d2 = 8;
icon_state = "0-8"
},
/obj/structure/window/plasma/reinforced{
dir = 4
},
/turf/open/floor/circuit/green,
/area/engine/supermatter)
"YGK" = (
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 4
},
/obj/machinery/power/rad_collector/anchored,
/obj/structure/cable{
d2 = 4;
icon_state = "0-4"
},
/obj/structure/window/plasma/reinforced{
dir = 8
},
/turf/open/floor/circuit/green,
/area/engine/supermatter)
>>>>>>> 6f3b4a5... Fixes mapping issues introduced in #30909 (#31791)
(1,1,1) = {"
aaa
@@ -134403,8 +134440,8 @@ ard
asi
ehy
auC
auH
auH
auC
auC
ehy
azc
aAc
@@ -134660,7 +134697,7 @@ are
asj
ehy
auD
auD
YGJ
avP
axP
ehJ
@@ -135688,7 +135725,7 @@ ari
asn
ehy
auG
auG
YGK
avR
axT
ehJ
@@ -135945,8 +135982,8 @@ ebP
aso
ehy
auH
auH
auH
auC
auC
ehy
azg
aAe
_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{