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

Merge pull request #2567 from Citadel-Station-13/upstream-merge-30277

Browse Source 
[MIRROR] Fixed Omega comms power
This commit is contained in:
LetterJay
2017-08-31 22:24:37 -05:00
committed by GitHub
parent 9253da58ae e2a7a40ce2
commit 8ac267eafa
1 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/OmegaStation/OmegaStation.dmm
+31 -27
View File
@@ -18893,7 +18893,6 @@
},
/obj/structure/cable{
icon_state = "0-2";
pixel_y = 1;
d2 = 2
},
/obj/effect/decal/cleanable/dirt,
@@ -21313,14 +21312,14 @@
/obj/machinery/power/smes{
charge = 5e+006
},
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
},
/obj/structure/sign/electricshock{
pixel_y = 32
},
/obj/effect/turf_decal/bot,
/obj/structure/cable{
icon_state = "0-2";
d2 = 2
},
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"aJo" = (
@@ -21935,35 +21934,25 @@
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"aKu" = (
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/obj/machinery/holopad,
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
},
/obj/structure/cable{
d1 = 4;
d1 = 2;
d2 = 8;
icon_state = "4-8"
icon_state = "2-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel/neutral,
/area/engine/gravity_generator)
"aKv" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/structure/cable/white{
d1 = 1;
@@ -21977,17 +21966,17 @@
/area/engine/gravity_generator)
"aKw" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/structure/cable/white{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/effect/turf_decal/delivery,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"aKx" = (
@@ -22671,6 +22660,11 @@
icon_state = "1-2"
},
/obj/effect/turf_decal/stripes/line,
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"aLJ" = (
@@ -22678,6 +22672,11 @@
/obj/effect/turf_decal/stripes/line{
dir = 6
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"aLK" = (
@@ -22693,6 +22692,11 @@
dir = 4
},
/obj/effect/turf_decal/bot,
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"aLL" = (