Skip to content

Commit

Permalink
Cooonflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Arturlang committed Jun 15, 2020
2 parents 8633191 + 1d3cad0 commit ceba739
Show file tree
Hide file tree
Showing 278 changed files with 41,559 additions and 37,625 deletions.
57 changes: 41 additions & 16 deletions _maps/map_files/BoxStation/BoxStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -34199,7 +34199,10 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
/turf/open/floor/plasteel,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/engine,
/area/science/storage)
"bCY" = (
/obj/effect/turf_decal/tile/blue{
Expand Down Expand Up @@ -34264,7 +34267,10 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/engine,
/area/science/storage)
"bDg" = (
/obj/structure/rack,
Expand All @@ -34289,7 +34295,10 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/engine,
/area/science/storage)
"bDk" = (
/obj/structure/table,
Expand Down Expand Up @@ -34637,7 +34646,8 @@
icon_state = "4-8"
},
/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plasteel,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/engine,
/area/science/storage)
"bDZ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
Expand All @@ -34658,13 +34668,15 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
/turf/open/floor/plasteel,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/engine,
/area/science/storage)
"bEc" = (
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/plasteel,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/engine,
/area/science/storage)
"bEd" = (
/obj/structure/disposalpipe/segment{
Expand Down Expand Up @@ -34788,15 +34800,15 @@
"bEo" = (
/obj/machinery/portable_atmospherics/canister/toxins,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/turf/open/floor/engine,
/area/science/storage)
"bEp" = (
/obj/machinery/portable_atmospherics/canister/toxins,
/obj/structure/sign/warning/nosmoking{
pixel_y = 32
},
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/turf/open/floor/engine,
/area/science/storage)
"bEq" = (
/obj/machinery/power/apc{
Expand Down Expand Up @@ -35392,7 +35404,10 @@
/obj/machinery/light/small{
dir = 8
},
/turf/open/floor/plasteel,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/engine,
/area/science/storage)
"bFJ" = (
/obj/structure/bed,
Expand Down Expand Up @@ -35925,7 +35940,8 @@
/area/medical/medbay/central)
"bGY" = (
/obj/machinery/portable_atmospherics/scrubber/huge,
/turf/open/floor/plasteel,
/obj/effect/turf_decal/bot,
/turf/open/floor/engine,
/area/science/storage)
"bGZ" = (
/obj/machinery/holopad,
Expand Down Expand Up @@ -35988,7 +36004,8 @@
dir = 4;
network = list("ss13","rd")
},
/turf/open/floor/plasteel,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/engine,
/area/science/storage)
"bHf" = (
/obj/structure/disposalpipe/segment,
Expand Down Expand Up @@ -36618,20 +36635,23 @@
"bIz" = (
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/turf/open/floor/engine,
/area/science/storage)
"bIA" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/turf/open/floor/engine,
/area/science/storage)
"bIB" = (
/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/turf/open/floor/engine,
/area/science/storage)
"bIC" = (
/turf/open/floor/plasteel,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/engine,
/area/science/storage)
"bID" = (
/obj/structure/disposalpipe/segment{
Expand Down Expand Up @@ -54029,6 +54049,11 @@
},
/turf/open/floor/plasteel,
/area/security/processing)
"fbp" = (
/obj/structure/tank_dispenser,
/obj/effect/turf_decal/bot,
/turf/open/floor/engine,
/area/science/storage)
"fcn" = (
/obj/structure/lattice,
/turf/closed/wall/r_wall,
Expand Down Expand Up @@ -106094,7 +106119,7 @@ bzC
bAH
bCb
bDc
bEo
fbp
bDf
bEb
bGY
Expand Down
Loading

0 comments on commit ceba739

Please sign in to comment.