Merge pull request #10590 from KathrinBailey/Kat'sBoxRework

Fixes bugs in BoxStation; turns on docking beacons on Box; fixes roundstart atmos differences.
This commit is contained in:
Ghom
2020-01-28 17:58:44 +01:00
committed by GitHub

View File

@@ -173,6 +173,19 @@
"aay" = (
/turf/open/floor/plating,
/area/security/prison)
"aaz" = (
/obj/structure/lattice/catwalk,
/obj/item/stack/marker_beacon{
anchored = 1;
icon_state = "markerburgundy-on";
light_color = "#FA644B";
light_power = 3;
light_range = 3;
name = "Docking Beacon";
picked_color = "Burgundy"
},
/turf/open/space/basic,
/area/space/nearstation)
"aaA" = (
/obj/machinery/seed_extractor,
/turf/open/floor/plasteel,
@@ -234,10 +247,46 @@
/obj/structure/chair/stool,
/turf/open/floor/plasteel,
/area/security/prison)
"aaK" = (
/obj/structure/lattice/catwalk,
/obj/item/stack/marker_beacon{
anchored = 1;
icon_state = "markerburgundy-on";
light_color = "#FA644B";
light_power = 3;
light_range = 3;
name = "Docking Beacon";
picked_color = "Burgundy"
},
/turf/open/floor/plating,
/area/space/nearstation)
"aaL" = (
/obj/machinery/photocopier,
/turf/open/floor/wood,
/area/library)
"aaM" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
icon_state = "1-2"
},
/obj/structure/cable{
icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/tile/brown,
/obj/effect/turf_decal/tile/brown{
dir = 8
},
/turf/open/floor/plasteel,
/area/quartermaster/office)
"aaN" = (
/obj/structure/chair/sofa/right,
/turf/open/floor/plasteel,
/area/security/prison)
"aaO" = (
/obj/effect/spawner/lootdrop/keg,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"aaP" = (
/obj/machinery/computer/cryopod{
dir = 8;
@@ -248,6 +297,12 @@
},
/turf/open/floor/plasteel,
/area/security/prison)
"aaQ" = (
/obj/structure/sign/poster/contraband/random{
pixel_y = 32
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"aaR" = (
/obj/structure/lattice,
/obj/structure/sign/warning/securearea{
@@ -285,6 +340,15 @@
},
/turf/open/floor/plasteel,
/area/security/prison)
"aaY" = (
/obj/structure/closet,
/obj/effect/spawner/lootdrop/maintenance{
lootcount = 4;
name = "4maintenance loot spawner"
},
/obj/item/poster/random_official,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"aaZ" = (
/turf/closed/wall/r_wall,
/area/ai_monitored/security/armory)
@@ -505,6 +569,11 @@
"abF" = (
/turf/open/floor/plasteel/freezer,
/area/security/prison)
"abG" = (
/obj/structure/door_assembly/door_assembly_mai,
/obj/item/electronics/airlock,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"abH" = (
/obj/structure/table,
/obj/item/storage/box/chemimp{
@@ -1565,6 +1634,10 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/carpet,
/area/crew_quarters/heads/hos)
"adO" = (
/obj/effect/spawner/structure/window/shuttle,
/turf/open/floor/plating/airless,
/area/space/nearstation)
"adP" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -1979,6 +2052,34 @@
},
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
"aeD" = (
/obj/structure/grille/broken,
/turf/open/floor/plating/airless,
/area/space/nearstation)
"aeE" = (
/obj/structure/girder,
/turf/open/floor/plating/airless,
/area/space/nearstation)
"aeF" = (
/obj/machinery/airalarm{
dir = 4;
pixel_x = -23
},
/obj/machinery/computer/station_alert{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"aeG" = (
/obj/structure/cable,
/obj/machinery/power/solar{
@@ -2357,6 +2458,12 @@
},
/turf/open/floor/plasteel,
/area/security/main)
"afn" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
/turf/open/floor/plasteel/grimy,
/area/ai_monitored/turret_protected/aisat_interior)
"afo" = (
/obj/machinery/door/airlock/external{
name = "Escape Pod Three"
@@ -2377,6 +2484,39 @@
},
/turf/open/space/basic,
/area/space)
"afq" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel/grimy,
/area/ai_monitored/turret_protected/aisat_interior)
"afr" = (
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers,
/turf/open/floor/plasteel/grimy,
/area/ai_monitored/turret_protected/aisat_interior)
"afs" = (
/obj/machinery/computer/security/telescreen/entertainment{
pixel_x = -31
},
/obj/machinery/computer/monitor{
dir = 4
},
/obj/structure/cable{
icon_state = "0-4"
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"aft" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 5
@@ -2687,6 +2827,15 @@
/obj/machinery/atmospherics/pipe/manifold4w/general/visible,
/turf/open/floor/plasteel,
/area/engine/atmos)
"age" = (
/obj/structure/chair/office/dark{
dir = 8
},
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/plasteel/grimy,
/area/ai_monitored/turret_protected/aisat_interior)
"agf" = (
/obj/structure/table,
/obj/item/stack/sheet/metal,
@@ -2836,6 +2985,10 @@
/obj/machinery/suit_storage_unit/security,
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
"agv" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/grimy,
/area/ai_monitored/turret_protected/aisat_interior)
"agw" = (
/obj/structure/table,
/obj/machinery/syndicatebomb/training,
@@ -2965,6 +3118,14 @@
},
/turf/open/floor/plasteel,
/area/security/main)
"agH" = (
/obj/machinery/bluespace_beacon,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"agI" = (
/obj/machinery/airalarm{
pixel_y = 23
@@ -3094,6 +3255,12 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/security/warden)
"agX" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
/turf/open/floor/plasteel/grimy,
/area/ai_monitored/turret_protected/aisat_interior)
"agY" = (
/obj/structure/table,
/obj/item/storage/fancy/donut_box,
@@ -3334,6 +3501,16 @@
},
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
"ahw" = (
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
/obj/structure/cable{
icon_state = "2-4"
},
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plasteel/grimy,
/area/ai_monitored/turret_protected/aisat_interior)
"ahx" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -4474,6 +4651,16 @@
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/security/brig)
"ajC" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/plasteel/grimy,
/area/ai_monitored/turret_protected/aisat_interior)
"ajD" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -4682,6 +4869,18 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/maintenance/solars/port/fore)
"ajX" = (
/obj/machinery/computer/teleporter{
dir = 8
},
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/aisat_interior)
"ajY" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat/atmos)
"ajZ" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/sign/warning/vacuum/external{
@@ -4965,6 +5164,18 @@
},
/turf/open/floor/plasteel,
/area/security/courtroom)
"akz" = (
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"akA" = (
/obj/structure/chair{
dir = 8;
@@ -29979,17 +30190,6 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bwc" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
icon_state = "1-2"
},
/obj/structure/cable{
icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/quartermaster/office)
"bwd" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -49288,47 +49488,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"ctu" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/grimy,
/area/ai_monitored/turret_protected/aisat_interior)
"ctv" = (
/turf/closed/wall/r_wall,
/area/space/nearstation)
"ctw" = (
/obj/machinery/airalarm{
dir = 4;
pixel_x = -23
},
/obj/machinery/computer/station_alert,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"ctx" = (
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers,
/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/grimy,
/area/ai_monitored/turret_protected/aisat_interior)
"cty" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/grimy,
/area/ai_monitored/turret_protected/aisat_interior)
"ctz" = (
/obj/machinery/door/poddoor/shutters{
id = "teledoor";
@@ -49373,41 +49535,6 @@
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"ctG" = (
/obj/structure/chair/office/dark{
dir = 8
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/grimy,
/area/ai_monitored/turret_protected/aisat_interior)
"ctH" = (
/obj/machinery/computer/security/telescreen/entertainment{
pixel_x = -31
},
/obj/machinery/computer/monitor,
/obj/structure/cable{
icon_state = "0-4"
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"ctI" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/grimy,
/area/ai_monitored/turret_protected/aisat_interior)
"ctJ" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -49431,13 +49558,6 @@
},
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/aisat_interior)
"ctM" = (
/obj/machinery/bluespace_beacon,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"ctN" = (
/obj/machinery/atmospherics/pipe/simple/yellow/visible{
dir = 10
@@ -49445,13 +49565,6 @@
/obj/structure/lattice,
/turf/open/space,
/area/space/nearstation)
"ctP" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/grimy,
/area/ai_monitored/turret_protected/aisat_interior)
"ctQ" = (
/obj/structure/table,
/obj/machinery/microwave{
@@ -49477,28 +49590,6 @@
/obj/structure/sign/warning/radiation/rad_area,
/turf/closed/wall,
/area/engine/engineering)
"ctS" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/grimy,
/area/ai_monitored/turret_protected/aisat_interior)
"ctT" = (
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
/obj/structure/cable{
icon_state = "2-4"
},
/obj/structure/cable{
icon_state = "1-2"
},
/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/grimy,
/area/ai_monitored/turret_protected/aisat_interior)
"ctU" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -49521,10 +49612,6 @@
/obj/structure/chair,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"ctW" = (
/obj/machinery/computer/teleporter,
/turf/open/floor/plating,
/area/ai_monitored/turret_protected/aisat_interior)
"ctX" = (
/obj/machinery/camera{
c_tag = "MiniSat Teleporter";
@@ -49805,11 +49892,6 @@
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat/atmos)
"cuC" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat/atmos)
"cuD" = (
/obj/machinery/light/small{
dir = 8
@@ -49858,17 +49940,6 @@
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"cuG" = (
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"cuH" = (
/obj/machinery/light/small{
dir = 8
@@ -53259,13 +53330,6 @@
},
/turf/open/floor/mineral/titanium/blue,
/area/crew_quarters/dorms)
"dkk" = (
/obj/machinery/photocopier{
pixel_x = -5;
pixel_y = -5
},
/turf/open/floor/wood,
/area/library)
"dok" = (
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-22"
@@ -53692,18 +53756,6 @@
dir = 1
},
/area/crew_quarters/fitness)
"fsk" = (
/obj/structure/lattice/catwalk,
/obj/item/stack/marker_beacon{
anchored = 1;
icon_state = "markerburgundy-on";
light_power = 3;
light_range = 3;
name = "Docking Beacon";
picked_color = "Burgundy"
},
/turf/open/floor/plating,
/area/space/nearstation)
"ftv" = (
/obj/structure/table,
/obj/effect/spawner/lootdrop/maintenance{
@@ -54203,18 +54255,6 @@
dir = 1
},
/area/crew_quarters/fitness)
"hho" = (
/obj/structure/lattice/catwalk,
/obj/item/stack/marker_beacon{
anchored = 1;
icon_state = "markerburgundy-on";
light_power = 3;
light_range = 3;
name = "Docking Beacon";
picked_color = "Burgundy"
},
/turf/open/space/basic,
/area/space/nearstation)
"hik" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -54439,9 +54479,6 @@
"iiW" = (
/turf/open/floor/wood,
/area/maintenance/bar)
"ikx" = (
/turf/open/floor/plating/foam,
/area/space/nearstation)
"ilJ" = (
/obj/effect/turf_decal/tile/red,
/obj/machinery/light{
@@ -55678,10 +55715,6 @@
/obj/structure/extinguisher_cabinet,
/turf/closed/wall/r_wall,
/area/hallway/primary/central)
"mwb" = (
/obj/effect/spawner/structure/window/shuttle,
/turf/open/floor/plating,
/area/space/nearstation)
"mwO" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -56803,10 +56836,6 @@
/obj/item/target/syndicate,
/turf/open/floor/plating,
/area/security/prison)
"rxH" = (
/obj/structure/girder,
/turf/open/floor/plating,
/area/space/nearstation)
"rzg" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -57253,12 +57282,6 @@
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
"thr" = (
/obj/structure/frame/computer{
dir = 1
},
/turf/open/floor/plating,
/area/space/nearstation)
"tkU" = (
/turf/open/floor/wood{
icon_state = "wood-broken5"
@@ -58554,10 +58577,6 @@
},
/turf/open/space/basic,
/area/space/nearstation)
"xWM" = (
/obj/structure/grille/broken,
/turf/open/floor/plating,
/area/space/nearstation)
"xXY" = (
/obj/structure/closet/lasertag/red,
/obj/item/clothing/under/pj/red,
@@ -64623,11 +64642,11 @@ aaa
aaa
aaa
aaa
fsk
aaK
aaa
aaa
aaa
fsk
aaK
aaa
aaa
aaa
@@ -64874,9 +64893,9 @@ aaa
aaa
aaa
aaa
fsk
aaK
aaa
fsk
aaK
aaa
aaa
aaa
@@ -64888,9 +64907,9 @@ gXs
aaa
aaa
aaa
fsk
aaK
aaa
fsk
aaK
aaa
aaa
aaa
@@ -81103,7 +81122,7 @@ bpB
bpB
brR
bsV
bwc
aaM
bxA
bvI
bwX
@@ -95688,9 +95707,9 @@ aaa
aaa
aaa
aaa
hho
aaz
aaa
hho
aaz
aaa
aaa
aaa
@@ -96072,7 +96091,7 @@ aaf
ctZ
cui
cuq
cuC
ajY
cuO
cuz
cvm
@@ -96580,8 +96599,8 @@ czk
cti
cua
cua
ctw
ctH
aeF
afs
ctQ
cuc
cuj
@@ -96837,9 +96856,9 @@ ctb
cth
cua
ctr
ctu
ctG
ctP
afn
age
agX
cub
cuj
cur
@@ -97094,13 +97113,13 @@ ctc
ctc
cto
ctt
cty
afq
ctJ
ctT
ahw
cue
cul
cuu
cuG
akz
cuS
cve
cvo
@@ -97351,9 +97370,9 @@ ctb
ctj
ctk
cts
ctx
ctI
ctS
afr
agv
ajC
cud
cuk
cus
@@ -98123,7 +98142,7 @@ aaa
aaf
cua
ctF
ctM
agH
ctX
cuf
cum
@@ -98381,7 +98400,7 @@ aaf
cua
ctE
ctL
ctW
ajX
cuf
cum
cuw
@@ -101379,7 +101398,7 @@ bbE
aIr
bav
aLf
dkk
aaL
kLR
aRO
aQp
@@ -101961,10 +101980,10 @@ aaa
aaa
aaa
aaa
ikx
mwb
xWM
rxH
aaH
adO
aeD
aeE
aaa
aaa
aaa
@@ -102219,10 +102238,10 @@ xNY
kvb
aaa
aaa
ikx
ikx
ikx
rxH
aaH
aaH
aaH
aeE
aaa
aaa
aaa
@@ -102473,13 +102492,13 @@ czZ
cOT
aaa
jmC
dbM
dbM
ikx
ikx
ikx
thr
mwb
aaH
aaH
aaH
aaH
aaH
aaH
adO
aaa
aaa
aaa
@@ -102732,8 +102751,8 @@ gXs
xNY
kvb
gJg
dbM
dbM
aaH
aaH
aaa
aaa
gJg
@@ -102990,8 +103009,8 @@ aaa
aaa
gJg
gJg
mwb
ikx
adO
aaH
gXs
aaa
aaa
@@ -106072,7 +106091,7 @@ cNW
clt
cQw
cNW
cNW
abG
cNW
cNW
aaf
@@ -106328,7 +106347,7 @@ aaa
cOT
clt
cQw
cOe
aaO
cOe
cOe
cNW
@@ -106585,11 +106604,11 @@ aaa
cOT
clt
cQw
aaQ
cOe
cOe
cOe
cOe
sQX
cNW
aaa
jzi
jzi
jzi
@@ -106842,11 +106861,11 @@ aaa
cNW
clt
cQw
cOe
bNB
cOe
cOe
cNW
aaf
lCL
aaS
aaa
aaf
@@ -107099,7 +107118,7 @@ cNW
cNW
clt
cQw
cOe
aaY
cOe
cOe
cNW