Merge pull request #5102 from Heroman3003/outpost-intercoms

Fixes more intercoms, removes redundant maps
This commit is contained in:
Novacat
2019-04-19 11:15:45 -04:00
committed by GitHub
8 changed files with 145 additions and 169002 deletions
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+49 -49
View File
@@ -5653,6 +5653,52 @@
/obj/machinery/atmospherics/binary/pump/high_power/on,
/turf/simulated/floor/tiled,
/area/engineering/atmos)
"ajz" = (
/obj/structure/table/woodentable,
/obj/item/device/radio/intercom{
dir = 4;
pixel_x = 24
},
/obj/effect/floor_decal/borderfloor{
dir = 4
},
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 4
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/public_garden)
"ajA" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
},
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 10
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 9
},
/obj/item/device/radio/intercom{
dir = 4;
pixel_x = 24
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/atrium_one)
"ajB" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
},
/obj/effect/floor_decal/corner/mauve/border{
dir = 4
},
/obj/item/device/radio/intercom{
dir = 4;
pixel_x = 24
},
/turf/simulated/floor/tiled,
/area/rnd/xenobiology)
"ajN" = (
/obj/structure/catwalk,
/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,
@@ -14568,25 +14614,6 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/atrium_one)
"aIe" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
},
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 10
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 9
},
/obj/item/device/radio/intercom{
dir = 8;
pixel_x = 24
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/atrium_one)
"aIh" = (
/obj/structure/grille,
/obj/structure/railing{
@@ -16316,20 +16343,6 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/atrium_one)
"baY" = (
/obj/structure/table/woodentable,
/obj/item/device/radio/intercom{
dir = 8;
pixel_x = 24
},
/obj/effect/floor_decal/borderfloor{
dir = 4
},
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 4
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/public_garden)
"bbn" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -21142,19 +21155,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled,
/area/rnd/xenobiology)
"bMl" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
},
/obj/effect/floor_decal/corner/mauve/border{
dir = 4
},
/obj/item/device/radio/intercom{
dir = 8;
pixel_x = 24
},
/turf/simulated/floor/tiled,
/area/rnd/xenobiology)
"bMm" = (
/obj/structure/cable/green{
d1 = 1;
@@ -37176,7 +37176,7 @@ aFJ
aAO
aGt
aGL
bMl
ajB
bOi
bQB
bSI
@@ -38976,7 +38976,7 @@ fWK
gDo
gXh
oOc
baY
ajz
tPq
gXh
gXh
@@ -45808,7 +45808,7 @@ akF
amv
akF
ann
aIe
ajA
gek
aov
aoD
+17 -17
View File
@@ -5653,6 +5653,22 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/tether/surfacebase/atrium_two)
"mo" = (
/obj/structure/table/standard{
name = "plastic table frame"
},
/obj/item/device/radio/intercom{
dir = 8;
pixel_x = -24
},
/obj/effect/floor_decal/borderfloor{
dir = 10
},
/obj/effect/floor_decal/corner/lime/border{
dir = 10
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/public_garden_two)
"mp" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -17425,22 +17441,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/tiled/steel_dirty,
/area/rnd/research_storage)
"SS" = (
/obj/structure/table/standard{
name = "plastic table frame"
},
/obj/item/device/radio/intercom{
dir = 4;
pixel_x = -24
},
/obj/effect/floor_decal/borderfloor{
dir = 10
},
/obj/effect/floor_decal/corner/lime/border{
dir = 10
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/public_garden_two)
"SV" = (
/obj/structure/bed/chair,
/obj/effect/floor_decal/rust,
@@ -23890,7 +23890,7 @@ ac
Kt
Kt
MX
SS
mo
Kt
Kt
ac
+2 -2
View File
@@ -21033,7 +21033,7 @@
/obj/item/device/radio/intercom{
dir = 1;
name = "Station Intercom (General)";
pixel_y = 21
pixel_y = 24
},
/turf/simulated/floor/tiled/white,
/area/medical/surgery)
@@ -23713,7 +23713,7 @@
/obj/item/device/radio/intercom{
dir = 1;
name = "Station Intercom (General)";
pixel_y = 21
pixel_y = 24
},
/turf/simulated/floor/tiled/white,
/area/medical/surgery2)
+77 -34
View File
@@ -1058,6 +1058,7 @@
/area/rnd/outpost/mixing)
"cr" = (
/obj/item/device/radio/intercom{
dir = 1;
pixel_y = 24;
req_access = list()
},
@@ -1301,6 +1302,7 @@
dir = 4
},
/obj/item/device/radio/intercom{
dir = 1;
pixel_y = 24;
req_access = list()
},
@@ -2150,7 +2152,7 @@
dir = 4
},
/obj/item/device/radio/intercom{
dir = 8;
dir = 4;
pixel_x = 24
},
/turf/simulated/floor/tiled,
@@ -2932,7 +2934,7 @@
dir = 4
},
/obj/item/device/radio/intercom{
dir = 1;
dir = 2;
pixel_y = -24
},
/obj/effect/floor_decal/corner/purple{
@@ -3472,6 +3474,7 @@
dir = 5
},
/obj/item/device/radio/intercom{
dir = 1;
pixel_y = 24;
req_access = list()
},
@@ -3522,7 +3525,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/item/device/radio/intercom{
dir = 4;
dir = 8;
pixel_x = -24
},
/obj/machinery/door/firedoor/glass/hidden/steel{
@@ -5439,6 +5442,10 @@
/obj/effect/floor_decal/corner/purple/border{
dir = 4
},
/obj/item/device/radio/intercom{
dir = 4;
pixel_x = 24
},
/turf/simulated/floor/tiled,
/area/rnd/outpost)
"ko" = (
@@ -5665,11 +5672,22 @@
/turf/simulated/floor/tiled,
/area/rnd/outpost/xenoarch_storage)
"kL" = (
/obj/structure/table/rack,
/obj/item/device/suit_cooling_unit,
/obj/item/device/suit_cooling_unit,
/obj/effect/floor_decal/borderfloor{
dir = 1;
icon_state = "borderfloor";
pixel_y = 0
},
/obj/effect/floor_decal/corner/purple/border{
dir = 1
},
/obj/machinery/atmospherics/unary/vent_pump/on,
/obj/item/device/radio/intercom{
dir = 1;
pixel_y = 24;
req_access = list()
},
/turf/simulated/floor/tiled,
/area/rnd/outpost/xenoarch_storage)
/area/rnd/outpost)
"kM" = (
/obj/effect/floor_decal/industrial/warning/dust{
dir = 4
@@ -5887,14 +5905,15 @@
/area/rnd/outpost/anomaly_lab)
"lk" = (
/obj/structure/table/rack,
/obj/item/clothing/suit/bio_suit/anomaly,
/obj/item/clothing/head/bio_hood/anomaly,
/obj/item/clothing/mask/breath,
/obj/item/clothing/gloves/sterile/latex,
/obj/item/clothing/glasses/science,
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/item/device/suit_cooling_unit,
/obj/item/device/suit_cooling_unit,
/obj/item/device/radio/intercom{
dir = 1;
pixel_y = 24;
req_access = list()
},
/turf/simulated/floor/tiled,
/area/rnd/outpost/anomaly_lab)
/area/rnd/outpost/xenoarch_storage)
"ll" = (
/obj/machinery/suspension_gen,
/turf/simulated/floor/tiled,
@@ -5927,17 +5946,20 @@
/turf/simulated/floor,
/area/rnd/outpost/anomaly_lab/testing)
"lq" = (
/obj/effect/floor_decal/borderfloor{
/obj/structure/table/rack,
/obj/item/clothing/suit/bio_suit/anomaly,
/obj/item/clothing/head/bio_hood/anomaly,
/obj/item/clothing/mask/breath,
/obj/item/clothing/gloves/sterile/latex,
/obj/item/clothing/glasses/science,
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/item/device/radio/intercom{
dir = 1;
icon_state = "borderfloor";
pixel_y = 0
pixel_y = 24;
req_access = list()
},
/obj/effect/floor_decal/corner/purple/border{
dir = 1
},
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/tiled,
/area/rnd/outpost)
/area/rnd/outpost/anomaly_lab)
"lr" = (
/obj/structure/cable/green{
d1 = 4;
@@ -6949,12 +6971,15 @@
/turf/simulated/floor/tiled,
/area/rnd/outpost/anomaly_lab)
"nn" = (
/obj/structure/table/standard,
/obj/item/weapon/folder/white,
/obj/item/weapon/pen,
/obj/machinery/light,
/turf/simulated/floor/tiled,
/area/rnd/outpost/anomaly_lab)
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
/obj/item/device/radio/intercom{
dir = 2;
pixel_y = -24
},
/turf/simulated/floor,
/area/rnd/outpost/anomaly_lab/storage)
"no" = (
/obj/structure/table/standard,
/obj/item/weapon/paper_bin,
@@ -7058,6 +7083,24 @@
},
/turf/simulated/floor/tiled,
/area/rnd/outpost/anomaly_lab)
"ny" = (
/obj/item/device/radio/intercom{
dir = 2;
pixel_y = -24
},
/turf/simulated/floor/tiled,
/area/rnd/outpost/anomaly_lab)
"nz" = (
/obj/structure/table/standard,
/obj/item/weapon/folder/white,
/obj/item/weapon/pen,
/obj/machinery/light,
/obj/item/device/radio/intercom{
dir = 2;
pixel_y = -24
},
/turf/simulated/floor/tiled,
/area/rnd/outpost/anomaly_lab)
(1,1,1) = {"
aa
@@ -20542,7 +20585,7 @@ lU
mh
mB
mQ
kZ
ny
jx
ab
ab
@@ -21673,7 +21716,7 @@ jT
kk
kE
kk
lI
nn
jE
mn
mG
@@ -22104,7 +22147,7 @@ jE
mp
mH
mU
nn
nz
jx
ab
ab
@@ -22946,7 +22989,7 @@ id
if
ih
hr
lq
kL
ns
lE
kJ
@@ -23234,7 +23277,7 @@ kT
ls
nu
jx
lk
lq
lP
md
mt
@@ -23659,7 +23702,7 @@ jY
lF
lv
kr
kL
lk
lm
lm
lm