Merge pull request #5856 from Rykka-Stormheart/shep-dev-station-cafe

Reworks Station 1 Atrium into Cafe, now with fixed conflicts!
This commit is contained in:
Novacat
2019-09-14 02:03:19 -04:00
committed by GitHub
+426 -248
View File
@@ -1116,12 +1116,35 @@
/turf/simulated/floor,
/area/maintenance/station/eng_lower)
"acf" = (
/obj/structure/railing{
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/structure/railing,
/mob/living/simple_mob/animal/passive/fish/koi/poisonous,
/turf/simulated/floor/water/pool,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
/obj/effect/floor_decal/borderfloor{
dir = 1
},
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals7,
/obj/machinery/alarm{
pixel_y = 22
},
/obj/structure/disposalpipe/junction{
dir = 8;
icon_state = "pipe-j2"
},
/turf/simulated/floor/tiled,
/area/hallway/station/atrium)
"acg" = (
/turf/simulated/wall/r_wall,
@@ -1163,6 +1186,7 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled,
/area/hallway/station/atrium)
"aco" = (
@@ -1285,53 +1309,52 @@
/area/maintenance/station/eng_lower)
"acC" = (
/obj/structure/railing{
dir = 4
dir = 8
},
/obj/structure/railing{
dir = 1
},
/obj/structure/railing,
/turf/simulated/floor/water/pool,
/area/hallway/station/atrium)
"acD" = (
/obj/structure/railing,
/obj/structure/flora/ausbushes/brflowers,
/turf/simulated/floor/grass,
/obj/structure/table/woodentable,
/turf/simulated/floor/wood,
/area/hallway/station/atrium)
"acE" = (
/obj/structure/railing,
/obj/structure/flora/ausbushes/ppflowers,
/turf/simulated/floor/grass,
/obj/structure/table/woodentable,
/obj/machinery/door/blast/shutters{
dir = 8;
id = "cafe";
layer = 3.1;
name = "Cafe Shutters"
},
/turf/simulated/floor/wood,
/area/hallway/station/atrium)
"acF" = (
/obj/structure/railing,
/obj/structure/flora/ausbushes/brflowers,
/obj/structure/disposalpipe/segment,
/obj/structure/flora/ausbushes/ppflowers,
/turf/simulated/floor/grass,
/area/hallway/station/atrium)
"acG" = (
/obj/structure/railing{
dir = 4
},
/obj/structure/flora/ausbushes/ppflowers,
/obj/structure/flora/ausbushes/brflowers,
/turf/simulated/floor/grass,
/area/hallway/station/atrium)
"acH" = (
/turf/simulated/floor/wood,
/area/hallway/station/atrium)
"acI" = (
/obj/structure/disposalpipe/trunk{
dir = 1
/obj/structure/bed/chair/wood{
dir = 4
},
/obj/machinery/disposal,
/turf/simulated/floor/wood,
/area/hallway/station/atrium)
"acJ" = (
/turf/simulated/floor,
/area/engineering/engine_room)
"acK" = (
/obj/structure/railing{
/obj/structure/bed/chair/wood{
dir = 8
},
/obj/structure/flora/ausbushes/ppflowers,
/turf/simulated/floor/grass,
/turf/simulated/floor/wood,
/area/hallway/station/atrium)
"acL" = (
/turf/simulated/wall/r_wall,
@@ -1404,8 +1427,10 @@
/turf/simulated/floor/grass,
/area/hallway/station/atrium)
"acU" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/grass,
/obj/structure/bed/chair/wood{
dir = 1
},
/turf/simulated/floor/wood,
/area/hallway/station/atrium)
"acV" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -1439,7 +1464,7 @@
/turf/simulated/floor/tiled,
/area/engineering/engine_monitoring)
"acY" = (
/obj/structure/railing{
/obj/structure/bed/chair/wood{
dir = 4
},
/turf/simulated/floor/grass,
@@ -1454,23 +1479,24 @@
/turf/simulated/floor/water/pool,
/area/hallway/station/atrium)
"ada" = (
/obj/structure/bed/chair/wood,
/turf/simulated/floor/wood,
/obj/structure/table/wooden_reinforced,
/turf/simulated/floor/grass,
/area/hallway/station/atrium)
"adb" = (
/obj/machinery/light/flamp,
/turf/simulated/floor/wood,
/obj/structure/bed/chair/wood{
dir = 1
},
/turf/simulated/floor/grass,
/area/hallway/station/atrium)
"adc" = (
/obj/structure/bed/chair/wood{
dir = 4
dir = 8
},
/turf/simulated/floor/wood,
/turf/simulated/floor/grass,
/area/hallway/station/atrium)
"add" = (
/obj/structure/table/woodentable,
/obj/machinery/recharger,
/turf/simulated/floor/wood,
/obj/structure/bed/chair/wood,
/turf/simulated/floor/grass,
/area/hallway/station/atrium)
"ade" = (
/obj/machinery/atmospherics/portables_connector,
@@ -1513,30 +1539,63 @@
/turf/simulated/floor/lino,
/area/chapel/office)
"adk" = (
/obj/structure/table/woodentable,
/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{
pixel_x = -3
},
/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{
pixel_x = 3
},
/turf/simulated/floor/wood,
/area/hallway/station/atrium)
"adl" = (
/obj/structure/bed/chair/wood{
dir = 8
},
/turf/simulated/floor/wood,
/area/hallway/station/atrium)
"adm" = (
/obj/structure/table/woodentable,
/turf/simulated/floor/wood,
/area/hallway/station/atrium)
"adn" = (
/obj/structure/bed/chair/wood{
/obj/structure/railing{
dir = 1
},
/turf/simulated/floor/wood,
/obj/structure/railing{
dir = 8
},
/mob/living/simple_mob/animal/passive/fish/koi/poisonous,
/turf/simulated/floor/water/pool,
/area/hallway/station/atrium)
"adl" = (
/obj/structure/table/woodentable,
/turf/simulated/floor/grass,
/area/hallway/station/atrium)
"adm" = (
/obj/structure/railing{
dir = 8
},
/obj/structure/railing,
/mob/living/simple_mob/animal/passive/fish/koi/poisonous,
/turf/simulated/floor/water/pool,
/area/hallway/station/atrium)
"adn" = (
/obj/structure/table/marble,
/obj/item/weapon/reagent_containers/food/drinks/cup{
pixel_x = 8;
pixel_y = 8
},
/obj/item/weapon/reagent_containers/food/drinks/cup{
pixel_x = -4;
pixel_y = 8
},
/obj/item/weapon/reagent_containers/food/drinks/cup{
pixel_x = 8;
pixel_y = -4
},
/obj/item/weapon/reagent_containers/food/drinks/cup{
pixel_x = -4;
pixel_y = -4
},
/obj/item/weapon/reagent_containers/food/drinks/cup{
pixel_x = 8
},
/obj/item/weapon/reagent_containers/food/drinks/cup{
pixel_x = -4
},
/obj/item/weapon/reagent_containers/food/drinks/cup{
pixel_x = 8;
pixel_y = 12
},
/obj/item/weapon/reagent_containers/food/drinks/cup{
pixel_x = -4;
pixel_y = 12
},
/obj/machinery/floor_light/prebuilt{
on = 1
},
/turf/simulated/floor/tiled,
/area/hallway/station/atrium)
"ado" = (
/obj/item/device/radio/intercom{
@@ -1671,28 +1730,45 @@
/turf/simulated/floor,
/area/maintenance/station/eng_lower)
"adx" = (
/obj/structure/railing{
dir = 1
/obj/structure/table/marble,
/obj/item/weapon/hand_labeler,
/obj/machinery/floor_light/prebuilt{
on = 1
},
/obj/structure/flora/ausbushes/brflowers,
/turf/simulated/floor/grass,
/obj/item/weapon/reagent_containers/glass/rag,
/obj/machinery/door/blast/shutters{
dir = 2;
id = "cafe";
layer = 3.1;
name = "Cafe Shutters"
},
/obj/item/weapon/reagent_containers/food/condiment/sugar,
/obj/item/weapon/reagent_containers/spray/cleaner,
/turf/simulated/floor/tiled,
/area/hallway/station/atrium)
"ady" = (
/obj/structure/railing{
dir = 1
/obj/structure/table/marble,
/obj/machinery/floor_light/prebuilt{
on = 1
},
/obj/structure/flora/ausbushes/ppflowers,
/turf/simulated/floor/grass,
/obj/machinery/chemical_dispenser/bar_coffee/full,
/obj/machinery/button/remote/blast_door{
desc = "A remote control-switch for shutters.";
id = "cafe";
name = "Cafe Shutters";
pixel_x = -10;
pixel_y = 36;
req_access = list();
req_one_access = list(25)
},
/turf/simulated/floor/wood,
/area/hallway/station/atrium)
"adz" = (
/obj/structure/railing{
dir = 8
},
/obj/structure/railing{
/obj/structure/disposalpipe/trunk{
dir = 1
},
/mob/living/simple_mob/animal/passive/fish/koi/poisonous,
/turf/simulated/floor/water/pool,
/obj/machinery/disposal,
/turf/simulated/floor/grass,
/area/hallway/station/atrium)
"adA" = (
/obj/structure/table/woodentable,
@@ -1755,9 +1831,6 @@
/turf/simulated/floor,
/area/maintenance/substation/engineering)
"adE" = (
/obj/structure/railing{
dir = 8
},
/obj/structure/railing{
dir = 1
},
@@ -1838,11 +1911,12 @@
/turf/simulated/floor,
/area/maintenance/station/eng_lower)
"adM" = (
/obj/structure/railing{
dir = 8
/obj/structure/table/marble,
/obj/machinery/floor_light/prebuilt{
on = 1
},
/obj/structure/railing,
/turf/simulated/floor/water/pool,
/obj/machinery/chemical_dispenser/bar_soft/full,
/turf/simulated/floor/wood,
/area/hallway/station/atrium)
"adN" = (
/turf/simulated/wall/r_wall,
@@ -3333,34 +3407,11 @@
/turf/simulated/floor/tiled,
/area/engineering/hallway)
"aga" = (
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
/obj/machinery/floor_light/prebuilt{
on = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/floor_decal/borderfloor{
dir = 1
},
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals7,
/obj/machinery/alarm{
pixel_y = 22
},
/turf/simulated/floor/tiled,
/obj/machinery/vending/boozeomat,
/turf/simulated/floor/wood,
/area/hallway/station/atrium)
"agb" = (
/obj/structure/sign/department/eng,
@@ -6626,10 +6677,19 @@
/turf/simulated/floor/tiled,
/area/engineering/hallway)
"ama" = (
/obj/structure/railing{
dir = 8
/obj/structure/table/marble,
/obj/machinery/floor_light/prebuilt{
on = 1
},
/turf/simulated/floor/grass,
/obj/machinery/door/blast/shutters{
dir = 2;
id = "cafe";
layer = 3.1;
name = "Cafe Shutters"
},
/obj/item/weapon/reagent_containers/food/drinks/shaker,
/obj/item/weapon/reagent_containers/food/snacks/donut/jelly,
/turf/simulated/floor/wood,
/area/hallway/station/atrium)
"amb" = (
/obj/structure/cable{
@@ -6728,6 +6788,16 @@
},
/turf/simulated/floor,
/area/vacant/vacant_restaurant_lower)
"ami" = (
/obj/structure/table/woodentable,
/obj/machinery/door/blast/shutters{
dir = 4;
id = "cafe";
layer = 3.1;
name = "Cafe Shutters"
},
/turf/simulated/floor/wood,
/area/hallway/station/atrium)
"amj" = (
/obj/structure/cable/green{
d1 = 4;
@@ -6769,6 +6839,16 @@
/obj/item/clothing/glasses/meson,
/turf/simulated/floor/tiled,
/area/engineering/engine_airlock)
"amm" = (
/obj/structure/table/woodentable,
/obj/machinery/door/blast/shutters{
dir = 2;
id = "cafe";
layer = 3.1;
name = "Cafe Shutters"
},
/turf/simulated/floor/wood,
/area/hallway/station/atrium)
"amn" = (
/obj/structure/cable/green{
d1 = 1;
@@ -6813,6 +6893,16 @@
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor,
/area/engineering/storage)
"amr" = (
/obj/structure/railing{
dir = 1
},
/obj/structure/railing{
icon_state = "railing0";
dir = 4
},
/turf/simulated/floor/water/pool,
/area/hallway/station/atrium)
"ams" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -6832,10 +6922,105 @@
},
/turf/simulated/floor/tiled,
/area/engineering/hallway)
"amt" = (
/obj/machinery/door/window{
icon_state = "left";
dir = 1
},
/turf/simulated/floor/wood,
/area/hallway/station/atrium)
"amu" = (
/obj/structure/railing{
dir = 1
},
/mob/living/simple_mob/animal/passive/fish/koi/poisonous,
/turf/simulated/floor/water/pool,
/area/hallway/station/atrium)
"amv" = (
/obj/structure/railing,
/turf/simulated/floor/water/pool,
/area/hallway/station/atrium)
"amw" = (
/obj/structure/railing,
/obj/structure/railing{
icon_state = "railing0";
dir = 4
},
/turf/simulated/floor/water/pool,
/area/hallway/station/atrium)
"amx" = (
/obj/structure/railing,
/obj/structure/railing{
dir = 8
},
/turf/simulated/floor/water/pool,
/area/hallway/station/atrium)
"amy" = (
/obj/machinery/door/window/northright,
/turf/simulated/floor/wood,
/area/hallway/station/atrium)
"amz" = (
/obj/structure/table/woodentable,
/obj/item/weapon/reagent_containers/food/snacks/donut/chaos,
/turf/simulated/floor/wood,
/area/hallway/station/atrium)
"amA" = (
/obj/structure/table/wooden_reinforced,
/obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly,
/turf/simulated/floor/grass,
/area/hallway/station/atrium)
"amB" = (
/obj/structure/table/woodentable,
/obj/item/weapon/reagent_containers/food/condiment/small/sugar,
/turf/simulated/floor/wood,
/area/hallway/station/atrium)
"amC" = (
/obj/structure/table/woodentable,
/obj/machinery/door/blast/shutters{
dir = 8;
id = "cafe";
layer = 3.1;
name = "Cafe Shutters"
},
/obj/item/weapon/reagent_containers/food/condiment/small/sugar,
/turf/simulated/floor/wood,
/area/hallway/station/atrium)
"amD" = (
/obj/structure/table/woodentable,
/obj/machinery/door/blast/shutters{
dir = 4;
id = "cafe";
layer = 3.1;
name = "Cafe Shutters"
},
/obj/item/weapon/reagent_containers/food/condiment/small/sugar,
/turf/simulated/floor/wood,
/area/hallway/station/atrium)
"amE" = (
/obj/machinery/portable_atmospherics/powered/pump/filled,
/turf/simulated/floor/plating,
/area/storage/emergency_storage/emergency4)
"amF" = (
/obj/machinery/door/blast/shutters{
dir = 2;
id = "cafe";
layer = 3.1;
name = "Cafe Shutters"
},
/turf/simulated/floor/wood,
/area/hallway/station/atrium)
"amH" = (
/obj/structure/railing{
dir = 4
},
/obj/structure/railing,
/turf/simulated/floor/water/pool,
/area/hallway/station/atrium)
"amI" = (
/obj/structure/flora/ausbushes/brflowers,
/obj/machinery/light/flamp/noshade,
/turf/simulated/floor/grass,
/area/hallway/station/atrium)
"amM" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
@@ -11468,13 +11653,6 @@
},
/turf/simulated/floor/tiled,
/area/hallway/station/atrium)
"aCm" = (
/obj/structure/disposalpipe/junction{
dir = 8;
icon_state = "pipe-j2"
},
/turf/simulated/floor/tiled,
/area/hallway/station/atrium)
"aCn" = (
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 4
@@ -32985,12 +33163,12 @@ acN
acN
acN
afC
aga
acf
acn
adz
acy
acy
acy
acy
acY
acY
acy
acT
acm
@@ -33130,18 +33308,18 @@ aaT
agd
acm
acy
adE
adM
acy
amA
ada
acy
acy
acm
acm
acy
acy
acy
adE
adM
add
adl
acC
adm
acy
acp
bej
@@ -33272,18 +33450,18 @@ afa
agq
aCe
acy
acZ
acf
acy
adc
adc
acy
acy
acm
acm
acy
acy
acy
acZ
acC
add
adl
adE
amv
acy
acp
bep
@@ -33413,20 +33591,20 @@ ahL
abh
agv
acp
acy
acy
acy
acy
acF
acT
acy
acy
acy
acG
acY
acm
acm
acY
acG
acF
add
adl
amu
amv
acy
acy
acy
acT
aCx
bem
bfY
@@ -33556,18 +33734,18 @@ afW
agB
acp
acy
acy
acy
acD
acI
acI
acI
acI
amz
acU
acH
acH
acH
acH
acH
acH
adx
acy
acG
acy
amr
amw
acy
acm
bev
@@ -33697,19 +33875,19 @@ aiI
abh
agC
acp
acy
acy
acy
acT
amC
acE
acE
acE
acE
amm
acU
acH
acH
acH
acH
acH
acH
ady
acy
acF
acy
adl
adl
acy
bbT
ber
@@ -33839,20 +34017,20 @@ ahU
afc
agD
agx
acy
acy
acy
acD
acm
amy
acH
adb
acH
acH
acH
amm
acU
acH
amI
acy
adc
adc
adb
acH
adx
acy
acy
acy
acT
acp
beB
awG
@@ -33982,15 +34160,15 @@ abh
ahN
acp
acm
acm
acm
acm
acH
ada
add
adm
adx
adn
ady
acH
acH
amF
amB
acH
acm
acm
acm
acm
@@ -34124,15 +34302,15 @@ afa
afg
acp
acm
acm
acm
acm
ama
aga
adM
acH
ada
adk
adm
adn
acH
amF
amB
acH
acm
acm
acm
acm
@@ -34265,20 +34443,20 @@ aiH
aaT
aiW
acp
acy
acy
acy
acD
acm
amt
acH
adb
adl
adl
adb
acH
adx
acy
acy
acH
acH
amm
acU
acH
amI
acy
acY
acY
acT
acp
beE
awG
@@ -34407,19 +34585,19 @@ acN
afC
ajr
acp
acT
amD
ami
ami
ami
ami
amm
acU
acH
acF
acy
acy
acy
acE
acH
acH
acH
acH
acH
acH
ady
acy
acy
adl
adl
acy
acp
beH
@@ -34548,20 +34726,20 @@ ajo
ajo
afC
ajs
aCm
acU
acU
acU
acF
acI
acH
acH
acH
acH
acH
adx
acp
acy
acD
acK
acK
acK
acK
amz
acU
acH
acG
acy
adk
amx
acy
acp
beF
@@ -34691,20 +34869,20 @@ acm
afC
afe
acp
acy
acy
acy
acy
acF
acT
acy
acy
acy
acK
ama
acm
acm
ama
acK
acF
add
adl
adE
amv
acy
acy
acy
acT
acp
beK
awJ
@@ -34834,18 +35012,18 @@ afC
agv
acp
acy
adE
adM
acy
acY
acY
acy
acy
acm
acm
acy
acy
acy
adz
adM
add
adl
amu
amv
acy
acp
aqg
@@ -34975,19 +35153,19 @@ ala
alg
ald
acr
acY
acy
acZ
acC
acy
ada
ada
acy
acy
acm
acm
acy
acy
acy
add
adl
acZ
acC
amH
acy
acp
aqx
@@ -35117,10 +35295,10 @@ ajk
afC
aju
act
acy
acy
acy
acy
ada
adb
adc
adc
acy
acT
acm