Merge pull request #13826 from LetterN/semi-sync

/tg/ ""hardsync"" part one of many*
This commit is contained in:
Putnam3145
2021-01-19 17:22:05 -08:00
committed by GitHub
270 changed files with 4846 additions and 2264 deletions

View File

@@ -2729,9 +2729,7 @@
/turf/open/floor/carpet,
/area/ruin/space/has_grav/skelter/admin)
"gx" = (
/obj/machinery/door/firedoor{
pixel_x = 0
},
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -2742,9 +2740,7 @@
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/skelter/shields)
"gy" = (
/obj/machinery/door/firedoor{
pixel_x = 0
},
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/airlock/engineering{
name = "Shields"

View File

@@ -13,7 +13,7 @@
#include "map_files\BoxStation\BoxStation.dmm"
#include "map_files\LambdaStation\lambda.dmm"
#ifdef TRAVISBUILDING
#ifdef CIBUILDING
#include "templates.dm"
#endif
#endif