July 5th TG sync (#1883)

July 5th TG sync
This commit is contained in:
Poojawa
2017-07-05 22:14:19 -05:00
committed by GitHub
parent 454b9c3d68
commit b1b4826c0c
1264 changed files with 149689 additions and 570309 deletions
+29 -68
View File
@@ -69,8 +69,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8";
tag = ""
icon_state = "2-8"
},
/turf/open/space,
/area/space/nearstation)
@@ -96,8 +95,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8";
tag = ""
icon_state = "2-8"
},
/turf/open/floor/plating,
/area/engine/engineering)
@@ -127,7 +125,6 @@
/obj/machinery/power/apc{
dir = 1;
name = "Gravity Generator APC";
pixel_x = 0;
pixel_y = 25
},
/obj/structure/cable{
@@ -150,7 +147,6 @@
desc = "A warning sign which reads 'RADIOACTIVE AREA'";
icon_state = "radiation";
name = "RADIOACTIVE AREA";
pixel_x = 0;
pixel_y = 32
},
/turf/open/floor/plating,
@@ -183,8 +179,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
pixel_x = 0
icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -203,8 +198,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
pixel_x = 0
icon_state = "4-8"
},
/turf/open/space,
/area/space/nearstation)
@@ -213,8 +207,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
pixel_x = 0
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/engine/engineering)
@@ -222,8 +215,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
pixel_x = 0
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/engine/engineering)
@@ -236,8 +228,7 @@
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8";
tag = ""
icon_state = "2-8"
},
/turf/open/floor/plating,
/area/engine/engineering)
@@ -246,11 +237,9 @@
/area/engine/engineering)
"aG" = (
/obj/machinery/power/terminal{
icon_state = "term";
dir = 1
},
/obj/machinery/light{
icon_state = "tube1";
dir = 8
},
/turf/open/floor/plasteel,
@@ -414,9 +403,7 @@
/turf/open/floor/plating,
/area/engine/atmos)
"ba" = (
/obj/machinery/atmospherics/components/unary/vent_pump{
on = 1
},
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plating,
/area/engine/atmos)
"bb" = (
@@ -504,23 +491,19 @@
/area/engine/atmos)
"bm" = (
/obj/machinery/atmospherics/components/binary/valve/open{
icon_state = "mvalve_map";
dir = 4
},
/turf/open/floor/plating,
/area/engine/atmos)
"bn" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9;
pixel_y = 0
dir = 9
},
/obj/machinery/light,
/turf/open/floor/plating,
/area/engine/atmos)
"bo" = (
/obj/machinery/atmospherics/components/unary/vent_pump{
on = 1
},
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/structure/table,
/obj/item/weapon/screwdriver/power,
/obj/item/weapon/wirecutters/power,
@@ -617,9 +600,8 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bD" = (
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 8;
on = 1
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
},
/turf/open/floor/plasteel,
/area/hallway/primary/central)
@@ -733,7 +715,6 @@
},
/obj/structure/closet/firecloset/full,
/turf/open/floor/plasteel/arrival{
tag = "icon-arrival (NORTHWEST)";
icon_state = "arrival";
dir = 9
},
@@ -786,8 +767,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
pixel_x = 0
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
@@ -796,8 +776,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
pixel_x = 0
icon_state = "4-8"
},
/turf/open/floor/plasteel,
/area/hallway/primary/central)
@@ -807,8 +786,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
pixel_x = 0
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/bridge)
@@ -816,8 +794,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
pixel_x = 0
icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
@@ -832,8 +809,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
pixel_x = 0
icon_state = "4-8"
},
/turf/open/floor/plasteel,
/area/bridge)
@@ -841,8 +817,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
pixel_x = 0
icon_state = "4-8"
},
/turf/open/floor/plasteel/blue/side{
dir = 4
@@ -854,8 +829,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
pixel_x = 0
icon_state = "4-8"
},
/obj/structure/cable{
d1 = 2;
@@ -869,8 +843,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
pixel_x = 0
icon_state = "4-8"
},
/turf/open/floor/plasteel,
/area/hallway/primary/central)
@@ -878,8 +851,7 @@
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
pixel_x = 0
icon_state = "4-8"
},
/obj/structure/cable{
icon_state = "1-8"
@@ -919,9 +891,7 @@
/area/hallway/primary/central)
"cp" = (
/obj/machinery/light,
/obj/machinery/atmospherics/components/unary/vent_pump{
on = 1
},
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plasteel/blue/side{
dir = 10
},
@@ -946,7 +916,6 @@
"ct" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/light{
icon_state = "tube1";
dir = 8
},
/turf/open/floor/plasteel,
@@ -1034,9 +1003,8 @@
/turf/closed/wall/r_wall,
/area/hallway/secondary/entry)
"cH" = (
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 8;
on = 1
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
},
/turf/open/floor/plasteel/arrival{
dir = 8
@@ -1140,9 +1108,8 @@
/obj/effect/turf_decal/stripes/corner,
/area/construction)
"cX" = (
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 1;
on = 1
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
/turf/open/floor/plasteel,
/obj/effect/turf_decal/stripes/line,
@@ -1171,9 +1138,8 @@
/turf/open/floor/plating,
/area/storage/primary)
"db" = (
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 1;
on = 1
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
/turf/open/floor/plating,
/area/storage/primary)
@@ -1221,8 +1187,7 @@
/area/storage/primary)
"dj" = (
/turf/open/floor/plasteel{
icon_state = "L13";
name = "floor"
icon_state = "L13"
},
/area/storage/primary)
"dk" = (
@@ -1236,7 +1201,6 @@
/area/storage/primary)
"dm" = (
/obj/machinery/light{
icon_state = "tube1";
dir = 8
},
/turf/open/floor/plasteel,
@@ -1249,7 +1213,6 @@
/area/construction)
"do" = (
/obj/machinery/light{
icon_state = "tube1";
dir = 4
},
/turf/open/floor/plasteel,
@@ -1259,7 +1222,6 @@
/area/construction)
"dp" = (
/obj/machinery/light{
icon_state = "tube1";
dir = 8
},
/turf/open/floor/plating,
@@ -1301,7 +1263,6 @@
/area/storage/primary)
"dx" = (
/obj/machinery/light{
icon_state = "tube1";
dir = 4
},
/turf/open/floor/plating,