[s] Hopefully working re-merge of #7391

This commit is contained in:
nik707
2018-07-22 16:36:30 -05:00
parent c5ea93cb08
commit 31424150a6
+272 -183
View File
@@ -24471,18 +24471,11 @@
},
/area/medical/medbay/central)
"bmB" = (
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-21";
pixel_y = 3
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
/obj/structure/sign/poster/official/random{
pixel_y = -32
},
/turf/open/floor/plasteel/yellow/corner{
dir = 1
/turf/open/floor/plasteel/blue/corner{
dir = 8
},
/area/hallway/primary/central)
"bmC" = (
@@ -26336,17 +26329,6 @@
dir = 5
},
/area/medical/chemistry)
"bro" = (
/obj/structure/plasticflaps/opaque,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/maintenance/department/engine)
"brp" = (
/obj/item/storage/toolbox/mechanical,
/turf/open/floor/plasteel/whitepurple/side{
dir = 1
},
/area/science/lab)
"brq" = (
/obj/structure/sink/kitchen{
desc = "A sink used for washing one's hands and face. It looks rusty and home-made";
@@ -26354,6 +26336,7 @@
pixel_y = 28
},
/obj/item/stack/cable_coil/orange,
/obj/item/storage/toolbox/mechanical,
/turf/open/floor/plasteel/whitepurple/side{
dir = 1
},
@@ -27453,7 +27436,6 @@
/turf/open/floor/plasteel/whiteblue/corner,
/area/medical/medbay/central)
"buj" = (
/obj/machinery/chem_heater,
/obj/machinery/light{
dir = 8
},
@@ -27464,21 +27446,22 @@
c_tag = "Chemistry";
dir = 4
},
/obj/structure/disposalpipe/trunk{
dir = 4
},
/obj/machinery/disposal/bin,
/turf/open/floor/plasteel/whiteyellow/corner{
dir = 1
},
/area/medical/chemistry)
"buk" = (
/obj/structure/disposalpipe/segment{
dir = 6
dir = 10
},
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"bul" = (
/obj/structure/disposalpipe/trunk{
dir = 8
},
/obj/machinery/disposal/bin,
/obj/machinery/chem_heater,
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"bum" = (
@@ -27486,8 +27469,12 @@
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"bun" = (
/turf/open/floor/plasteel/whiteyellow/corner{
dir = 4
/obj/machinery/firealarm{
dir = 4;
pixel_x = 28
},
/turf/open/floor/plasteel/whiteyellow/side{
dir = 5
},
/area/medical/chemistry)
"bup" = (
@@ -27894,11 +27881,13 @@
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"bvu" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
/turf/closed/wall,
/area/maintenance/department/engine)
/turf/open/floor/plasteel/blue/corner{
dir = 8
},
/area/hallway/primary/aft)
"bvw" = (
/obj/machinery/computer/rdconsole/core{
dir = 4
@@ -29174,14 +29163,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"byy" = (
/obj/structure/chair/office/light{
dir = 4
},
/turf/open/floor/plasteel/whiteyellow/side{
dir = 4
},
/area/medical/chemistry)
"byz" = (
/obj/structure/window/reinforced{
dir = 8;
@@ -29215,28 +29196,31 @@
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"byD" = (
/obj/structure/disposalpipe/segment{
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
/obj/structure/cable{
icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
/obj/machinery/door/airlock/research{
name = "R&D Lab";
req_access_txt = "0";
req_one_access_txt = "7;29;30"
},
/turf/open/floor/plasteel/dark,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/science/lab)
"byE" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel/whitepurple/side,
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/plasteel/dark,
/area/science/lab)
"byF" = (
/obj/structure/chair/office/light{
@@ -29905,21 +29889,14 @@
},
/obj/item/stack/cable_coil/random,
/obj/item/book/manual/wiki/chemistry,
/turf/open/floor/plasteel/whiteyellow/side,
/area/medical/chemistry)
"bAh" = (
/obj/structure/table/glass,
/obj/item/grenade/chem_grenade,
/obj/item/grenade/chem_grenade,
/obj/item/stack/sheet/mineral/plasma{
amount = 2;
layer = 2.9
},
/obj/item/grenade/chem_grenade,
/obj/item/grenade/chem_grenade,
/obj/item/grenade/chem_grenade,
/obj/item/screwdriver,
/turf/open/floor/plasteel/whiteyellow/side{
dir = 6
},
/turf/open/floor/plasteel/whiteyellow/side,
/area/medical/chemistry)
"bAi" = (
/obj/machinery/smoke_machine,
@@ -29935,24 +29912,16 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/structure/sign/poster/random{
pixel_y = 32
},
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"bAm" = (
/obj/machinery/door/airlock/maintenance{
name = "Research Lab Maintenance";
req_access_txt = "0";
req_one_access_txt = "7;29"
},
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
/area/maintenance/department/engine)
/turf/closed/wall/r_wall,
/area/hallway/primary/aft)
"bAo" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -31333,8 +31302,10 @@
/obj/machinery/light/small{
dir = 4
},
/turf/open/floor/plating,
/area/maintenance/department/engine)
/turf/open/floor/plasteel/purple/side{
icon_state = "purplecorner"
},
/area/hallway/primary/aft)
"bDB" = (
/obj/machinery/airalarm/unlocked{
dir = 4;
@@ -31946,8 +31917,10 @@
},
/obj/item/stock_parts/matter_bin,
/obj/item/stock_parts/matter_bin,
/turf/open/floor/plating,
/area/maintenance/department/engine)
/turf/open/floor/plasteel/purple/side{
icon_state = "purplecorner"
},
/area/hallway/primary/aft)
"bER" = (
/obj/machinery/computer/mecha{
dir = 4
@@ -33900,6 +33873,7 @@
/obj/structure/sign/departments/engineering{
pixel_y = -32
},
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel/green/side,
/area/hallway/primary/aft)
"bJE" = (
@@ -46330,13 +46304,6 @@
/obj/item/flashlight/lantern,
/turf/open/floor/plasteel/dark,
/area/chapel/main/monastery)
"cwP" = (
/obj/machinery/firealarm{
dir = 4;
pixel_x = 28
},
/turf/closed/wall,
/area/medical/chemistry)
"cwR" = (
/obj/structure/window/reinforced{
dir = 8;
@@ -47248,6 +47215,16 @@
},
/turf/open/floor/plasteel,
/area/science/explab)
"cKV" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/obj/machinery/airalarm{
dir = 4;
pixel_x = -23
},
/turf/open/floor/plasteel/blue/corner{
dir = 8
},
/area/hallway/primary/aft)
"cOp" = (
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas,
@@ -47386,8 +47363,8 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plating,
/area/maintenance/department/engine)
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"dgz" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -47415,8 +47392,14 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
/area/maintenance/department/engine)
/obj/structure/chair{
dir = 8;
name = "Defense"
},
/turf/open/floor/plasteel/purple/side{
icon_state = "purplecorner"
},
/area/hallway/primary/aft)
"dir" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 5
@@ -47739,14 +47722,8 @@
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"eeF" = (
/obj/structure/chair{
dir = 8
},
/obj/structure/sign/poster/official/random{
pixel_y = -32
},
/turf/open/floor/plasteel/yellow/corner{
dir = 4
/turf/open/floor/plasteel/purple/side{
icon_state = "purplecorner"
},
/area/hallway/primary/central)
"eeQ" = (
@@ -47966,6 +47943,11 @@
icon_state = "platingdmg3"
},
/area/maintenance/department/security/brig)
"eRp" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"eSL" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/item/beacon,
@@ -48026,8 +48008,8 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
},
/turf/open/floor/plating,
/area/maintenance/department/engine)
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"fdS" = (
/obj/machinery/door/window/southleft{
base_state = "left";
@@ -48423,8 +48405,8 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
/turf/open/floor/plating,
/area/maintenance/department/engine)
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"gkX" = (
/obj/machinery/door/airlock/maintenance{
name = "Storage";
@@ -48919,6 +48901,14 @@
},
/turf/open/floor/plating,
/area/maintenance/department/security/brig)
"hIZ" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
/turf/open/floor/plasteel/blue/corner{
dir = 8
},
/area/hallway/primary/aft)
"hOx" = (
/obj/structure/cable{
icon_state = "2-4"
@@ -49108,6 +49098,12 @@
/obj/machinery/processor/slime,
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"imE" = (
/turf/open/floor/plasteel/purple/side{
icon_state = "purple";
dir = 4
},
/area/hallway/primary/aft)
"ioj" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -49151,6 +49147,12 @@
dir = 8
},
/area/science/xenobiology)
"iwe" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/turf/open/floor/plasteel/blue/corner{
dir = 8
},
/area/hallway/primary/aft)
"iyg" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -49537,9 +49539,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
},
/obj/structure/sign/poster/random{
pixel_y = 32
},
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-17"
},
@@ -49624,10 +49623,6 @@
},
/turf/open/floor/plating,
/area/maintenance/department/science)
"jSA" = (
/obj/structure/sign/departments/science,
/turf/closed/wall,
/area/maintenance/department/engine)
"jTh" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -50127,6 +50122,11 @@
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel/dark,
/area/library/lounge)
"ltE" = (
/turf/open/floor/plasteel/purple/side{
icon_state = "purplecorner"
},
/area/hallway/primary/aft)
"lzJ" = (
/obj/structure/closet/crate/bin,
/turf/open/floor/carpet,
@@ -50221,6 +50221,12 @@
/obj/item/wrench,
/turf/open/floor/plating,
/area/maintenance/department/science)
"lJI" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"lKL" = (
/obj/machinery/door/airlock/abandoned{
name = "Starboard Emergency Storage";
@@ -50347,12 +50353,6 @@
dir = 1
},
/area/engine/engineering)
"mcf" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"mci" = (
/obj/machinery/portable_atmospherics/canister/toxins,
/obj/structure/disposalpipe/segment{
@@ -50382,6 +50382,12 @@
},
/turf/open/floor/plating,
/area/engine/engineering)
"mhn" = (
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel/purple/side{
icon_state = "purplecorner"
},
/area/hallway/primary/aft)
"mlr" = (
/obj/structure/lattice,
/obj/structure/disposalpipe/junction{
@@ -50423,6 +50429,18 @@
dir = 1
},
/area/science/xenobiology)
"mqp" = (
/obj/machinery/firealarm{
dir = 8;
pixel_x = -28
},
/obj/machinery/light{
dir = 8
},
/turf/open/floor/plasteel/blue/corner{
dir = 8
},
/area/hallway/primary/aft)
"msX" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
@@ -50696,9 +50714,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"nnf" = (
/turf/open/floor/plasteel/whiteyellow/side,
/area/medical/chemistry)
"nnh" = (
/obj/structure/chair{
dir = 8
@@ -50981,6 +50996,11 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/wood,
/area/lawoffice)
"nTr" = (
/turf/open/floor/plasteel/blue/corner{
dir = 8
},
/area/hallway/primary/aft)
"nVU" = (
/obj/item/twohanded/spear,
/turf/open/floor/plating,
@@ -51518,8 +51538,8 @@
"phJ" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/maintenance/department/engine)
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"pjH" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -51589,6 +51609,12 @@
},
/turf/open/space/basic,
/area/space/nearstation)
"pxD" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/closed/wall,
/area/medical/chemistry)
"pBD" = (
/obj/structure/cable{
icon_state = "0-8"
@@ -51691,12 +51717,6 @@
},
/turf/closed/wall/r_wall,
/area/medical/virology)
"pSc" = (
/obj/machinery/chem_heater,
/turf/open/floor/plasteel/whiteyellow/side{
dir = 5
},
/area/medical/chemistry)
"pVD" = (
/obj/machinery/light/small{
dir = 1
@@ -52683,6 +52703,16 @@
},
/turf/open/space,
/area/engine/engineering)
"sYQ" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"sZh" = (
/obj/structure/closet/crate,
/turf/open/floor/plating,
@@ -52843,6 +52873,14 @@
icon_state = "panelscorched"
},
/area/maintenance/department/security/brig)
"tqO" = (
/obj/structure/sign/poster/official/random{
pixel_x = -32
},
/turf/open/floor/plasteel/blue/corner{
dir = 8
},
/area/hallway/primary/aft)
"tqX" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
@@ -52951,6 +52989,11 @@
},
/turf/open/floor/plating/airless,
/area/engine/engineering)
"tJr" = (
/obj/structure/plasticflaps/opaque,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/science/lab)
"tPm" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -52970,8 +53013,8 @@
/area/maintenance/department/science)
"tTl" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/maintenance/department/engine)
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"tXn" = (
/obj/structure/sink{
dir = 4;
@@ -53200,6 +53243,24 @@
/obj/machinery/field/generator,
/turf/open/floor/plating,
/area/maintenance/department/engine)
"uxP" = (
/obj/structure/disposalpipe/segment{
dir = 9
},
/obj/structure/cable{
icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
},
/obj/structure/chair{
dir = 8;
name = "Defense"
},
/turf/open/floor/plasteel/purple/side{
icon_state = "purplecorner"
},
/area/hallway/primary/aft)
"uzn" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/structure/cable{
@@ -53440,6 +53501,20 @@
},
/turf/open/floor/plating,
/area/maintenance/department/cargo)
"vsG" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/machinery/door/airlock/maintenance{
name = "Research Lab Maintenance";
req_access_txt = "0";
req_one_access_txt = "7;29"
},
/turf/open/floor/plating,
/area/maintenance/department/engine)
"vsJ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/neutral/corner{
@@ -53495,6 +53570,14 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"vzA" = (
/obj/machinery/light{
dir = 8
},
/turf/open/floor/plasteel/blue/corner{
dir = 8
},
/area/hallway/primary/aft)
"vzP" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
@@ -53550,6 +53633,12 @@
},
/turf/open/floor/plating,
/area/maintenance/department/security/brig)
"vKq" = (
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel/blue/corner{
dir = 8
},
/area/hallway/primary/aft)
"vMx" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -54121,12 +54210,10 @@
/turf/open/floor/plasteel/dark,
/area/library)
"xje" = (
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/maintenance/department/engine)
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"xjK" = (
/obj/item/radio/intercom{
name = "Station Intercom (General)";
@@ -54276,11 +54363,13 @@
/obj/structure/sign/poster/official/random{
pixel_x = -32
},
/obj/structure/chair{
dir = 4
/obj/machinery/light{
dir = 8
},
/turf/open/floor/plating,
/area/maintenance/department/engine)
/turf/open/floor/plasteel/blue/corner{
dir = 8
},
/area/hallway/primary/aft)
"xFl" = (
/obj/machinery/power/apc/highcap/five_k{
dir = 1;
@@ -85942,8 +86031,8 @@ bsM
bum
bvt
bwV
byy
bAh
byz
ooh
bpY
bCA
bDy
@@ -86197,10 +86286,10 @@ bpV
brm
bsN
bun
mcf
nnf
byz
ooh
gGA
bwW
byA
bAi
bpY
bCB
bDz
@@ -86452,14 +86541,14 @@ bmA
bjd
bpY
bpY
cwP
pSc
gGA
bwW
byA
bAi
bpY
pwj
bpY
pxD
bpY
bpY
bpY
bpY
vsG
bva
bva
bva
@@ -86707,19 +86796,19 @@ bls
aBI
aBI
bmB
bva
bsn
bva
bva
vKq
nTr
nTr
vzA
bvu
bva
bva
bva
bva
pwj
hVx
hIZ
tqO
mqp
cKV
iwe
nTr
xDj
bva
blt
jCv
bOK
bEN
@@ -86976,7 +87065,7 @@ tTl
dgg
phJ
phJ
xje
lJI
bAk
bIt
bJB
@@ -87221,19 +87310,19 @@ blu
aDZ
aDZ
eeF
bBX
bBX
bBX
bro
bBX
bBX
bBX
bBX
bva
mhn
ltE
ltE
ltE
ltE
ltE
imE
ltE
bmC
fdQ
npE
npE
bFZ
bmD
bmD
eRp
bAl
bIu
bJC
@@ -87479,20 +87568,20 @@ blt
cqh
bKM
cCl
pYw
gFo
cSK
duF
bxa
cCl
cCl
tJr
cCl
cCl
byD
bAm
dhz
bCD
uxP
bDA
bEQ
jSA
bHg
bIv
bGa
bHp
sYQ
bJD
bBo
bBo
@@ -87736,11 +87825,11 @@ bmC
cqi
boP
bqb
brp
byF
cCt
byF
cCt
pYw
gFo
cSK
duF
bxa
byE
bBp
bBp
@@ -87994,9 +88083,9 @@ cqi
boQ
cCl
brq
byF
cCt
cCt
cCt
byF
bxc
nIU
bAo