Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

* fuck pubby

* fuck you too ceres

* ree

* this is going to be a disaster isn't it

* disaster

* dme

* -_-

* tg

* woops

* proper sync

* Welcome to conflict hell.

* lets hope this fixes more things than it breaks

* gdi

* goddamnit
This commit is contained in:
kevinz000
2017-08-24 21:07:58 -07:00
committed by GitHub
parent 188193eb61
commit c638386507
219 changed files with 40493 additions and 56328 deletions
+8 -17
View File
@@ -141,8 +141,7 @@
},
/area/engine/gravity_generator)
"au" = (
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile,
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'RADIOACTIVE AREA'";
icon_state = "radiation";
@@ -259,8 +258,7 @@
},
/area/engine/gravity_generator)
"aI" = (
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile,
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/engine/gravity_generator)
"aJ" = (
@@ -545,8 +543,7 @@
/turf/closed/wall/r_wall,
/area/bridge)
"bv" = (
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile,
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/bridge)
"bw" = (
@@ -715,7 +712,6 @@
},
/obj/structure/closet/firecloset/full,
/turf/open/floor/plasteel/arrival{
icon_state = "arrival";
dir = 9
},
/area/hallway/secondary/entry)
@@ -741,13 +737,11 @@
},
/area/hallway/secondary/entry)
"bY" = (
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile,
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/maintenance/department/bridge)
"bZ" = (
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile,
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/hallway/primary/central)
"ca" = (
@@ -781,8 +775,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"cd" = (
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile,
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
d1 = 4;
d2 = 8;
@@ -824,8 +817,7 @@
},
/area/bridge)
"ch" = (
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile,
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
d1 = 4;
d2 = 8;
@@ -1070,8 +1062,7 @@
/turf/open/floor/plasteel,
/area/construction)
"cR" = (
/obj/structure/grille,
/obj/structure/window/reinforced/fulltile,
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/construction)
"cS" = (