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

Cooonflicts

Browse Source
This commit is contained in:
Artur
2020-06-16 01:23:42 +03:00
parent 86331912e7 1d3cad02ef
commit ceba739231
278 changed files with 41483 additions and 37549 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/BoxStation/BoxStation.dmm
+41 -16
View File
@@ -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{
@@ -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,
@@ -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,
@@ -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{
@@ -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{
@@ -34788,7 +34800,7 @@
"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,
@@ -34796,7 +34808,7 @@
pixel_y = 32
},
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/turf/open/floor/engine,
/area/science/storage)
"bEq" = (
/obj/machinery/power/apc{
@@ -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,
@@ -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,
@@ -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,
@@ -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{
@@ -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,
@@ -106094,7 +106119,7 @@ bzC
bAH
bCb
bDc
bEo
fbp
bDf
bEb
bGY
_maps/map_files/CogStation/CogStation.dmm
+141 -74
View File
@@ -49351,13 +49351,13 @@
/area/science/explab)
"cbg" = (
/obj/machinery/portable_atmospherics/canister/nitrogen,
/turf/open/floor/plating,
/turf/open/floor/engine,
/area/science/storage)
"cbh" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 1
},
/turf/open/floor/plating,
/turf/open/floor/engine,
/area/science/storage)
"cbi" = (
/obj/effect/spawner/structure/window/reinforced,
@@ -49416,7 +49416,10 @@
layer = 2.9
},
/obj/machinery/portable_atmospherics/pump,
/turf/open/floor/plating,
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/turf/open/floor/engine,
/area/science/storage)
"cbo" = (
/obj/machinery/disposal/bin,
@@ -49457,10 +49460,8 @@
/area/science/explab)
"cbu" = (
/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/plating,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/engine,
/area/science/storage)
"cbv" = (
/obj/machinery/atmospherics/pipe/simple/general/visible,
@@ -49512,7 +49513,10 @@
})
"cbC" = (
/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
/turf/open/floor/plating,
/obj/effect/turf_decal/stripes/line{
dir = 6
},
/turf/open/floor/engine,
/area/science/storage)
"cbD" = (
/obj/effect/turf_decal/tile/neutral{
@@ -52714,7 +52718,7 @@
/obj/structure/cable{
icon_state = "2-4"
},
/turf/open/floor/plating,
/turf/open/floor/engine,
/area/science/storage)
"chS" = (
/obj/machinery/suit_storage_unit/atmos,
@@ -52728,7 +52732,14 @@
/obj/machinery/atmospherics/components/unary/tank/air{
dir = 1
},
/turf/open/floor/plating,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/machinery/light{
dir = 8;
light_color = "#e8eaff"
},
/turf/open/floor/engine,
/area/science/storage)
"chU" = (
/obj/effect/turf_decal/tile/yellow{
@@ -52745,7 +52756,7 @@
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 1
},
/turf/open/floor/plating,
/turf/open/floor/engine,
/area/science/storage)
"chW" = (
/obj/effect/turf_decal/tile/neutral{
@@ -54329,7 +54340,7 @@
/area/science/xenobiology)
"clc" = (
/obj/machinery/atmospherics/pipe/manifold/general/visible,
/turf/open/floor/plating,
/turf/open/floor/engine,
/area/science/storage)
"cld" = (
/obj/effect/turf_decal/tile/neutral{
@@ -55076,7 +55087,7 @@
/obj/machinery/atmospherics/components/binary/valve{
dir = 4
},
/turf/open/floor/plating,
/turf/open/floor/engine,
/area/science/storage)
"cmL" = (
/obj/effect/landmark/blobstart,
@@ -55497,7 +55508,7 @@
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 8
},
/turf/open/floor/plating,
/turf/open/floor/engine,
/area/science/storage)
"cnA" = (
/obj/effect/turf_decal/tile/brown{
@@ -55632,7 +55643,8 @@
/turf/open/space/basic,
/area/solar/starboard/aft)
"cnO" = (
/turf/open/floor/plating,
/obj/effect/landmark/event_spawn,
/turf/open/floor/engine,
/area/science/storage)
"cnP" = (
/obj/structure/lattice/catwalk,
@@ -55694,7 +55706,11 @@
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plating,
/obj/machinery/light{
dir = 4;
light_color = "#e8eaff"
},
/turf/open/floor/engine,
/area/science/storage)
"cnW" = (
/obj/structure/chair/office/dark{
@@ -56576,7 +56592,10 @@
/area/space/station_ruins)
"cpD" = (
/obj/machinery/portable_atmospherics/canister/air,
/turf/open/floor/plating,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/turf/open/floor/engine,
/area/science/storage)
"cpE" = (
/obj/structure/fans/tiny,
@@ -57516,7 +57535,7 @@
/area/engine/teg_cold)
"crn" = (
/obj/machinery/atmospherics/components/binary/valve,
/turf/open/floor/plating,
/turf/open/floor/engine,
/area/science/storage)
"cro" = (
/turf/closed/wall/r_wall/rust,
@@ -58325,8 +58344,7 @@
name = "Engine Room"
})
"csR" = (
/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating,
/turf/open/floor/engine,
/area/science/storage)
"csS" = (
/obj/machinery/atmospherics/pipe/manifold/general/visible{
@@ -66344,10 +66362,50 @@
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"cGF" = (
/obj/effect/landmark/event_spawn,
/turf/open/floor/plating,
/obj/machinery/portable_atmospherics/scrubber,
/turf/open/floor/engine,
/area/science/storage)
"cGG" = (
/obj/machinery/power/apc{
areastring = "/area/science/storage";
dir = 4;
name = "Toxins Storage APC";
pixel_x = 24
},
/obj/structure/cable,
/turf/open/floor/engine,
/area/science/storage)
"cGH" = (
/obj/machinery/camera{
c_tag = "Toxins Lab - Storage";
dir = 1
},
/obj/machinery/portable_atmospherics/canister/air,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/turf/open/floor/engine,
/area/science/storage)
"cGI" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/turf/open/floor/engine,
/area/science/storage)
"cGJ" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/turf/open/floor/engine,
/area/science/storage)
"cGK" = (
/obj/structure/window/reinforced{
dir = 4;
layer = 2.9
},
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/turf/open/floor/engine,
/area/science/storage)
"cGL" = (
/obj/structure/table,
/obj/item/extinguisher,
/obj/item/storage/toolbox/mechanical,
@@ -66357,48 +66415,11 @@
pixel_x = -7;
pixel_y = 3
},
/obj/structure/cable,
/obj/machinery/power/apc{
areastring = "/area/science/storage";
dir = 4;
name = "Toxins Storage APC";
pixel_x = 24
},
/turf/open/floor/plating,
/area/science/storage)
"cGH" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/machinery/camera{
c_tag = "Toxins Lab - Storage";
dir = 1
},
/turf/open/floor/plating,
/area/science/storage)
"cGI" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/turf/open/floor/plating,
/area/science/storage)
"cGJ" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/open/floor/plating,
/area/science/storage)
"cGK" = (
/obj/structure/window/reinforced{
dir = 4;
layer = 2.9
},
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/turf/open/floor/plating,
/area/science/storage)
"cGL" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/machinery/light/small,
/turf/open/floor/plating,
/turf/open/floor/engine,
/area/science/storage)
"cGM" = (
/obj/structure/tank_dispenser,
/turf/open/floor/plating,
/turf/open/floor/engine,
/area/science/storage)
"cGN" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
@@ -66421,7 +66442,7 @@
name = "Plasma Canister Storage";
req_access_txt = "7;8"
},
/turf/open/floor/plating,
/turf/open/floor/engine,
/area/science/storage)
"cGR" = (
/obj/effect/landmark/start/scientist,
@@ -66456,11 +66477,18 @@
/area/science/storage)
"cGV" = (
/obj/machinery/portable_atmospherics/canister/toxins,
/turf/open/floor/plating,
/obj/effect/turf_decal/delivery,
/turf/open/floor/engine,
/area/science/storage)
"cGW" = (
/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/open/floor/engine,
/area/science/storage)
"cGX" = (
/obj/structure/cable{
@@ -66496,7 +66524,8 @@
c_tag = "Toxins Lab - Plasma Storage";
dir = 1
},
/turf/open/floor/plating,
/obj/effect/turf_decal/delivery,
/turf/open/floor/engine,
/area/science/storage)
"cHb" = (
/obj/structure/cable{
@@ -71710,6 +71739,13 @@
/obj/machinery/meter,
/turf/open/floor/plasteel,
/area/engine/atmos)
"dYm" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/open/floor/engine,
/area/science/storage)
"eCy" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 9
@@ -71849,6 +71885,17 @@
},
/turf/open/space/basic,
/area/space/nearstation)
"gVV" = (
/obj/structure/window/reinforced{
dir = 4;
layer = 2.9
},
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/engine,
/area/science/storage)
"hcR" = (
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 5
@@ -71888,6 +71935,13 @@
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"hFa" = (
/obj/machinery/portable_atmospherics/canister/nitrogen,
/obj/effect/turf_decal/stripes/line{
dir = 6
},
/turf/open/floor/engine,
/area/science/storage)
"hKC" = (
/obj/machinery/atmospherics/pipe/simple/yellow/visible{
dir = 5
@@ -72030,13 +72084,26 @@
/area/space/nearstation)
"mBP" = (
/obj/machinery/rnd/bepis,
/turf/open/floor/plasteel/white,
/area/science/circuit)
/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plasteel,
/area/science/mixing)
"mEa" = (
/obj/machinery/atmospherics/pipe/manifold/cyan/visible,
/obj/machinery/meter,
/turf/open/floor/plasteel,
/area/engine/atmos)
"mIm" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/light{
light_color = "#cee5d2"
},
/turf/open/floor/engine,
/area/science/storage)
"mIT" = (
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/pipe/simple/supplymain/visible,
@@ -91064,7 +91131,7 @@ bwK
bAz
bAN
cGN
cbg
hFa
chV
crn
cGI
@@ -91324,7 +91391,7 @@ bKH
cbh
clc
cGJ
cGJ
dYm
cGO
cGU
cGZ
@@ -91567,7 +91634,7 @@ aaa
aaa
bcy
bdf
bdf
mBP
crJ
blT
bqJ
@@ -91580,7 +91647,7 @@ bfn
cbb
cbn
cmK
cnO
gVV
cGK
cbb
cbb
@@ -92094,11 +92161,11 @@ cbP
bcy
cbC
cnO
cnO
csR
csR
cGQ
cGW
cGV
mIm
cbb
bKa
cGq
@@ -93387,7 +93454,7 @@ aTE
bTG
aVF
cGs
mBP
aVF
caw
caA
cHk
_maps/map_files/Deltastation/DeltaStation2.dmm
+35352 -35338
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/IceBoxStation/IceBoxStation.dmm
+40 -19
View File
@@ -34430,7 +34430,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{
@@ -34495,7 +34498,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,
@@ -34514,7 +34520,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,
@@ -34865,7 +34874,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{
@@ -34886,13 +34896,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{
@@ -35016,7 +35028,7 @@
"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,
@@ -35024,7 +35036,7 @@
pixel_y = 32
},
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/turf/open/floor/engine,
/area/science/storage)
"bEq" = (
/obj/machinery/power/apc{
@@ -35619,7 +35631,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,
@@ -36155,7 +36170,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,
@@ -36218,7 +36234,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,
@@ -36856,20 +36873,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{
@@ -37462,8 +37482,9 @@
/area/science/mixing)
"bJY" = (
/obj/structure/tank_dispenser,
/turf/open/floor/plasteel/white,
/area/science/mixing)
/obj/effect/turf_decal/bot,
/turf/open/floor/engine,
/area/science/storage)
"bJZ" = (
/obj/item/assembly/timer{
pixel_x = 5;
@@ -107682,7 +107703,7 @@ bzC
bAH
bCb
bDc
bEo
bJY
bDf
bEb
bGY
@@ -110770,7 +110791,7 @@ bEy
bFU
bFT
bFU
bJY
bFU
bEC
bMv
bNv
_maps/map_files/OmegaStation/OmegaStation.dmm
+1600 -1174
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/PubbyStation/PubbyStation.dmm
+97 -74
View File
@@ -34250,6 +34250,10 @@
"bBC" = (
/obj/machinery/portable_atmospherics/canister/toxins,
/obj/effect/turf_decal/delivery,
/obj/machinery/light{
dir = 1;
light_color = "#d1dfff"
},
/turf/open/floor/engine,
/area/science/storage)
"bBD" = (
@@ -34259,25 +34263,25 @@
/turf/open/floor/engine,
/area/science/storage)
"bBE" = (
/obj/machinery/portable_atmospherics/canister/toxins,
/obj/effect/turf_decal/delivery,
/obj/machinery/light{
dir = 1
},
/obj/effect/turf_decal/stripes/line{
dir = 4
/obj/structure/sign/poster/random{
pixel_y = 32
},
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/effect/turf_decal/bot,
/turf/open/floor/engine,
/area/science/storage)
"bBF" = (
/obj/machinery/portable_atmospherics/scrubber/huge,
/obj/machinery/airalarm{
pixel_y = 22
},
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/effect/turf_decal/bot,
/turf/open/floor/engine,
/area/science/storage)
"bBG" = (
/obj/machinery/portable_atmospherics/scrubber/huge,
/obj/effect/turf_decal/bot,
/obj/machinery/light{
dir = 1;
light_color = "#d1dfff"
},
/turf/open/floor/engine,
/area/science/storage)
"bBH" = (
@@ -34987,11 +34991,9 @@
/turf/open/floor/plating,
/area/science/storage)
"bCQ" = (
/obj/machinery/portable_atmospherics/canister/toxins,
/obj/effect/turf_decal/delivery,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/bot,
/turf/open/floor/engine,
/area/science/storage)
"bCR" = (
@@ -35412,22 +35414,19 @@
/turf/open/floor/plasteel/dark,
/area/hallway/primary/aft)
"bDL" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/effect/turf_decal/bot,
/obj/structure/sign/warning/nosmoking{
pixel_x = -32
},
/turf/open/floor/engine,
/area/science/storage)
"bDM" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/effect/turf_decal/bot,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/engine,
/area/science/storage)
"bDN" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/machinery/portable_atmospherics/canister/toxins,
/obj/effect/turf_decal/delivery,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/engine,
/area/science/storage)
"bDO" = (
@@ -36211,20 +36210,18 @@
/area/hallway/primary/aft)
"bFa" = (
/obj/effect/turf_decal/bot,
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/engine,
/area/science/storage)
"bFb" = (
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/bot,
/turf/open/floor/engine,
/area/science/storage)
"bFc" = (
/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/stripes/line{
dir = 4
dir = 5
},
/turf/open/floor/engine,
/area/science/storage)
@@ -36284,7 +36281,6 @@
/turf/open/floor/plasteel/white,
/area/science/mixing)
"bFl" = (
/obj/machinery/portable_atmospherics/pump,
/turf/open/floor/plasteel/white,
/area/science/mixing)
"bFm" = (
@@ -36325,6 +36321,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/structure/sign/warning/nosmoking{
pixel_x = 32
},
/turf/open/floor/plasteel/dark,
/area/science/mixing)
"bFr" = (
@@ -36666,25 +36665,24 @@
/area/hallway/primary/aft)
"bGf" = (
/obj/effect/turf_decal/bot,
/obj/machinery/portable_atmospherics/canister/nitrogen,
/obj/effect/turf_decal/stripes/line,
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/turf/open/floor/engine,
/area/science/storage)
"bGg" = (
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/bot,
/turf/open/floor/engine,
/area/science/storage)
"bGh" = (
/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/stripes/line{
dir = 6
},
/turf/open/floor/engine,
/area/science/storage)
"bGh" = (
/obj/machinery/portable_atmospherics/scrubber,
/obj/effect/turf_decal/bot,
/turf/open/floor/engine,
/area/science/storage)
"bGi" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -36716,11 +36714,11 @@
/turf/open/floor/plasteel/dark,
/area/science/explab)
"bGl" = (
/obj/machinery/portable_atmospherics/scrubber,
/obj/effect/turf_decal/tile/purple,
/obj/effect/turf_decal/tile/purple{
dir = 4
},
/obj/structure/closet/firecloset,
/turf/open/floor/plasteel/dark,
/area/science/explab)
"bGm" = (
@@ -36829,7 +36827,6 @@
/turf/open/floor/plasteel/white,
/area/science/mixing)
"bGr" = (
/obj/structure/tank_dispenser,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -36837,6 +36834,7 @@
/obj/effect/turf_decal/tile/purple{
dir = 8
},
/obj/machinery/portable_atmospherics/pump,
/turf/open/floor/plasteel/white,
/area/science/mixing)
"bGs" = (
@@ -37372,8 +37370,9 @@
/obj/structure/cable{
icon_state = "1-2"
},
/obj/structure/sign/poster/random{
pixel_x = 32
/obj/machinery/airalarm{
dir = 8;
pixel_x = 24
},
/turf/open/floor/engine,
/area/science/storage)
@@ -37926,54 +37925,56 @@
/turf/open/floor/plasteel/dark,
/area/hallway/primary/aft)
"bIF" = (
/obj/machinery/power/apc{
dir = 8;
name = "Toxins Storage APC";
pixel_x = -25
/obj/structure/tank_dispenser,
/obj/effect/turf_decal/stripes/line{
dir = 5
},
/obj/structure/cable{
icon_state = "0-4"
},
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/bot,
/obj/machinery/light,
/turf/open/floor/engine,
/area/science/storage)
"bIG" = (
/obj/structure/cable{
icon_state = "2-8"
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/turf_decal/stripes/line,
/obj/structure/cable{
icon_state = "2-4"
},
/turf/open/floor/engine,
/area/science/storage)
"bIH" = (
/obj/machinery/light,
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/turf_decal/stripes/line,
/obj/machinery/pipedispenser,
/obj/machinery/power/apc{
name = "Toxins Storage APC";
pixel_y = -25
},
/obj/structure/cable{
icon_state = "0-8"
},
/turf/open/floor/engine,
/area/science/storage)
"bII" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/structure/sign/warning/nosmoking{
pixel_y = -32
/obj/machinery/portable_atmospherics/canister/nitrogen,
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
/obj/machinery/pipedispenser/disposal,
/obj/effect/turf_decal/bot,
/turf/open/floor/engine,
/area/science/storage)
"bIJ" = (
/obj/structure/cable{
icon_state = "1-8"
},
/obj/machinery/pipedispenser/disposal/transit_tube,
/obj/machinery/portable_atmospherics/canister/nitrogen,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/turf_decal/bot,
/obj/machinery/light,
/turf/open/floor/engine,
/area/science/storage)
"bIK" = (
@@ -42856,6 +42857,7 @@
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
/obj/machinery/pipedispenser,
/turf/open/floor/plasteel,
/area/engine/atmos)
"bTL" = (
@@ -42871,6 +42873,7 @@
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
/obj/machinery/pipedispenser/disposal,
/turf/open/floor/plasteel,
/area/engine/atmos)
"bTM" = (
@@ -57023,6 +57026,13 @@
/obj/machinery/atmospherics/components/unary/outlet_injector/on,
/turf/open/floor/plating,
/area/security/execution/transfer)
"mzE" = (
/obj/machinery/portable_atmospherics/canister/toxins,
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/engine,
/area/science/storage)
"mzU" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/closed/wall,
@@ -59367,6 +59377,13 @@
},
/turf/open/floor/plating/airless,
/area/maintenance/department/engine)
"rNi" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4
},
/obj/machinery/pipedispenser/disposal/transit_tube,
/turf/open/floor/plasteel,
/area/engine/atmos)
"rNB" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -61836,6 +61853,12 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"xEx" = (
/obj/machinery/portable_atmospherics/scrubber/huge,
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/bot,
/turf/open/floor/engine,
/area/science/storage)
"xFl" = (
/obj/machinery/power/apc/highcap/five_k{
areastring = "/area/tcommsat/server";
@@ -97911,7 +97934,7 @@ bPQ
bPQ
bQI
bPQ
bNc
rNi
bMf
bMf
hjk
@@ -99950,7 +99973,7 @@ bxt
byS
bAA
bBC
bBC
bDN
bDL
bFa
bGf
@@ -100207,7 +100230,7 @@ bxu
byT
bAB
bBD
bBD
mzE
bDM
bFb
bGg
@@ -100465,8 +100488,8 @@ byU
bAA
bBE
bCQ
bDN
bFc
bCR
bGh
bGh
bCR
bIH
@@ -100721,7 +100744,7 @@ bxw
byV
bAA
bBF
bCR
bCQ
bDO
bCR
bCR
@@ -100978,7 +101001,7 @@ bxx
byW
bAA
bBG
bCR
xEx
bDP
bFd
bGi