Merge pull request #4804 from Heroman3003/atmos-map-fixes

Tether spring cleaning
This commit is contained in:
Spades
2019-03-02 20:51:01 -05:00
committed by GitHub
8 changed files with 4325 additions and 3945 deletions
@@ -206,6 +206,10 @@
name = "\improper Weapons Testing Range"
icon_state = "firingrange"
/area/rnd/research/researchdivision
name = "\improper Research Division"
icon_state = "research"
/area/rnd/outpost
name = "\improper Research Outpost Hallway"
icon_state = "research"
+295 -230
View File
@@ -403,13 +403,52 @@
/turf/simulated/floor/tiled/techfloor,
/area/tether/surfacebase/mining_main/refinery)
"aaS" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
},
/obj/machinery/door/airlock/maintenance/common,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/plating,
/area/tether/surfacebase/mining_main/refinery)
/area/maintenance/lower/mining_eva)
"aaT" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/alarm{
pixel_y = 22;
target_temperature = 293.15
},
/turf/simulated/floor/plating,
/area/maintenance/lower/solars)
"aaU" = (
/turf/simulated/wall,
/area/maintenance/lower/trash_pit)
"aaV" = (
/obj/structure/catwalk,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/alarm{
dir = 8;
icon_state = "alarm0";
pixel_x = 24
},
/turf/simulated/floor/plating,
/area/maintenance/lower/trash_pit)
"aaW" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/machinery/alarm{
pixel_y = 22
},
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/vacant_site)
"aaX" = (
/obj/structure/plasticflaps,
/obj/machinery/conveyor{
@@ -481,6 +520,26 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/tether/surfacebase/mining_main/refinery)
"abf" = (
/obj/machinery/door/airlock/maintenance/common{
name = "Trash Pit Access";
req_one_access = list(26,48)
},
/obj/structure/catwalk,
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/plating,
/area/maintenance/lower/trash_pit)
"abg" = (
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 10
},
/obj/effect/floor_decal/steeldecal/steel_decals4,
/obj/machinery/alarm{
pixel_y = 22;
target_temperature = 293.15
},
/turf/simulated/floor/tiled,
/area/rnd/hallway)
"abh" = (
/turf/simulated/floor/tiled,
/area/tether/surfacebase/mining_main/refinery)
@@ -658,6 +717,23 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/mining_main/storage)
"abx" = (
/obj/effect/floor_decal/industrial/loading{
dir = 8
},
/obj/effect/floor_decal/steeldecal/steel_decals6{
dir = 9
},
/obj/effect/floor_decal/steeldecal/steel_decals6{
dir = 6
},
/obj/machinery/door/firedoor/glass/hidden/steel{
dir = 8
},
/turf/simulated/floor/tiled{
icon_state = "monotile"
},
/area/security/checkpoint)
"aby" = (
/obj/machinery/conveyor{
dir = 8;
@@ -672,6 +748,26 @@
},
/turf/simulated/floor/plating,
/area/tether/surfacebase/mining_main/refinery)
"abA" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/alarm{
dir = 1;
pixel_y = -25
},
/turf/simulated/floor/tiled{
icon_state = "techmaint"
},
/area/security/checkpoint)
"abB" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance/common,
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/plating,
/area/maintenance/lower/solars)
"abC" = (
/obj/structure/plasticflaps/mining,
/obj/machinery/conveyor{
@@ -680,6 +776,19 @@
},
/turf/simulated/floor/plating,
/area/tether/surfacebase/mining_main/refinery)
"abD" = (
/obj/structure/table/glass,
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/mauve/border,
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
/obj/machinery/alarm{
dir = 1;
pixel_y = -22
},
/turf/simulated/floor/tiled,
/area/rnd/xenobiology/xenoflora/lab_atmos)
"abE" = (
/obj/effect/floor_decal/industrial/warning{
dir = 8
@@ -1058,6 +1167,19 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/mining_main/eva)
"aci" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/alarm{
pixel_y = 22
},
/turf/simulated/floor/plating,
/area/maintenance/lower/atmos)
"acj" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -1131,6 +1253,17 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/mining_main/uxstorage)
"aco" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/railing,
/obj/structure/railing{
dir = 4
},
/obj/machinery/alarm{
pixel_y = 22
},
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/locker_room)
"acp" = (
/obj/structure/catwalk,
/obj/effect/decal/cleanable/dirt,
@@ -1148,6 +1281,101 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/maintenance/lower/trash_pit)
"acr" = (
/obj/structure/table/marble,
/obj/machinery/door/window{
dir = 8;
req_one_access = list(25)
},
/obj/machinery/door/blast/shutters{
dir = 8;
id = "cafe";
layer = 3.1;
name = "Cafe Shutters"
},
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled,
/area/crew_quarters/visitor_dining)
"acs" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
pixel_x = 0
},
/obj/structure/catwalk,
/obj/machinery/door/airlock/maintenance/common,
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/locker_room)
"act" = (
/obj/machinery/door/airlock/maintenance/common{
name = "Tram Maintenance Access"
},
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled,
/area/crew_quarters/visitor_dining)
"acu" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
},
/obj/effect/floor_decal/corner/mauve/border{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 5
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 6
},
/obj/machinery/alarm{
dir = 4;
icon_state = "alarm0";
pixel_x = -22
},
/turf/simulated/floor/tiled,
/area/rnd/hallway)
"acv" = (
/obj/structure/cable/cyan{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance/engi{
name = "Drone Bay"
},
/obj/machinery/atmospherics/pipe/simple/visible/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/atmos)
"acw" = (
/obj/effect/floor_decal/steeldecal/steel_decals_central1{
dir = 1
},
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/monofloor{
dir = 1
},
/area/crew_quarters/visitor_laundry)
"acx" = (
/turf/simulated/floor/tiled,
/area/tether/surfacebase/mining_main/storage)
@@ -1155,6 +1383,32 @@
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/mining_main/storage)
"acz" = (
/obj/machinery/door/airlock/multi_tile/glass{
autoclose = 1;
dir = 2;
id_tag = null;
name = "Laundry";
req_access = list()
},
/obj/effect/floor_decal/steeldecal/steel_decals_central1,
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/monofloor,
/area/crew_quarters/visitor_laundry)
"acA" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -1245,6 +1499,14 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/mining_main/eva)
"acJ" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/lightgrey/border,
/obj/effect/landmark{
name = "lightsout"
},
/turf/simulated/floor/tiled,
/area/hallway/lower/first_west)
"acK" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/tiled,
@@ -1736,16 +1998,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/lower/mining_eva)
"adO" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
},
/obj/machinery/door/airlock/maintenance/common,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/turf/simulated/floor/plating,
/area/maintenance/lower/mining_eva)
"adP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -7233,13 +7485,6 @@
},
/turf/simulated/floor/tiled,
/area/rnd/hallway)
"asj" = (
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 10
},
/obj/effect/floor_decal/steeldecal/steel_decals4,
/turf/simulated/floor/tiled,
/area/rnd/hallway)
"asl" = (
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 6
@@ -7473,11 +7718,6 @@
},
/turf/simulated/floor/tiled,
/area/hallway/lower/first_west)
"asX" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/lightgrey/border,
/turf/simulated/floor/tiled,
/area/hallway/lower/first_west)
"asY" = (
/obj/effect/floor_decal/borderfloor{
dir = 6
@@ -10169,15 +10409,6 @@
},
/turf/simulated/floor/tiled,
/area/rnd/xenobiology/xenoflora/lab_atmos)
"ayG" = (
/obj/structure/table/glass,
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/mauve/border,
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
/turf/simulated/floor/tiled,
/area/rnd/xenobiology/xenoflora/lab_atmos)
"ayH" = (
/obj/structure/table/glass,
/obj/effect/floor_decal/borderfloor{
@@ -12232,14 +12463,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/atmos)
"aCG" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/railing,
/obj/structure/railing{
dir = 4
},
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/locker_room)
"aCH" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -12298,14 +12521,6 @@
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/plating,
/area/maintenance/lower/solars)
"aCP" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/vacant_site)
"aCQ" = (
/obj/structure/cable{
d1 = 1;
@@ -12774,14 +12989,6 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/north_stairs_one)
"aEk" = (
/obj/machinery/door/airlock/maintenance/common{
name = "Trash Pit Access";
req_one_access = list(26,48)
},
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/lower/trash_pit)
"aEl" = (
/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary{
frequency = 1379;
@@ -15423,15 +15630,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/engineering/atmos/processing)
"aLA" = (
/obj/machinery/alarm{
dir = 4;
icon_state = "alarm0";
pixel_x = -22;
pixel_y = 0
},
/turf/simulated/floor/plating,
/area/vacant/vacant_site)
"aLB" = (
/obj/structure/catwalk,
/obj/machinery/firealarm{
@@ -15821,20 +16019,6 @@
/obj/random/trash_pile,
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/xenoflora)
"aQK" = (
/obj/effect/floor_decal/industrial/loading{
dir = 8
},
/obj/effect/floor_decal/steeldecal/steel_decals6{
dir = 9
},
/obj/effect/floor_decal/steeldecal/steel_decals6{
dir = 6
},
/turf/simulated/floor/tiled{
icon_state = "monotile"
},
/area/security/checkpoint)
"aQM" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled{
@@ -18328,15 +18512,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/maintenance/lower/solars)
"bht" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance/common,
/turf/simulated/floor/plating,
/area/maintenance/lower/solars)
"bhw" = (
/obj/structure/cable{
d1 = 4;
@@ -19818,20 +19993,6 @@
},
/turf/simulated/floor/tiled,
/area/crew_quarters/visitor_dining)
"brv" = (
/obj/structure/table/marble,
/obj/machinery/door/window{
dir = 8;
req_one_access = list(25)
},
/obj/machinery/door/blast/shutters{
dir = 8;
id = "cafe";
layer = 3.1;
name = "Cafe Shutters"
},
/turf/simulated/floor/tiled,
/area/crew_quarters/visitor_dining)
"brw" = (
/obj/structure/window/reinforced,
/obj/structure/table/glass,
@@ -21303,23 +21464,6 @@
},
/turf/simulated/floor/plating,
/area/vacant/vacant_site/east)
"bAO" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
pixel_x = 0
},
/obj/structure/catwalk,
/obj/machinery/door/airlock/maintenance/common,
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/locker_room)
"bAP" = (
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 10
@@ -21416,29 +21560,6 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/rnd/xenobiology)
"bBl" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
},
/obj/effect/floor_decal/corner/mauve/border{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 5
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 6
},
/turf/simulated/floor/tiled,
/area/rnd/hallway)
"bBy" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -22879,23 +23000,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/atmos)
"bRx" = (
/obj/structure/cable/cyan{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance/engi{
name = "Drone Bay"
},
/obj/machinery/atmospherics/pipe/simple/visible/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/atmos)
"bRy" = (
/obj/machinery/door/airlock/glass_external/public,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -25785,14 +25889,6 @@
},
/turf/simulated/floor/tiled,
/area/crew_quarters/visitor_laundry)
"cfM" = (
/obj/effect/floor_decal/steeldecal/steel_decals_central1{
dir = 1
},
/turf/simulated/floor/tiled/monofloor{
dir = 1
},
/area/crew_quarters/visitor_laundry)
"cfN" = (
/obj/machinery/washing_machine,
/turf/simulated/floor/tiled,
@@ -25864,12 +25960,6 @@
},
/turf/simulated/floor/plating,
/area/crew_quarters/visitor_laundry)
"cgb" = (
/obj/machinery/door/airlock/maintenance/common{
name = "Tram Maintenance Access"
},
/turf/simulated/floor/tiled,
/area/crew_quarters/visitor_dining)
"cge" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -26054,31 +26144,6 @@
},
/turf/simulated/floor/lino,
/area/crew_quarters/visitor_dining)
"cgw" = (
/obj/machinery/door/airlock/multi_tile/glass{
autoclose = 1;
dir = 2;
id_tag = null;
name = "Laundry";
req_access = list()
},
/obj/effect/floor_decal/steeldecal/steel_decals_central1,
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled/monofloor,
/area/crew_quarters/visitor_laundry)
"cgz" = (
/obj/structure/cable/green{
d1 = 4;
@@ -32471,7 +32536,7 @@ ars
ars
awc
axf
bht
abB
azr
aBv
azU
@@ -33039,7 +33104,7 @@ amU
amU
amU
axf
bhp
aaT
azr
bkd
bmv
@@ -34026,7 +34091,7 @@ apt
aqf
aSt
arA
asj
abg
asU
atF
arG
@@ -34453,7 +34518,7 @@ ako
ako
ako
ako
asX
acJ
atI
arG
aVu
@@ -34469,7 +34534,7 @@ aCX
auu
bvO
byA
bBl
acu
bEf
bFS
bHV
@@ -34873,7 +34938,7 @@ akV
anB
akX
aor
aLA
akX
apw
aqj
aSP
@@ -36731,7 +36796,7 @@ auz
avw
beQ
bgd
ayG
abD
atf
blx
aAZ
@@ -38011,7 +38076,7 @@ auF
auF
atW
atj
aAu
aci
azI
aah
aah
@@ -38878,7 +38943,7 @@ aBe
aBe
aBe
aBe
bRx
acv
aBe
aIv
aIB
@@ -39394,7 +39459,7 @@ abn
abn
abn
abT
adO
aaS
abT
akz
alH
@@ -40996,7 +41061,7 @@ azK
aAA
aBj
avP
aCG
aco
bse
aAG
aAG
@@ -41374,8 +41439,8 @@ aah
aah
aar
aaI
aaS
aaS
aaC
aaC
abE
abM
acg
@@ -41516,7 +41581,7 @@ aah
aah
aar
aaI
aaS
aaC
abb
abh
abM
@@ -41658,7 +41723,7 @@ aah
aah
aar
aaJ
aaS
aaC
abc
abG
abL
@@ -41710,7 +41775,7 @@ aCI
aCI
aCI
aAG
bAO
acs
aAG
bgr
bgr
@@ -41800,7 +41865,7 @@ aah
aah
aar
aaK
aaS
aaC
abq
abF
abL
@@ -42226,7 +42291,7 @@ aah
aah
aar
aaI
aaS
aaC
abs
abO
acP
@@ -42368,7 +42433,7 @@ aah
aah
aar
aaI
aaS
aaC
abh
abN
abM
@@ -42510,7 +42575,7 @@ aah
aah
aar
aaJ
aaS
aaC
abi
abU
abL
@@ -42549,7 +42614,7 @@ atp
auf
atp
aLp
aQK
abx
aLJ
bdV
ayb
@@ -42652,7 +42717,7 @@ aad
aah
aar
aaM
aaS
aaC
abt
abQ
abP
@@ -42959,7 +43024,7 @@ awr
ayq
ajZ
ahx
aCP
aaW
alU
amy
alr
@@ -43117,7 +43182,7 @@ atp
auT
awM
aLJ
aQM
abA
atp
biv
bhi
@@ -43439,8 +43504,8 @@ cdd
cjs
ceM
ceM
cfM
cgw
acw
acz
ceM
chQ
chQ
@@ -43954,7 +44019,7 @@ ajl
aka
ajl
ajl
aEk
abf
alY
amR
alr
@@ -44231,7 +44296,7 @@ aah
aaU
abH
agT
abH
aaV
agT
agT
aaU
@@ -44404,7 +44469,7 @@ apP
apP
aFc
aFc
brv
acr
lHO
lHO
lHO
@@ -44550,7 +44615,7 @@ arm
cfj
cfz
arm
cgb
act
bdk
cgt
bdk
+272 -208
View File
@@ -376,9 +376,9 @@
/obj/item/weapon/handcuffs/legcuffs/fuzzy,
/obj/item/weapon/handcuffs/fuzzy,
/obj/item/clothing/mask/balaclava,
/obj/item/clothing/gloves/combat{
desc = "These gloves are insulated with rubber.";
name = "black insulated gloves"
/obj/item/clothing/gloves/black{
desc = "They seem to be made of rubber-like material, though insulation quality is doubtful";
name = "elastic black gloves"
},
/obj/item/clothing/under/fluff/latexmaid,
/turf/simulated/floor/tiled/techfloor,
@@ -478,6 +478,9 @@
dir = 1
},
/obj/effect/floor_decal/rust,
/obj/machinery/alarm{
pixel_y = 22
},
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/mining)
"bj" = (
@@ -1174,14 +1177,17 @@
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/mining)
"cU" = (
/obj/structure/catwalk,
/obj/machinery/alarm{
dir = 8;
icon_state = "alarm0";
pixel_x = 24
/obj/effect/floor_decal/borderfloor{
dir = 1
},
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/mining)
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/alarm{
pixel_y = 22
},
/turf/simulated/floor/tiled/techmaint,
/area/tether/surfacebase/atrium_two)
"cV" = (
/obj/effect/floor_decal/corner_steel_grid{
dir = 10
@@ -2616,22 +2622,25 @@
/turf/simulated/floor/tiled/techfloor/grid,
/area/maintenance/lower/north)
"fQ" = (
/obj/effect/floor_decal/techfloor{
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
/obj/effect/floor_decal/techfloor,
/obj/effect/floor_decal/techfloor/hole/right{
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
/obj/structure/cable{
icon_state = "4-8"
icon_state = "2-4"
},
/obj/structure/disposalpipe/segment{
dir = 4
/obj/machinery/alarm{
pixel_y = 22
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/north)
/turf/simulated/floor/plating,
/area/tether/surfacebase/public_garden_two)
"fR" = (
/obj/effect/floor_decal/techfloor{
dir = 1
@@ -4636,15 +4645,21 @@
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/bar)
"kl" = (
/obj/structure/railing{
dir = 1
/obj/machinery/door/airlock/maintenance/engi,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/effect/floor_decal/techfloor{
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/bar)
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/plating,
/area/gateway)
"km" = (
/obj/item/toy/plushie/kitten{
desc = "An odd appearing, cryptic plush of a cat.";
@@ -5354,21 +5369,24 @@
/turf/simulated/floor,
/area/maintenance/substation/research)
"lM" = (
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/airlock/engineering{
name = "Science Substation";
req_one_access = list(11,24,47)
},
/obj/machinery/door/firedoor,
/obj/structure/cable{
icon_state = "4-8"
d1 = 1;
d2 = 2;
icon_state = "1-2";
pixel_y = 0
},
/turf/simulated/floor,
/area/maintenance/substation/research)
/obj/effect/decal/cleanable/dirt,
/obj/effect/floor_decal/rust,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/alarm{
dir = 4;
icon_state = "alarm0";
pixel_x = -22;
pixel_y = 0
},
/turf/simulated/floor/plating,
/area/gateway)
"lN" = (
/obj/machinery/atmospherics/pipe/simple/visible/supply{
dir = 6
@@ -5855,24 +5873,26 @@
/turf/simulated/floor,
/area/maintenance/substation/research)
"mM" = (
/obj/effect/floor_decal/techfloor{
dir = 1
},
/obj/effect/floor_decal/techfloor,
/obj/effect/floor_decal/techfloor/hole/right{
dir = 1
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
pixel_x = 0
},
/obj/machinery/door/airlock/engineering{
name = "Science Substation";
req_one_access = list(11,24,47)
},
/obj/machinery/door/firedoor,
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/floor,
/area/maintenance/substation/research)
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/alarm{
dir = 1;
pixel_y = -25
},
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/north)
"mN" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/manifold/visible/supply{
@@ -6167,14 +6187,20 @@
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/asmaint2)
"nj" = (
/obj/effect/floor_decal/borderfloor{
dir = 10
/obj/structure/railing{
dir = 1
},
/obj/effect/floor_decal/corner/mauve/border{
dir = 10
/obj/effect/floor_decal/techfloor{
dir = 4
},
/turf/simulated/floor/tiled,
/area/rnd/research/testingrange)
/obj/effect/floor_decal/rust,
/obj/machinery/alarm{
dir = 8;
icon_state = "alarm0";
pixel_x = 24
},
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/bar)
"nk" = (
/obj/machinery/recharger/wallcharger{
pixel_x = 4;
@@ -7199,9 +7225,21 @@
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/bar)
"oX" = (
/obj/machinery/door/airlock/maintenance/common,
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/airlock/engineering{
name = "Science Substation";
req_one_access = list(11,24,47)
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor,
/area/maintenance/lower/bar)
/area/maintenance/substation/research)
"oY" = (
/obj/effect/floor_decal/techfloor{
dir = 8
@@ -7958,12 +7996,15 @@
/turf/simulated/floor/tiled,
/area/janitor)
"qs" = (
/obj/effect/floor_decal/corner_techfloor_grid{
dir = 9
/obj/structure/railing{
dir = 8
},
/obj/effect/floor_decal/corner_techfloor_grid/full{
dir = 1
},
/obj/random/trash_pile,
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/bar)
/area/maintenance/lower/south)
"qt" = (
/obj/structure/railing{
dir = 8
@@ -8785,14 +8826,24 @@
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/south)
"rS" = (
/obj/structure/railing{
dir = 8
},
/obj/effect/floor_decal/corner_techfloor_grid/full{
/obj/effect/floor_decal/borderfloor{
dir = 1
},
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/south)
/obj/effect/floor_decal/corner/yellow/border{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals5,
/obj/machinery/atmospherics/unary/vent_pump/on,
/obj/structure/cable/cyan{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/effect/landmark{
name = "lightsout"
},
/turf/simulated/floor/tiled,
/area/engineering/atmos/hallway)
"rT" = (
/obj/structure/catwalk,
/obj/effect/decal/cleanable/dirt,
@@ -10414,22 +10465,6 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos/hallway)
"uE" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
},
/obj/effect/floor_decal/corner/yellow/border{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals5,
/obj/machinery/atmospherics/unary/vent_pump/on,
/obj/structure/cable/cyan{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/floor/tiled,
/area/engineering/atmos/hallway)
"uF" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -15670,18 +15705,24 @@
/turf/simulated/wall,
/area/maintenance/substation/tcomms)
"Ex" = (
/obj/machinery/door/airlock/maintenance/engi{
name = "Telecomms Substation"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2";
pixel_y = 0
d1 = 4;
d2 = 8;
icon_state = "4-8";
pixel_x = 0
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/plating,
/area/maintenance/substation/tcomms)
/obj/machinery/door/airlock/engineering{
name = "Science Substation";
req_one_access = list(11,24,47)
},
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor,
/area/maintenance/substation/research)
"Ey" = (
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'HIGH VOLTAGE'";
@@ -16074,17 +16115,18 @@
name = "\improper Telecomms Lobby"
})
"Fn" = (
/obj/structure/window/reinforced/full,
/obj/structure/grille,
/obj/machinery/door/firedoor/glass,
/obj/structure/cable/green{
d2 = 2;
icon_state = "0-2"
/obj/effect/floor_decal/borderfloor{
dir = 10
},
/turf/simulated/floor/plating,
/area/tcomsat{
name = "\improper Telecomms Lobby"
})
/obj/effect/floor_decal/corner/mauve/border{
dir = 10
},
/obj/machinery/alarm{
dir = 1;
pixel_y = -25
},
/turf/simulated/floor/tiled,
/area/rnd/research/testingrange)
"Fo" = (
/turf/simulated/floor/tiled,
/area/tcomsat{
@@ -16155,21 +16197,10 @@
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/south)
"Fy" = (
/obj/machinery/door/airlock/highsecurity{
name = "Telecomms Access";
req_one_access = list(61)
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled,
/area/tcommsat/entrance{
name = "\improper Telecomms Entrance"
})
/obj/machinery/door/airlock/maintenance/common,
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor,
/area/maintenance/lower/bar)
"Fz" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -16213,27 +16244,13 @@
name = "\improper Telecomms Entrance"
})
"FC" = (
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
/obj/structure/catwalk,
/obj/machinery/alarm{
dir = 1;
pixel_y = -22
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/door/airlock/hatch{
name = "Telecomms Foyer";
req_access = list(61);
req_one_access = list(12)
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled,
/area/tcomsat{
name = "\improper Telecomms Lobby"
})
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/south)
"FD" = (
/obj/structure/cable/green{
d1 = 4;
@@ -16639,19 +16656,20 @@
/turf/simulated/floor/tiled,
/area/tcommsat/computer)
"Gi" = (
/obj/machinery/door/airlock/maintenance_hatch{
frequency = 1381;
icon_state = "door_locked";
id_tag = "server_access_outer";
locked = 1;
name = "Telecoms Server Access";
req_access = list(61)
},
/obj/machinery/atmospherics/pipe/simple/hidden{
/obj/effect/floor_decal/techfloor{
dir = 4
},
/turf/simulated/floor/tiled,
/area/tcommsat/chamber)
/obj/structure/railing{
dir = 8
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/alarm{
dir = 8;
icon_state = "alarm0";
pixel_x = 24
},
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/asmaint2)
"Gj" = (
/obj/machinery/airlock_sensor{
frequency = 1381;
@@ -17557,6 +17575,84 @@
temperature = 80
},
/area/tcommsat/chamber)
"HM" = (
/obj/machinery/door/airlock/maintenance/engi{
name = "Telecomms Substation"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2";
pixel_y = 0
},
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/plating,
/area/maintenance/substation/tcomms)
"HN" = (
/obj/structure/window/reinforced/full,
/obj/structure/grille,
/obj/structure/cable/green{
d2 = 2;
icon_state = "0-2"
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/plating,
/area/tcomsat{
name = "\improper Telecomms Lobby"
})
"HO" = (
/obj/machinery/door/airlock/highsecurity{
name = "Telecomms Access";
req_one_access = list(61)
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled,
/area/tcommsat/entrance{
name = "\improper Telecomms Entrance"
})
"HP" = (
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/door/airlock/hatch{
name = "Telecomms Foyer";
req_access = list(61);
req_one_access = list(12)
},
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled,
/area/tcomsat{
name = "\improper Telecomms Lobby"
})
"HQ" = (
/obj/machinery/door/airlock/maintenance_hatch{
frequency = 1381;
icon_state = "door_locked";
id_tag = "server_access_outer";
locked = 1;
name = "Telecoms Server Access";
req_access = list(61)
},
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
},
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled,
/area/tcommsat/chamber)
"HT" = (
/obj/item/weapon/storage/box/glasses/pint,
/obj/item/weapon/storage/box/glass_extras/straws,
@@ -17947,21 +18043,6 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/public_garden_two)
"Sv" = (
/obj/machinery/door/airlock/maintenance/engi,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/turf/simulated/floor/plating,
/area/gateway)
"Sy" = (
/obj/structure/sign/poster,
/turf/simulated/wall,
@@ -18057,23 +18138,6 @@
/obj/random/maintenance/clean,
/turf/simulated/floor,
/area/maintenance/lower/bar)
"UX" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
/obj/structure/cable{
icon_state = "2-4"
},
/turf/simulated/floor/plating,
/area/tether/surfacebase/public_garden_two)
"Vk" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -24629,7 +24693,7 @@ ac
ac
ac
Kt
UX
fQ
IB
Mf
Kt
@@ -24913,7 +24977,7 @@ ae
ae
ae
ae
Sv
kl
ae
ae
ae
@@ -24947,7 +25011,7 @@ li
lC
lZ
mF
nj
Fn
nP
ol
oZ
@@ -25057,7 +25121,7 @@ bX
cm
ZO
bX
cm
lM
bX
bX
dP
@@ -25815,7 +25879,7 @@ vW
wz
xl
xM
xl
Gi
xl
xl
zJ
@@ -26367,7 +26431,7 @@ ln
lJ
mg
mJ
nq
ln
nq
ot
pi
@@ -26509,7 +26573,7 @@ ln
lK
mh
mK
nq
ln
nq
os
pj
@@ -26790,9 +26854,9 @@ ku
il
il
lo
lM
oX
ln
mM
Ex
nr
nS
ou
@@ -28223,7 +28287,7 @@ pn
pn
pn
tg
uE
rS
vt
tg
tg
@@ -28331,7 +28395,7 @@ dV
eD
eW
ap
fQ
mM
ge
ge
ge
@@ -30524,7 +30588,7 @@ rg
rg
ET
Ff
Fy
HO
FU
ET
ac
@@ -31092,7 +31156,7 @@ Ez
Ez
EM
EM
FC
HP
EM
EM
Gw
@@ -31229,7 +31293,7 @@ ac
rg
DQ
Et
Ex
HM
EB
EH
EM
@@ -31595,7 +31659,7 @@ dG
dG
aG
dY
fn
cU
fG
fY
gj
@@ -31801,7 +31865,7 @@ Ez
Ez
EL
EM
Fn
HN
FH
Ga
FR
@@ -31872,7 +31936,7 @@ bO
ad
cx
cy
cU
cy
dh
cy
cy
@@ -32344,7 +32408,7 @@ tu
rO
vP
vP
sK
FC
rg
ac
ac
@@ -32761,7 +32825,7 @@ du
of
oV
pG
qs
pG
re
rO
sE
@@ -33042,7 +33106,7 @@ du
mB
ne
du
ee
mA
ee
ee
gY
@@ -33223,7 +33287,7 @@ ES
Fd
Fv
FR
Gi
HQ
FR
GG
GI
@@ -33469,7 +33533,7 @@ mD
nf
du
du
oX
Fy
du
du
rg
@@ -33743,7 +33807,7 @@ ef
ef
ef
jZ
kl
nj
id
kQ
ee
@@ -33899,7 +33963,7 @@ du
du
du
rg
rS
qs
sL
tB
tB
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
-5
View File
@@ -1,8 +1,3 @@
/obj/structure/window/reinforced/polarized/full
dir = SOUTHWEST
icon_state = "fwindow"
maxhealth = 80
//Special map objects
/obj/effect/landmark/map_data/virgo3b
height = 7