Merge pull request #5735 from Heroman3003/distill

Maps in distilleries
This commit is contained in:
Novacat
2019-08-29 20:31:26 -04:00
committed by GitHub
2 changed files with 42 additions and 40 deletions
+18 -17
View File
@@ -1069,6 +1069,15 @@
},
/turf/simulated/floor/wood,
/area/tether/surfacebase/reading_room)
"cj" = (
/obj/structure/table/woodentable,
/obj/machinery/firealarm{
dir = 1;
pixel_y = -24
},
/obj/machinery/portable_atmospherics/powered/reagent_distillery,
/turf/simulated/floor/wood,
/area/tether/surfacebase/bar_backroom)
"ck" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -1104,6 +1113,11 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/atrium_three)
"cm" = (
/obj/structure/shuttle/engine/propulsion,
/turf/simulated/floor/reinforced,
/turf/simulated/shuttle/plating/carry,
/area/shuttle/tether/surface)
"cn" = (
/obj/machinery/atm{
pixel_y = 31
@@ -20261,11 +20275,6 @@
/obj/machinery/light,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/shuttle_pad)
"HG" = (
/obj/structure/shuttle/engine/propulsion,
/turf/simulated/floor/reinforced,
/turf/simulated/shuttle/plating/carry,
/area/shuttle/tether/surface)
"HH" = (
/obj/structure/disposalpipe/segment,
/obj/effect/floor_decal/borderfloor{
@@ -21321,14 +21330,6 @@
/obj/item/weapon/storage/briefcase/inflatable,
/turf/simulated/floor/plating,
/area/maintenance/lower/atrium)
"OV" = (
/obj/structure/table/woodentable,
/obj/machinery/firealarm{
dir = 1;
pixel_y = -24
},
/turf/simulated/floor/wood,
/area/tether/surfacebase/bar_backroom)
"Pe" = (
/obj/structure/table,
/turf/simulated/floor/carpet,
@@ -36777,7 +36778,7 @@ Jr
Js
Wh
JE
HG
cm
IY
bg
RO
@@ -36919,7 +36920,7 @@ Js
Js
Jz
JE
HG
cm
IY
bg
RO
@@ -37061,7 +37062,7 @@ Jt
Js
Jz
JE
HG
cm
IY
bg
RO
@@ -37905,7 +37906,7 @@ Tv
Hw
TP
NO
OV
cj
RB
ac
ac
+24 -23
View File
@@ -2681,6 +2681,11 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/security_lockerroom)
"er" = (
/obj/structure/shuttle/engine/propulsion,
/turf/simulated/floor/reinforced,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/excursion/tether)
"es" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/railing{
@@ -2926,10 +2931,16 @@
/turf/simulated/floor,
/area/maintenance/station/ai)
"eN" = (
/obj/structure/shuttle/engine/propulsion,
/turf/simulated/floor/reinforced,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/excursion/tether)
/obj/structure/table/reinforced,
/obj/effect/floor_decal/borderfloorwhite{
dir = 1
},
/obj/effect/floor_decal/corner/paleblue/border{
dir = 1
},
/obj/machinery/portable_atmospherics/powered/reagent_distillery,
/turf/simulated/floor/tiled/white,
/area/medical/chemistry)
"eS" = (
/obj/item/frame,
/obj/effect/floor_decal/rust,
@@ -19160,16 +19171,6 @@
/obj/item/weapon/reagent_containers/dropper,
/turf/simulated/floor/tiled/white,
/area/medical/chemistry)
"DX" = (
/obj/structure/table/reinforced,
/obj/effect/floor_decal/borderfloorwhite{
dir = 1
},
/obj/effect/floor_decal/corner/paleblue/border{
dir = 1
},
/turf/simulated/floor/tiled/white,
/area/medical/chemistry)
"DY" = (
/obj/machinery/chemical_dispenser/full,
/obj/structure/table/reinforced,
@@ -38576,7 +38577,7 @@ Aq
Aw
Ck
Dq
DX
eN
ES
FH
Gx
@@ -40535,7 +40536,7 @@ Zy
WG
dj
XA
eN
er
ms
Oz
be
@@ -40677,7 +40678,7 @@ UJ
Xb
dj
XN
eN
er
ms
Xq
be
@@ -40819,7 +40820,7 @@ iW
WS
dj
XN
eN
er
ms
Vb
be
@@ -41102,7 +41103,7 @@ jZ
WR
Xo
XN
eN
er
cK
ms
Xq
@@ -41670,7 +41671,7 @@ ea
kx
dj
XN
eN
er
cK
ms
mq
@@ -41955,7 +41956,7 @@ kQ
TG
dj
XN
eN
er
ms
nA
be
@@ -42097,7 +42098,7 @@ kR
Vd
dj
XN
eN
er
ms
QL
be
@@ -42239,7 +42240,7 @@ ZE
ZB
dj
XB
eN
er
ms
Sq
be