diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
index 7d79949f41..7ad773e601 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
@@ -1102,7 +1102,7 @@
},
/obj/structure/table/wood,
/obj/item/twohanded/spear,
-/obj/item/clothing/head/helmet/roman/legionaire,
+/obj/item/clothing/head/helmet/roman/legionnaire,
/turf/open/indestructible/boss,
/area/ruin/unpowered/ash_walkers)
"cO" = (
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm
index 073ecb7c4d..ba291fc258 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm
@@ -21,11 +21,17 @@
/turf/open/floor/plasteel/freezer,
/area/ruin/powered/seedvault)
"f" = (
-/obj/machinery/plantgenes/seedvault,
+/obj/machinery/plantgenes/seedvault{
+ pixel_y = 6
+ },
+/obj/structure/table/wood,
/turf/open/floor/plasteel/freezer,
/area/ruin/powered/seedvault)
"g" = (
/obj/structure/table/wood,
+/obj/machinery/smartfridge/disks{
+ pixel_y = 2
+ },
/turf/open/floor/plasteel/freezer,
/area/ruin/powered/seedvault)
"h" = (
diff --git a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm
index 5348f3f385..7d9bdf6485 100644
--- a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm
+++ b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm
@@ -294,7 +294,7 @@
/area/ruin/space/has_grav/abandonedzoo)
"aP" = (
/obj/structure/table/reinforced,
-/obj/item/reagent_containers/glass/bottle/liver_enhance_virion,
+/obj/item/reagent_containers/glass/bottle/random_virus,
/obj/item/reagent_containers/dropper,
/turf/open/floor/plasteel{
icon_state = "dark"
diff --git a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm
index aa21d08041..299d1769b0 100644
--- a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm
+++ b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm
@@ -167,7 +167,6 @@
/area/tcommsat/chamber)
"aG" = (
/obj/structure/grille/broken,
-/obj/item/clothing/gloves/combat,
/turf/open/floor/plasteel/airless,
/area/tcommsat/chamber)
"aH" = (
@@ -625,7 +624,7 @@
/turf/open/floor/plating,
/area/tcommsat/chamber)
"cd" = (
-/obj/item/storage/belt/utility/full/engi,
+/obj/item/storage/toolbox/syndicate,
/turf/open/floor/plasteel/airless,
/area/tcommsat/chamber)
"ce" = (
@@ -906,10 +905,6 @@
/obj/machinery/teleport/hub,
/turf/open/floor/plating,
/area/tcommsat/chamber)
-"SH" = (
-/obj/item/dildo/random,
-/turf/open/floor/plating/airless,
-/area/tcommsat/chamber)
(1,1,1) = {"
aa
@@ -2707,7 +2702,7 @@ ac
bw
bw
bw
-SH
+ac
ca
cf
bw
diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
index f89a8ba4d2..75978850b0 100644
--- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
+++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm
@@ -4355,24 +4355,6 @@
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/hotel/power)
-"Dv" = (
-/obj/item/vending_refill/kink,
-/obj/item/vending_refill/kink,
-/obj/item/vending_refill/kink,
-/obj/item/vending_refill/kink,
-/obj/item/vending_refill/kink,
-/obj/item/vending_refill/kink,
-/obj/structure/closet,
-/turf/open/floor/plasteel/neutral,
-/area/ruin/space/has_grav/hotel/custodial)
-"Fy" = (
-/obj/machinery/vending/kink,
-/turf/open/floor/plasteel/white,
-/area/ruin/space/has_grav/hotel/workroom)
-"MK" = (
-/obj/effect/spawner/lootdrop/keg,
-/turf/open/floor/plating,
-/area/ruin/space/has_grav/hotel)
(1,1,1) = {"
aa
@@ -5383,7 +5365,7 @@ ee
dH
cZ
eJ
-MK
+aw
fi
fQ
fQ
@@ -6111,7 +6093,7 @@ kC
kn
lg
jG
-Dv
+ml
mp
mw
mJ
@@ -7270,7 +7252,7 @@ di
di
ea
ep
-Fy
+dV
di
eT
fp
@@ -7550,7 +7532,7 @@ di
di
di
dV
-Fy
+dV
di
eW
ft
diff --git a/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm b/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm
index a6c2079969..385c1bd6df 100644
--- a/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm
+++ b/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm
@@ -273,6 +273,11 @@
/obj/machinery/light,
/turf/open/floor/plasteel/vault/side,
/area/ruin/space/has_grav/turretedoutpost)
+"aZ" = (
+/obj/structure/rack,
+/obj/item/clothing/head/helmet/riot,
+/turf/open/floor/plasteel/vault/side,
+/area/ruin/space/has_grav/turretedoutpost)
"ba" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/snacks/breadslice/meat,
@@ -281,13 +286,6 @@
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/turretedoutpost)
-"Kw" = (
-/obj/structure/rack,
-/obj/item/multitool/ai_detect,
-/turf/open/floor/plasteel/vault/side{
- dir = 8
- },
-/area/ruin/space/has_grav/turretedoutpost)
"Nu" = (
/obj/machinery/door/airlock/external,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -295,10 +293,6 @@
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/turretedoutpost)
-"YF" = (
-/obj/effect/spawner/lootdrop/keg,
-/turf/open/floor/plating/airless,
-/area/ruin/space/has_grav/turretedoutpost)
(1,1,1) = {"
aa
@@ -390,7 +384,7 @@ al
ad
ad
ay
-Kw
+aF
aL
aF
ad
@@ -473,7 +467,7 @@ az
az
az
az
-aW
+aZ
ad
al
ab
@@ -688,7 +682,7 @@ ad
aj
ak
ad
-YF
+al
ad
aK
aP
diff --git a/_maps/RandomZLevels/VR/snowdin_VR.dmm b/_maps/RandomZLevels/VR/snowdin_VR.dmm
index 0ae50fc1d8..520e847eb2 100644
--- a/_maps/RandomZLevels/VR/snowdin_VR.dmm
+++ b/_maps/RandomZLevels/VR/snowdin_VR.dmm
@@ -2853,7 +2853,6 @@
/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"hk" = (
-/turf/open/floor/plating/asteroid/snow/ice,
/obj/effect/turf_decal/stripes/corner,
/obj/machinery/conveyor_switch/oneway{
id = "snowdin_belt_mine";
@@ -2893,7 +2892,6 @@
/turf/open/floor/plasteel,
/area/awaymission/snowdin/post/gateway)
"ho" = (
-/turf/open/floor/plating/asteroid/snow/ice,
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/loading_area,
/turf/open/floor/plating/snowed/cavern,
@@ -3854,13 +3852,6 @@
/obj/effect/landmark/vr_spawn/snowdin,
/turf/open/floor/plasteel/floorgrime,
/area/awaymission/snowdin/post/garage)
-"jv" = (
-/turf/open/floor/plating/asteroid/snow/ice,
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/turf/open/floor/plating/snowed/cavern,
-/area/awaymission/snowdin/cave/cavern)
"jw" = (
/obj/structure/table,
/obj/item/paper/pamphlet/gateway,
@@ -3940,13 +3931,6 @@
},
/turf/open/floor/plating/snowed/smoothed,
/area/awaymission/snowdin/outside)
-"jE" = (
-/turf/open/floor/plating/asteroid/snow/ice,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/plating/snowed/cavern,
-/area/awaymission/snowdin/cave/cavern)
"jF" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating{
@@ -4377,7 +4361,6 @@
},
/area/awaymission/snowdin/post)
"kK" = (
-/turf/open/floor/plating/asteroid/snow/ice,
/obj/machinery/conveyor{
dir = 2;
id = "snowdin_belt_mine"
@@ -9211,23 +9194,10 @@
/turf/open/floor/plating/snowed,
/area/awaymission/snowdin/cave)
"xl" = (
-/obj/effect/baseturf_helper/asteroid/snow,
-/turf/closed/wall/ice,
-/area/shuttle/snowdin/elevator1)
-"xm" = (
-/obj/structure/window/reinforced/fulltile/ice,
-/obj/structure/grille,
-/turf/open/floor/plating,
-/area/shuttle/snowdin/elevator1)
-"xn" = (
-/obj/machinery/door/airlock/public/glass{
- name = "Elevator Access"
+/turf/open/floor/plasteel/elevatorshaft{
+ initial_gas_mix = "o2=22;n2=82;TEMP=180"
},
-/turf/open/floor/plating,
-/area/shuttle/snowdin/elevator1)
-"xo" = (
-/turf/closed/wall/ice,
-/area/shuttle/snowdin/elevator1)
+/area/awaymission/snowdin/cave)
"xp" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 8
@@ -9278,18 +9248,6 @@
},
/turf/open/floor/engine/cult,
/area/awaymission/snowdin/post/mining_dock)
-"xv" = (
-/turf/open/floor/engine,
-/area/shuttle/snowdin/elevator1)
-"xw" = (
-/obj/machinery/computer/shuttle/snowdin/mining{
- dir = 2;
- name = "Excavation Elevator Console";
- possible_destinations = "snowdin_excavation_top;snowdin_excavation_down";
- shuttleId = "snowdin_excavation"
- },
-/turf/open/floor/engine,
-/area/shuttle/snowdin/elevator1)
"xx" = (
/obj/effect/spawner/lootdrop/crate_spawner,
/turf/open/floor/plasteel/neutral,
@@ -9378,26 +9336,20 @@
},
/area/awaymission/snowdin/post/mining_dock)
"xK" = (
-/obj/machinery/door/airlock/public/glass{
- name = "Elevator Access"
- },
-/obj/docking_port/mobile/elevator{
- dir = 4;
- height = 6;
- id = "snowdin_excavation";
- name = "excavation elevator";
- width = 6
- },
/obj/docking_port/stationary{
+ area_type = /area/awaymission/snowdin/cave;
dir = 4;
dwidth = 3;
height = 6;
id = "snowdin_excavation_top";
name = "snowdin excavation top";
+ roundstart_template = /datum/map_template/shuttle/snowdin/excavation;
width = 6
},
-/turf/open/floor/plating,
-/area/shuttle/snowdin/elevator1)
+/turf/open/floor/plasteel/elevatorshaft{
+ initial_gas_mix = "o2=22;n2=82;TEMP=180"
+ },
+/area/awaymission/snowdin/cave)
"xL" = (
/obj/machinery/atmospherics/pipe/manifold/orange/visible{
dir = 8
@@ -9424,6 +9376,7 @@
/area/awaymission/snowdin/post/mining_dock)
"xP" = (
/obj/docking_port/stationary{
+ area_type = /area/awaymission/snowdin/post/mining_dock;
dir = 4;
dwidth = 3;
height = 6;
@@ -9431,7 +9384,7 @@
name = "snowdin excavation down";
width = 6
},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/elevatorshaft,
/area/awaymission/snowdin/post/mining_dock)
"xQ" = (
/obj/effect/turf_decal/stripes/line{
@@ -9861,20 +9814,6 @@
},
/turf/open/floor/engine/vacuum,
/area/awaymission/snowdin/cave)
-"zb" = (
-/obj/structure/window/reinforced/fulltile/ice,
-/obj/structure/grille,
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 8
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 4;
- frequency = 1442;
- id_tag = "snowdin_toxins_mine_1";
- name = "toxin out"
- },
-/turf/open/floor/plating,
-/area/awaymission/snowdin/cave)
"zc" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 8
@@ -13339,9 +13278,6 @@
/turf/open/floor/plating,
/area/awaymission/snowdin/post/mining_dock)
"Jl" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
/obj/machinery/door/airlock/mining/glass{
name = "Mining Dock";
req_access_txt = "48"
@@ -13384,9 +13320,6 @@
/turf/open/floor/plating/snowed/cavern,
/area/awaymission/snowdin/cave/cavern)
"Jr" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
/obj/machinery/door/airlock/mining/glass{
name = "Mining Dock";
req_access_txt = "48"
@@ -13546,20 +13479,6 @@
dir = 4
},
/area/awaymission/snowdin/post/mining_main)
-"JR" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/firedoor,
-/turf/open/floor/plating,
-/area/shuttle/snowdin/elevator2)
-"JS" = (
-/obj/machinery/door/airlock/public/glass{
- name = "Elevator Access"
- },
-/turf/open/floor/plating,
-/area/shuttle/snowdin/elevator2)
-"JT" = (
-/turf/closed/wall,
-/area/shuttle/snowdin/elevator2)
"JU" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -13622,19 +13541,6 @@
dir = 8
},
/area/awaymission/snowdin/post/mining_main)
-"Kd" = (
-/obj/machinery/computer/shuttle/snowdin/mining,
-/turf/open/floor/engine,
-/area/shuttle/snowdin/elevator2)
-"Ke" = (
-/turf/open/floor/engine,
-/area/shuttle/snowdin/elevator2)
-"Kf" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/turf/open/floor/engine,
-/area/shuttle/snowdin/elevator2)
"Kg" = (
/obj/structure/ore_box,
/obj/effect/turf_decal/bot,
@@ -13696,27 +13602,18 @@
},
/area/awaymission/snowdin/post/mining_main)
"Kn" = (
-/obj/machinery/door/airlock/public/glass{
- name = "Elevator Access"
- },
-/obj/docking_port/mobile/elevator{
- dir = 4;
- dwidth = 2;
- height = 5;
- id = "snowdin_mining";
- name = "mining elevator";
- width = 5
- },
/obj/docking_port/stationary{
+ area_type = /area/awaymission/snowdin/post/mining_main;
dir = 4;
dwidth = 2;
height = 5;
id = "snowdin_mining_top";
name = "snowdin mining top";
+ roundstart_template = /datum/map_template/shuttle/snowdin/mining;
width = 5
},
-/turf/open/floor/plating,
-/area/shuttle/snowdin/elevator2)
+/turf/open/floor/plasteel/elevatorshaft,
+/area/awaymission/snowdin/post/mining_main)
"Ko" = (
/obj/machinery/light{
dir = 4
@@ -13766,7 +13663,7 @@
name = "snowdin mining bottom";
width = 5
},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/elevatorshaft,
/area/awaymission/snowdin/post/mining_dock)
"Ku" = (
/obj/machinery/light{
@@ -13835,10 +13732,6 @@
},
/turf/open/floor/plasteel,
/area/awaymission/snowdin/post/mining_main)
-"KC" = (
-/obj/machinery/light/small,
-/turf/open/floor/engine,
-/area/shuttle/snowdin/elevator2)
"KD" = (
/obj/structure/ore_box,
/obj/effect/turf_decal/bot,
@@ -13912,8 +13805,8 @@
},
/area/awaymission/snowdin/post/mining_main)
"KP" = (
-/turf/closed/wall/rust,
-/area/shuttle/snowdin/elevator2)
+/turf/open/floor/plasteel/elevatorshaft,
+/area/awaymission/snowdin/post/mining_main)
"KQ" = (
/obj/machinery/computer/shuttle/snowdin/mining{
dir = 8
@@ -14014,6 +13907,9 @@
},
/turf/open/floor/plating,
/area/awaymission/snowdin/post/mining_dock)
+"ND" = (
+/turf/open/floor/plasteel/elevatorshaft,
+/area/awaymission/snowdin/post/mining_dock)
"OF" = (
/obj/machinery/door/airlock/external{
name = "Ready Room";
@@ -28100,7 +27996,7 @@ wS
wS
ai
yf
-zb
+yt
ai
wS
wS
@@ -28184,10 +28080,10 @@ IY
Go
Jx
KP
-JR
+KP
Kn
-JR
-JT
+KP
+KP
KT
Go
ac
@@ -28339,7 +28235,7 @@ ii
yb
an
yf
-zb
+yt
yf
ai
ai
@@ -28440,11 +28336,11 @@ Gq
Gq
Go
Jx
-JR
-Kd
-Ke
-KC
-JR
+KP
+KP
+KP
+KP
+KP
KT
GP
ac
@@ -28697,11 +28593,11 @@ Iy
Iy
Go
Jy
-JS
-Ke
-Ke
-Ke
-JS
+KP
+KP
+KP
+KP
+KP
KU
GP
ac
@@ -28954,11 +28850,11 @@ GP
GP
GP
Jx
-JR
-Kf
-Ke
-Ke
-JR
+KP
+KP
+KP
+KP
+KP
KT
GP
ac
@@ -29211,10 +29107,10 @@ ae
ae
Go
Jx
-JT
-JR
-JS
-JR
+KP
+KP
+KP
+KP
KP
KT
GP
@@ -30131,11 +30027,11 @@ ae
aj
xa
xl
-xm
-xn
+xl
+xl
xK
-xm
-xo
+xl
+xl
an
ii
ii
@@ -30387,12 +30283,12 @@ ae
ae
aj
xa
-xm
-xv
-xv
-xv
-xv
-xm
+xl
+xl
+xl
+xl
+xl
+xl
yp
ii
wS
@@ -30644,12 +30540,12 @@ ae
wQ
ai
xb
-xn
-xv
-xv
-xv
-xv
-xn
+xl
+xl
+xl
+xl
+xl
+xl
yq
ii
wS
@@ -30901,12 +30797,12 @@ ae
wQ
ai
xb
-xn
-xv
-xv
-xv
-xv
-xn
+xl
+xl
+xl
+xl
+xl
+xl
yq
an
ii
@@ -31158,12 +31054,12 @@ ae
wQ
wS
xa
-xm
-xw
-xv
-xv
-xv
-xm
+xl
+xl
+xl
+xl
+xl
+xl
yr
an
ii
@@ -31415,12 +31311,12 @@ ae
wQ
wS
xa
-xo
-xm
-xn
-xn
-xm
-xo
+xl
+xl
+xl
+xl
+xl
+xl
yp
an
an
@@ -62364,11 +62260,11 @@ IO
wL
wE
JH
-wL
-wL
+ND
+ND
Kt
-wL
-wL
+ND
+ND
KX
wE
bh
@@ -62621,11 +62517,11 @@ IQ
wL
wE
JH
-wL
-wL
-wL
-wL
-wL
+ND
+ND
+ND
+ND
+ND
KX
wE
bh
@@ -62878,11 +62774,11 @@ wL
wL
wE
JI
-wL
-wL
-wL
-wL
-wL
+ND
+ND
+ND
+ND
+ND
KY
wE
bh
@@ -63135,11 +63031,11 @@ wL
wL
wE
JH
-wL
-wL
-wL
-wL
-wL
+ND
+ND
+ND
+ND
+ND
KX
wE
bh
@@ -63392,11 +63288,11 @@ wL
wL
wD
JH
-wL
-wL
-wL
-wL
-wL
+ND
+ND
+ND
+ND
+ND
KX
wD
bh
@@ -64151,7 +64047,7 @@ oZ
oZ
oZ
hk
-jE
+sl
Gk
GN
Hj
@@ -64664,7 +64560,7 @@ oZ
oZ
oZ
oZ
-jv
+By
xW
xW
xW
@@ -65339,12 +65235,12 @@ eJ
wE
wV
xg
-wL
-wL
-wL
+ND
+ND
+ND
xP
-wL
-wL
+ND
+ND
yz
yR
wD
@@ -65596,12 +65492,12 @@ eJ
wD
wW
xg
-wL
-wL
-wL
-wL
-wL
-wL
+ND
+ND
+ND
+ND
+ND
+ND
yA
wM
zm
@@ -65853,12 +65749,12 @@ wD
wP
wX
xg
-wL
-wL
-wL
-wL
-wL
-wL
+ND
+ND
+ND
+ND
+ND
+ND
yB
xy
zn
@@ -66111,11 +66007,11 @@ wP
wW
xh
wW
-wL
-wL
-wL
-wL
-wL
+ND
+ND
+ND
+ND
+ND
yB
xy
zn
@@ -66369,10 +66265,10 @@ wW
xh
wW
wW
-wW
-wL
-wL
-wL
+ND
+ND
+ND
+ND
yC
yS
zm
@@ -66627,9 +66523,9 @@ xi
wW
wW
wW
-wL
-wL
-wL
+ND
+ND
+ND
yD
yT
wE
diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm
index a656e5cd0d..a25808d933 100644
--- a/_maps/RandomZLevels/caves.dmm
+++ b/_maps/RandomZLevels/caves.dmm
@@ -1640,7 +1640,7 @@
pixel_y = 32
},
/obj/item/paper/fluff/awaymissions/caves/shipment_notice,
-/obj/item/paper/fluff/awaymissions/caves/saftey_notice,
+/obj/item/paper/fluff/awaymissions/caves/safety_notice,
/turf/open/floor/plasteel,
/area/awaymission/caves/listeningpost)
"fb" = (
diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm
index 28cac610f4..42d28622c1 100644
--- a/_maps/RandomZLevels/snowdin.dmm
+++ b/_maps/RandomZLevels/snowdin.dmm
@@ -9263,23 +9263,10 @@
/turf/open/floor/plating/snowed,
/area/awaymission/snowdin/cave)
"xl" = (
-/obj/effect/baseturf_helper/asteroid/snow,
-/turf/closed/wall/ice,
-/area/shuttle/snowdin/elevator1)
-"xm" = (
-/obj/structure/window/reinforced/fulltile/ice,
-/obj/structure/grille,
-/turf/open/floor/plating,
-/area/shuttle/snowdin/elevator1)
-"xn" = (
-/obj/machinery/door/airlock/public/glass{
- name = "Elevator Access"
+/turf/open/floor/plasteel/elevatorshaft{
+ initial_gas_mix = "o2=22;n2=82;TEMP=180"
},
-/turf/open/floor/plating,
-/area/shuttle/snowdin/elevator1)
-"xo" = (
-/turf/closed/wall/ice,
-/area/shuttle/snowdin/elevator1)
+/area/awaymission/snowdin/cave)
"xp" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 8
@@ -9330,18 +9317,6 @@
},
/turf/open/floor/engine/cult,
/area/awaymission/snowdin/post/mining_dock)
-"xv" = (
-/turf/open/floor/engine,
-/area/shuttle/snowdin/elevator1)
-"xw" = (
-/obj/machinery/computer/shuttle/snowdin/mining{
- dir = 2;
- name = "Excavation Elevator Console";
- possible_destinations = "snowdin_excavation_top;snowdin_excavation_down";
- shuttleId = "snowdin_excavation"
- },
-/turf/open/floor/engine,
-/area/shuttle/snowdin/elevator1)
"xx" = (
/obj/effect/spawner/lootdrop/crate_spawner,
/turf/open/floor/plasteel/neutral,
@@ -9430,26 +9405,20 @@
},
/area/awaymission/snowdin/post/mining_dock)
"xK" = (
-/obj/machinery/door/airlock/public/glass{
- name = "Elevator Access"
- },
-/obj/docking_port/mobile/elevator{
- dir = 4;
- height = 6;
- id = "snowdin_excavation";
- name = "excavation elevator";
- width = 6
- },
/obj/docking_port/stationary{
+ area_type = /area/awaymission/snowdin/cave;
dir = 4;
dwidth = 3;
height = 6;
id = "snowdin_excavation_top";
name = "snowdin excavation top";
+ roundstart_template = /datum/map_template/shuttle/snowdin/excavation;
width = 6
},
-/turf/open/floor/plating,
-/area/shuttle/snowdin/elevator1)
+/turf/open/floor/plasteel/elevatorshaft{
+ initial_gas_mix = "o2=22;n2=82;TEMP=180"
+ },
+/area/awaymission/snowdin/cave)
"xL" = (
/obj/machinery/atmospherics/pipe/manifold/orange/visible{
dir = 8
@@ -9476,6 +9445,7 @@
/area/awaymission/snowdin/post/mining_dock)
"xP" = (
/obj/docking_port/stationary{
+ area_type = /area/awaymission/snowdin/post/mining_dock;
dir = 4;
dwidth = 3;
height = 6;
@@ -9483,7 +9453,7 @@
name = "snowdin excavation down";
width = 6
},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/elevatorshaft,
/area/awaymission/snowdin/post/mining_dock)
"xQ" = (
/obj/effect/turf_decal/stripes/line{
@@ -9917,20 +9887,6 @@
},
/turf/open/floor/engine/vacuum,
/area/awaymission/snowdin/cave)
-"zb" = (
-/obj/structure/window/reinforced/fulltile/ice,
-/obj/structure/grille,
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
- dir = 8
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 4;
- frequency = 1442;
- id_tag = "snowdin_toxins_mine_1";
- name = "toxin out"
- },
-/turf/open/floor/plating,
-/area/awaymission/snowdin/cave)
"zc" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 8
@@ -12308,13 +12264,6 @@
/obj/effect/turf_decal/loading_area,
/turf/open/floor/plating/snowed/cavern,
/area/awaymission/snowdin/cave/cavern)
-"FP" = (
-/turf/open/floor/plating/asteroid/snow/ice,
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/turf/open/floor/plating/snowed/cavern,
-/area/awaymission/snowdin/cave/cavern)
"FQ" = (
/obj/effect/light_emitter{
name = "outdoor light";
@@ -12366,13 +12315,6 @@
},
/turf/open/floor/plating/asteroid/snow/ice,
/area/awaymission/snowdin/cave/cavern)
-"FX" = (
-/turf/open/floor/plating/asteroid/snow/ice,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/plating/snowed/cavern,
-/area/awaymission/snowdin/cave/cavern)
"FY" = (
/turf/open/floor/plating/asteroid/snow/ice,
/obj/machinery/conveyor{
@@ -13442,9 +13384,6 @@
/turf/open/floor/plating,
/area/awaymission/snowdin/post/mining_dock)
"Jl" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
/obj/machinery/door/airlock/mining/glass{
name = "Mining Dock";
req_access_txt = "48"
@@ -13487,9 +13426,6 @@
/turf/open/floor/plating/snowed/cavern,
/area/awaymission/snowdin/cave/cavern)
"Jr" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
/obj/machinery/door/airlock/mining/glass{
name = "Mining Dock";
req_access_txt = "48"
@@ -13650,23 +13586,8 @@
},
/area/awaymission/snowdin/post/mining_main)
"JQ" = (
-/obj/effect/baseturf_helper/asteroid/snow,
-/turf/closed/wall/rust,
-/area/shuttle/snowdin/elevator2)
-"JR" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/firedoor,
-/turf/open/floor/plating,
-/area/shuttle/snowdin/elevator2)
-"JS" = (
-/obj/machinery/door/airlock/public/glass{
- name = "Elevator Access"
- },
-/turf/open/floor/plating,
-/area/shuttle/snowdin/elevator2)
-"JT" = (
-/turf/closed/wall,
-/area/shuttle/snowdin/elevator2)
+/turf/open/floor/plasteel/elevatorshaft,
+/area/awaymission/snowdin/post/mining_main)
"JU" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -13729,19 +13650,6 @@
dir = 8
},
/area/awaymission/snowdin/post/mining_main)
-"Kd" = (
-/obj/machinery/computer/shuttle/snowdin/mining,
-/turf/open/floor/engine,
-/area/shuttle/snowdin/elevator2)
-"Ke" = (
-/turf/open/floor/engine,
-/area/shuttle/snowdin/elevator2)
-"Kf" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/turf/open/floor/engine,
-/area/shuttle/snowdin/elevator2)
"Kg" = (
/obj/structure/ore_box,
/obj/effect/turf_decal/bot,
@@ -13803,27 +13711,18 @@
},
/area/awaymission/snowdin/post/mining_main)
"Kn" = (
-/obj/machinery/door/airlock/public/glass{
- name = "Elevator Access"
- },
-/obj/docking_port/mobile/elevator{
- dir = 4;
- dwidth = 2;
- height = 5;
- id = "snowdin_mining";
- name = "mining elevator";
- width = 5
- },
/obj/docking_port/stationary{
+ area_type = /area/awaymission/snowdin/post/mining_main;
dir = 4;
dwidth = 2;
height = 5;
id = "snowdin_mining_top";
name = "snowdin mining top";
+ roundstart_template = /datum/map_template/shuttle/snowdin/mining;
width = 5
},
-/turf/open/floor/plating,
-/area/shuttle/snowdin/elevator2)
+/turf/open/floor/plasteel/elevatorshaft,
+/area/awaymission/snowdin/post/mining_main)
"Ko" = (
/obj/machinery/light{
dir = 4
@@ -13873,7 +13772,7 @@
name = "snowdin mining bottom";
width = 5
},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/elevatorshaft,
/area/awaymission/snowdin/post/mining_dock)
"Ku" = (
/obj/machinery/light{
@@ -13942,10 +13841,6 @@
},
/turf/open/floor/plasteel,
/area/awaymission/snowdin/post/mining_main)
-"KC" = (
-/obj/machinery/light/small,
-/turf/open/floor/engine,
-/area/shuttle/snowdin/elevator2)
"KD" = (
/obj/structure/ore_box,
/obj/effect/turf_decal/bot,
@@ -14018,9 +13913,6 @@
dir = 4
},
/area/awaymission/snowdin/post/mining_main)
-"KP" = (
-/turf/closed/wall/rust,
-/area/shuttle/snowdin/elevator2)
"KQ" = (
/obj/machinery/computer/shuttle/snowdin/mining{
dir = 8
@@ -14156,6 +14048,20 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/awaymission/snowdin/post/mining_dock)
+"WK" = (
+/turf/open/floor/plating/asteroid/snow/ice,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/turf/open/floor/plating/snowed/cavern,
+/area/awaymission/snowdin/cave/cavern)
+"XO" = (
+/turf/open/floor/plating/asteroid/snow/ice,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/plating/snowed/cavern,
+/area/awaymission/snowdin/cave/cavern)
"Yn" = (
/obj/machinery/door/airlock/external/glass,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -14163,6 +14069,9 @@
},
/turf/open/floor/plating,
/area/awaymission/snowdin/post/garage)
+"Ys" = (
+/turf/open/floor/plasteel/elevatorshaft,
+/area/awaymission/snowdin/post/mining_dock)
(1,1,1) = {"
aa
@@ -28201,7 +28110,7 @@ wS
wS
ai
yf
-zb
+yt
ai
wS
wS
@@ -28285,10 +28194,10 @@ IY
Go
Jx
JQ
-JR
+JQ
Kn
-JR
-JT
+JQ
+JQ
KT
Go
ac
@@ -28440,7 +28349,7 @@ ii
yb
an
yf
-zb
+yt
yf
ai
ai
@@ -28541,11 +28450,11 @@ Gq
Gq
Go
Jx
-JR
-Kd
-Ke
-KC
-JR
+JQ
+JQ
+JQ
+JQ
+JQ
KT
GP
ac
@@ -28798,11 +28707,11 @@ Iy
Iy
Go
Jy
-JS
-Ke
-Ke
-Ke
-JS
+JQ
+JQ
+JQ
+JQ
+JQ
KU
GP
ac
@@ -29055,11 +28964,11 @@ GP
GP
GP
Jx
-JR
-Kf
-Ke
-Ke
-JR
+JQ
+JQ
+JQ
+JQ
+JQ
KT
GP
ac
@@ -29312,11 +29221,11 @@ ae
ae
Go
Jx
-JT
-JR
-JS
-JR
-KP
+JQ
+JQ
+JQ
+JQ
+JQ
KT
GP
ac
@@ -30232,11 +30141,11 @@ ae
aj
xa
xl
-xm
-xn
+xl
+xl
xK
-xm
-xo
+xl
+xl
an
ii
ii
@@ -30488,12 +30397,12 @@ ae
ae
aj
xa
-xm
-xv
-xv
-xv
-xv
-xm
+xl
+xl
+xl
+xl
+xl
+xl
yp
ii
wS
@@ -30745,12 +30654,12 @@ ae
wQ
ai
xb
-xn
-xv
-xv
-xv
-xv
-xn
+xl
+xl
+xl
+xl
+xl
+xl
yq
ii
wS
@@ -31002,12 +30911,12 @@ ae
wQ
ai
xb
-xn
-xv
-xv
-xv
-xv
-xn
+xl
+xl
+xl
+xl
+xl
+xl
yq
an
ii
@@ -31259,12 +31168,12 @@ ae
wQ
wS
xa
-xm
-xw
-xv
-xv
-xv
-xm
+xl
+xl
+xl
+xl
+xl
+xl
yr
an
ii
@@ -31516,12 +31425,12 @@ ae
wQ
wS
xa
-xo
-xm
-xn
-xn
-xm
-xo
+xl
+xl
+xl
+xl
+xl
+xl
yp
an
an
@@ -62465,11 +62374,11 @@ IO
wL
wE
JH
-wL
-wL
+Ys
+Ys
Kt
-wL
-wL
+Ys
+Ys
KX
wE
bh
@@ -62722,11 +62631,11 @@ IQ
wL
wE
JH
-wL
-wL
-wL
-wL
-wL
+Ys
+Ys
+Ys
+Ys
+Ys
KX
wE
bh
@@ -62979,11 +62888,11 @@ wL
wL
wE
JI
-wL
-wL
-wL
-wL
-wL
+Ys
+Ys
+Ys
+Ys
+Ys
KY
wE
bh
@@ -63236,11 +63145,11 @@ wL
wL
wE
JH
-wL
-wL
-wL
-wL
-wL
+Ys
+Ys
+Ys
+Ys
+Ys
KX
wE
bh
@@ -63493,11 +63402,11 @@ wL
wL
wD
JH
-wL
-wL
-wL
-wL
-wL
+Ys
+Ys
+Ys
+Ys
+Ys
KX
wD
bh
@@ -64252,7 +64161,7 @@ oZ
oZ
oZ
FN
-FX
+XO
Gk
GN
Hj
@@ -64765,7 +64674,7 @@ oZ
oZ
oZ
oZ
-FP
+WK
xW
xW
xW
@@ -65440,12 +65349,12 @@ eJ
wE
wV
xg
-wL
-wL
-wL
+Ys
+Ys
+Ys
xP
-wL
-wL
+Ys
+Ys
yz
yR
wD
@@ -65697,12 +65606,12 @@ eJ
wD
wW
xg
-wL
-wL
-wL
-wL
-wL
-wL
+Ys
+Ys
+Ys
+Ys
+Ys
+Ys
yA
wM
zm
@@ -65954,12 +65863,12 @@ wD
wP
wX
xg
-wL
-wL
-wL
-wL
-wL
-wL
+Ys
+Ys
+Ys
+Ys
+Ys
+Ys
yB
xy
zn
@@ -66212,11 +66121,11 @@ wP
wW
xh
wW
-wL
-wL
-wL
-wL
-wL
+Ys
+Ys
+Ys
+Ys
+Ys
yB
xy
zn
@@ -66470,10 +66379,10 @@ wW
xh
wW
wW
-wW
-wL
-wL
-wL
+Ys
+Ys
+Ys
+Ys
yC
yS
zm
@@ -66728,9 +66637,9 @@ xi
wW
wW
wW
-wL
-wL
-wL
+Ys
+Ys
+Ys
yD
yT
wE
diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm
index de733c8c34..5fa5545c1c 100644
--- a/_maps/RandomZLevels/undergroundoutpost45.dmm
+++ b/_maps/RandomZLevels/undergroundoutpost45.dmm
@@ -7778,10 +7778,7 @@
dir = 2;
id = "UO45_air_in"
},
-/turf/open/floor/engine{
- name = "air floor";
- initial_gas_mix = "n2=10580;o2=2644"
- },
+/turf/open/floor/engine/air,
/area/awaymission/undergroundoutpost45/engineering)
"pG" = (
/obj/structure/cable{
@@ -8023,10 +8020,7 @@
external_pressure_bound = 120;
name = "server vent"
},
-/turf/open/floor/circuit{
- name = "Server Base";
- initial_gas_mix = "n2=500,TEMP=80"
- },
+/turf/open/floor/circuit/telecomms/server,
/area/awaymission/undergroundoutpost45/research)
"qi" = (
/obj/machinery/atmospherics/pipe/simple{
@@ -8394,10 +8388,7 @@
/obj/machinery/rnd/server{
req_access = null
},
-/turf/open/floor/circuit{
- name = "Server Base";
- initial_gas_mix = "n2=500,TEMP=80"
- },
+/turf/open/floor/circuit/telecomms/server,
/area/awaymission/undergroundoutpost45/research)
"qQ" = (
/obj/machinery/atmospherics/pipe/manifold{
@@ -12603,6 +12594,12 @@
/obj/effect/mapping_helpers/planet_z,
/turf/open/space,
/area/space/nearstation)
+"KE" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/turf/open/floor/circuit/telecomms/server,
+/area/awaymission/undergroundoutpost45/research)
(1,1,1) = {"
aa
@@ -37925,7 +37922,7 @@ gz
gz
gz
gz
-qh
+KE
qP
qh
gz
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index f7aefd5575..0a05c6f8ea 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -33,6 +33,13 @@
},
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar)
+"aad" = (
+/obj/structure/table,
+/obj/machinery/chem_dispenser/drinks/beer{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/maintenance/port/aft)
"aae" = (
/obj/effect/landmark/carpspawn,
/turf/open/space,
@@ -707,7 +714,7 @@
/turf/open/floor/carpet,
/area/crew_quarters/heads/hos)
"abV" = (
-/obj/machinery/computer/security,
+/obj/machinery/computer/security/hos,
/turf/open/floor/carpet,
/area/crew_quarters/heads/hos)
"abW" = (
@@ -1730,10 +1737,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching Prison Wing holding areas.";
- name = "Prison Monitor";
- network = list("prison");
+/obj/machinery/computer/security/telescreen/prison{
pixel_y = 30
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -1769,10 +1773,7 @@
/turf/open/floor/plasteel,
/area/security/prison)
"aen" = (
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching Prison Wing holding areas.";
- name = "Prison Monitor";
- network = list("prison");
+/obj/machinery/computer/security/telescreen/prison{
pixel_y = 30
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -3518,7 +3519,8 @@
"ail" = (
/obj/machinery/camera{
c_tag = "Brig Interrogation";
- dir = 8
+ dir = 8;
+ network = list("interrogation")
},
/turf/open/floor/plasteel/dark,
/area/security/prison)
@@ -3996,10 +3998,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
-/obj/machinery/computer/security{
- name = "Labor Camp Monitoring";
- network = list("labor")
- },
+/obj/machinery/computer/security/labor,
/turf/open/floor/plasteel,
/area/security/processing)
"ajv" = (
@@ -4056,6 +4055,9 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
},
+/obj/machinery/computer/security/telescreen/interrogation{
+ pixel_y = 30
+ },
/turf/open/floor/plasteel/red/side{
dir = 1
},
@@ -7919,11 +7921,8 @@
pixel_y = 7
},
/obj/item/pen,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching Prison Wing holding areas.";
+/obj/machinery/computer/security/telescreen/prison{
dir = 1;
- name = "Prison Monitor";
- network = list("prison");
pixel_y = -27
},
/turf/open/floor/wood,
@@ -9134,12 +9133,9 @@
/obj/item/wallframe/camera,
/obj/item/wallframe/camera,
/obj/item/assault_pod/mining,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for the Auxillary Mining Base.";
+/obj/machinery/computer/security/telescreen/auxbase{
dir = 8;
- name = "Auxillary Base Monitor";
- network = list("auxbase");
- pixel_x = 28
+ pixel_x = 30
},
/turf/open/floor/plasteel/yellow/side{
dir = 4
@@ -11089,7 +11085,21 @@
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
"aCd" = (
-/obj/machinery/cryopod,
+/obj/structure/bed,
+/obj/item/bedsheet,
+/obj/machinery/airalarm{
+ pixel_y = 23
+ },
+/obj/machinery/button/door{
+ id = "Dorm1";
+ name = "Dorm Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_x = 25;
+ specialfunctions = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"aCe" = (
@@ -11709,7 +11719,7 @@
"aDK" = (
/obj/machinery/door/airlock{
id_tag = "Dorm1";
- name = "Cryogenics"
+ name = "Dorm 1"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -12590,7 +12600,7 @@
/obj/machinery/camera/motion{
c_tag = "Vault";
dir = 1;
- network = list("minisat")
+ network = list("vault")
},
/obj/machinery/light,
/turf/open/floor/plasteel/vault/corner{
@@ -14494,7 +14504,10 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/machinery/plantgenes,
+/obj/machinery/plantgenes{
+ pixel_y = 6
+ },
+/obj/structure/table,
/turf/open/floor/plasteel/hydrofloor,
/area/hydroponics)
"aKM" = (
@@ -16675,7 +16688,10 @@
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aQX" = (
-/obj/machinery/vending/kink,
+/obj/machinery/firealarm{
+ dir = 2;
+ pixel_y = 24
+ },
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aQY" = (
@@ -17703,9 +17719,7 @@
/turf/open/floor/plasteel,
/area/bridge)
"aUd" = (
-/obj/machinery/computer/security/mining{
- network = list("mine","auxbase")
- },
+/obj/machinery/computer/security/mining,
/turf/open/floor/plasteel/brown{
dir = 6
},
@@ -20796,7 +20810,8 @@
/obj/structure/table,
/obj/item/aiModule/supplied/quarantine,
/obj/machinery/camera/motion{
- dir = 4
+ dir = 4;
+ network = list("aiupload")
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai_upload)
@@ -20814,7 +20829,8 @@
pixel_x = 32
},
/obj/machinery/camera/motion{
- dir = 8
+ dir = 8;
+ network = list("aiupload")
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai_upload)
@@ -21076,6 +21092,10 @@
},
/turf/closed/wall,
/area/quartermaster/warehouse)
+"bcU" = (
+/obj/item/stack/tile/plasteel,
+/turf/open/space,
+/area/space/nearstation)
"bcV" = (
/obj/machinery/airalarm{
dir = 8;
@@ -21466,6 +21486,10 @@
/obj/structure/closet/crate/medical,
/turf/open/floor/plasteel/floorgrime,
/area/quartermaster/warehouse)
+"bdV" = (
+/obj/item/stack/sheet/metal,
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
"bdW" = (
/obj/item/clothing/gloves/color/rainbow,
/obj/item/clothing/head/soft/rainbow,
@@ -23876,6 +23900,7 @@
"bkb" = (
/obj/machinery/camera{
c_tag = "Medbay Morgue";
+ network = list("ss13","medbay");
dir = 8
},
/obj/machinery/airalarm{
@@ -24402,6 +24427,7 @@
/obj/structure/table/reinforced,
/obj/machinery/camera{
c_tag = "Medbay Foyer";
+ network = list("ss13","medbay");
dir = 8
},
/obj/machinery/cell_charger,
@@ -25495,10 +25521,7 @@
/turf/open/floor/plasteel,
/area/crew_quarters/heads/hop)
"bnR" = (
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching Prison Wing holding areas.";
- name = "Prison Monitor";
- network = list("prison");
+/obj/machinery/computer/security/telescreen/vault{
pixel_y = 30
},
/obj/machinery/disposal/bin,
@@ -26795,6 +26818,7 @@
},
/obj/machinery/camera{
c_tag = "Medbay West";
+ network = list("ss13","medbay");
dir = 2
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -27479,6 +27503,7 @@
},
/obj/machinery/camera{
c_tag = "Medbay East";
+ network = list("ss13","medbay");
dir = 8;
pixel_y = -22
},
@@ -27843,7 +27868,7 @@
/area/maintenance/starboard)
"btr" = (
/obj/machinery/camera{
- c_tag = "Cargo Recieving Dock";
+ c_tag = "Cargo Receiving Dock";
dir = 4
},
/obj/machinery/button/door{
@@ -28807,7 +28832,7 @@
/obj/machinery/camera{
c_tag = "Genetics Research";
dir = 1;
- network = list("ss13","rd")
+ network = list("ss13","medbay")
},
/obj/machinery/firealarm{
dir = 1;
@@ -28841,6 +28866,7 @@
"bvB" = (
/obj/machinery/camera{
c_tag = "Genetics Access";
+ network = list("ss13","medbay");
dir = 8;
pixel_y = -22
},
@@ -29198,7 +29224,8 @@
"bww" = (
/obj/structure/chair,
/obj/machinery/camera{
- c_tag = "Surgery Observation"
+ c_tag = "Surgery Observation";
+ network = list("ss13","medbay")
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 4
@@ -29283,6 +29310,7 @@
/obj/structure/table/glass,
/obj/machinery/camera{
c_tag = "Medbay Cryogenics";
+ network = list("ss13","medbay");
dir = 2
},
/obj/item/reagent_containers/glass/beaker/cryoxadone,
@@ -29301,6 +29329,7 @@
"bwL" = (
/obj/machinery/camera{
c_tag = "Genetics Cloning";
+ network = list("ss13","medbay");
dir = 4
},
/obj/structure/table,
@@ -29553,13 +29582,8 @@
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/heads/hor)
"bxj" = (
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the RD's goons and the AI's satellite from the safety of his office.";
- name = "Research Monitor";
- network = list("rd","minisat");
- pixel_y = 2
- },
/obj/structure/table,
+/obj/machinery/computer/security/telescreen/rd,
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/heads/hor)
"bxk" = (
@@ -30205,8 +30229,7 @@
pixel_x = 27
},
/obj/machinery/computer/security/mining{
- dir = 8;
- network = list("mine","auxbase")
+ dir = 8
},
/turf/open/floor/plasteel/red/side{
dir = 4
@@ -30549,13 +30572,8 @@
/area/security/checkpoint/science)
"bzD" = (
/obj/structure/table,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the RD's goons from the safety of your own office.";
- name = "Research Monitor";
- network = list("rd");
- pixel_y = 2
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/computer/security/telescreen/circuitry,
/turf/open/floor/plasteel/red/side{
dir = 1
},
@@ -30873,6 +30891,7 @@
},
/obj/machinery/camera{
c_tag = "Medbay Treatment Center";
+ network = list("ss13","medbay");
dir = 8
},
/turf/open/floor/plasteel,
@@ -31091,10 +31110,6 @@
/turf/open/floor/engine,
/area/science/explab)
"bAS" = (
-/obj/machinery/computer/security/mining{
- dir = 4;
- network = list("mine","auxbase")
- },
/obj/machinery/camera{
c_tag = "Quartermaster's Office";
dir = 4
@@ -31107,6 +31122,9 @@
pixel_x = -32;
supply_display = 1
},
+/obj/machinery/computer/security/qm{
+ dir = 4
+ },
/turf/open/floor/plasteel/brown{
dir = 10
},
@@ -31906,6 +31924,7 @@
/obj/structure/closet/secure_closet/medical3,
/obj/machinery/camera{
c_tag = "Medbay Storage";
+ network = list("ss13","medbay");
dir = 2
},
/turf/open/floor/plasteel/white,
@@ -31988,6 +32007,7 @@
},
/obj/machinery/camera{
c_tag = "Medbay South";
+ network = list("ss13","medbay");
dir = 4
},
/turf/open/floor/plasteel/white,
@@ -32280,6 +32300,7 @@
},
/obj/machinery/camera{
c_tag = "Medbay Recovery Room";
+ network = list("ss13","medbay");
dir = 8
},
/obj/machinery/iv_drip,
@@ -32521,6 +32542,7 @@
},
/obj/machinery/camera{
c_tag = "Chief Medical Office";
+ network = list("ss13","medbay");
dir = 8;
pixel_y = -22
},
@@ -32733,13 +32755,11 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"bEK" = (
-/obj/machinery/computer/security/mining{
- network = list("mine","auxbase")
- },
/obj/machinery/camera{
c_tag = "Mining Dock";
dir = 4
},
+/obj/machinery/computer/security/mining,
/turf/open/floor/plasteel,
/area/quartermaster/miningdock)
"bEL" = (
@@ -33103,6 +33123,10 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
},
+/obj/machinery/computer/security/telescreen/cmo{
+ dir = 1;
+ pixel_y = -24
+ },
/turf/open/floor/plasteel/barber,
/area/crew_quarters/heads/cmo)
"bFF" = (
@@ -33815,17 +33839,13 @@
/turf/open/floor/plasteel,
/area/science/mixing)
"bHv" = (
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the test chamber.";
- dir = 8;
- layer = 4;
- name = "Test Chamber Telescreen";
- network = list("toxins");
- pixel_x = 30
- },
/obj/effect/turf_decal/stripes/line{
dir = 5
},
+/obj/machinery/computer/security/telescreen/toxins{
+ dir = 4;
+ pixel_x = 30
+ },
/turf/open/floor/plasteel,
/area/science/mixing)
"bHw" = (
@@ -34068,6 +34088,7 @@
},
/obj/machinery/camera{
c_tag = "Surgery Operating";
+ network = list("ss13","medbay");
dir = 1;
pixel_x = 22
},
@@ -34389,7 +34410,8 @@
pixel_y = 29
},
/obj/machinery/camera{
- c_tag = "Virology Break Room"
+ c_tag = "Virology Break Room";
+ network = list("ss13","medbay")
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
@@ -34538,7 +34560,6 @@
/turf/open/floor/plating/airless,
/area/science/test_area)
"bJa" = (
-/obj/item/flashlight/lamp,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -34880,6 +34901,10 @@
},
/turf/open/floor/plasteel,
/area/science/misc_lab)
+"bJP" = (
+/obj/machinery/vending/boozeomat/all_access,
+/turf/open/floor/plasteel/bar,
+/area/maintenance/port/aft)
"bJQ" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -35577,21 +35602,13 @@
},
/area/science/test_area)
"bLr" = (
-/obj/machinery/camera{
- active_power_usage = 0;
- c_tag = "Bomb Test Site";
- desc = "A specially-reinforced camera with a long lasting battery, used to monitor the bomb testing site.";
- dir = 8;
- invuln = 1;
- light = null;
- name = "Hardened Bomb-Test Camera";
- network = list("toxins");
- use_power = 0
- },
/obj/item/target/alien/anchored,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
+/obj/machinery/camera/preset/toxins{
+ dir = 8
+ },
/turf/open/floor/plating{
luminosity = 2;
initial_gas_mix = "o2=0.01;n2=0.01"
@@ -36439,7 +36456,6 @@
/turf/open/floor/plating/airless,
/area/science/test_area)
"bNF" = (
-/obj/item/flashlight/lamp,
/obj/effect/turf_decal/stripes/line{
dir = 2
},
@@ -36692,6 +36708,7 @@
/obj/structure/closet/emcloset,
/obj/machinery/camera{
c_tag = "Virology Airlock";
+ network = list("ss13","medbay");
dir = 2
},
/obj/effect/turf_decal/stripes/line{
@@ -37421,8 +37438,34 @@
},
/turf/open/floor/plasteel,
/area/tcommsat/computer)
+"bPR" = (
+/obj/effect/decal/cleanable/robot_debris/old,
+/turf/open/floor/wood,
+/area/maintenance/port/aft)
+"bPS" = (
+/turf/open/floor/wood,
+/area/maintenance/port/aft)
+"bPT" = (
+/turf/open/floor/wood{
+ icon_state = "wood-broken"
+ },
+/area/maintenance/port/aft)
"bPU" = (
-/obj/effect/spawner/lootdrop/keg,
+/obj/item/shard,
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
+"bPV" = (
+/obj/machinery/door/airlock/maintenance{
+ name = "Maint Bar Access";
+ req_access_txt = "12"
+ },
+/obj/structure/barricade/wooden{
+ name = "wooden barricade (CLOSED)"
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
+"bPW" = (
+/obj/effect/decal/cleanable/oil,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"bPX" = (
@@ -37810,14 +37853,10 @@
/area/science/misc_lab)
"bQY" = (
/obj/structure/table/reinforced,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the RD's goons from the safety of his office.";
- dir = 2;
- name = "Research Monitor";
- network = list("rd");
- pixel_y = 28
- },
/obj/item/integrated_circuit_printer,
+/obj/machinery/computer/security/telescreen/circuitry{
+ pixel_y = 30
+ },
/turf/open/floor/plasteel/white,
/area/science/circuit)
"bQZ" = (
@@ -37828,14 +37867,30 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/stack/sheet/metal/fifty,
-/turf/open/floor/plasteel/white,
-/area/science/circuit)
-"bRb" = (
-/obj/structure/table/reinforced,
-/obj/machinery/computer/libraryconsole/bookmanagement,
+/obj/item/stack/sheet/metal/ten,
/turf/open/floor/plasteel/white,
/area/science/circuit)
+"bRc" = (
+/obj/structure/table/wood,
+/obj/item/soap/nanotrasen,
+/turf/open/floor/wood{
+ icon_state = "wood-broken7"
+ },
+/area/maintenance/port/aft)
+"bRe" = (
+/obj/structure/table/wood,
+/obj/effect/spawner/lootdrop/maintenance{
+ lootcount = 4;
+ name = "4maintenance loot spawner"
+ },
+/turf/open/floor/wood,
+/area/maintenance/port/aft)
+"bRf" = (
+/obj/structure/table/wood,
+/turf/open/floor/wood{
+ icon_state = "wood-broken5"
+ },
+/area/maintenance/port/aft)
"bRg" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance{
@@ -37906,13 +37961,9 @@
/obj/machinery/computer/secure_data{
dir = 8
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the Engine.";
+/obj/machinery/computer/security/telescreen/engine{
dir = 8;
- layer = 4;
- name = "Engine Monitor";
- network = list("engine");
- pixel_x = 30
+ pixel_x = 24
},
/turf/open/floor/plasteel/red/side{
dir = 4
@@ -38303,6 +38354,18 @@
icon_state = "platingdmg3"
},
/area/maintenance/starboard/aft)
+"bSn" = (
+/obj/machinery/space_heater,
+/turf/open/floor/wood,
+/area/maintenance/port/aft)
+"bSo" = (
+/obj/structure/chair/stool,
+/turf/open/floor/wood,
+/area/maintenance/port/aft)
+"bSp" = (
+/obj/structure/grille/broken,
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"bSq" = (
/obj/structure/rack,
/obj/item/tank/internals/emergency_oxygen,
@@ -38320,18 +38383,18 @@
/obj/structure/closet/emcloset,
/obj/machinery/camera{
c_tag = "Telecomms Monitoring";
- dir = 8
+ dir = 8;
+ network = list("tcomms")
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/tcommsat/computer)
"bSu" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 6
+/obj/item/stack/cable_coil{
+ amount = 5
},
-/obj/structure/table/wood,
-/turf/open/floor/wood,
-/area/maintenance/bar)
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
"bSv" = (
/obj/machinery/camera{
c_tag = "Construction Area";
@@ -38590,7 +38653,8 @@
icon_state = "0-8"
},
/obj/machinery/camera{
- c_tag = "Virology Module"
+ c_tag = "Virology Module";
+ network = list("ss13","medbay")
},
/turf/open/floor/plasteel/white,
/area/medical/virology)
@@ -38782,6 +38846,54 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"bTs" = (
+/turf/open/floor/wood{
+ icon_state = "wood-broken5"
+ },
+/area/maintenance/port/aft)
+"bTt" = (
+/obj/machinery/atmospherics/pipe/simple/general/hidden{
+ dir = 4
+ },
+/turf/open/floor/wood{
+ icon_state = "wood-broken6"
+ },
+/area/maintenance/port/aft)
+"bTu" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/maintenance/port/aft)
+"bTv" = (
+/obj/machinery/atmospherics/pipe/simple/general/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
+"bTw" = (
+/obj/machinery/door/airlock/maintenance/abandoned{
+ req_access_txt = "12"
+ },
+/obj/machinery/atmospherics/pipe/simple/general/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
+"bTx" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+ dir = 8
+ },
+/obj/machinery/portable_atmospherics/canister/air,
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
+"bTy" = (
+/obj/effect/spawner/structure/window,
+/obj/machinery/atmospherics/pipe/simple/general/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"bTz" = (
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
@@ -41427,9 +41539,11 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"car" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 5
+ },
/turf/closed/wall,
-/area/maintenance/bar)
+/area/maintenance/port/aft)
"cas" = (
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
@@ -41844,7 +41958,8 @@
"cbl" = (
/obj/machinery/camera{
c_tag = "Telecomms Server Room";
- dir = 4
+ dir = 4;
+ network = list("tcomms")
},
/turf/open/floor/plasteel/dark/telecomms/mainframe,
/area/tcommsat/server)
@@ -41953,14 +42068,16 @@
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"cbw" = (
-/obj/structure/cable{
- icon_state = "2-8"
- },
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 5
+ },
/turf/open/floor/plating,
/area/maintenance/port/aft)
"cbx" = (
@@ -42184,14 +42301,11 @@
/area/science/circuit)
"cbZ" = (
/obj/structure/table/reinforced,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the RD's goons from the safety of his office.";
- dir = 1;
- name = "Research Monitor";
- network = list("rd");
- pixel_y = -28
- },
/obj/item/integrated_circuit_printer,
+/obj/machinery/computer/security/telescreen/circuitry{
+ dir = 1;
+ pixel_y = -30
+ },
/turf/open/floor/plasteel/white,
/area/science/circuit)
"cca" = (
@@ -44951,6 +45065,10 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
+"cjn" = (
+/obj/item/weldingtool,
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
"cjo" = (
/obj/structure/closet/toolcloset,
/turf/open/floor/plasteel,
@@ -45178,11 +45296,8 @@
/obj/machinery/computer/station_alert{
dir = 4
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the RD's goons from the safety of your own office.";
+/obj/machinery/computer/security/telescreen/ce{
dir = 4;
- name = "Research Monitor";
- network = list("rd");
pixel_x = -24
},
/turf/open/floor/plasteel/vault,
@@ -47934,16 +48049,13 @@
/turf/open/space,
/area/space/nearstation)
"csq" = (
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the turbine vent.";
- dir = 1;
- name = "turbine vent monitor";
- network = list("turbine");
- pixel_y = -29
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4
},
+/obj/machinery/computer/security/telescreen/turbine{
+ dir = 1;
+ pixel_y = -30
+ },
/turf/open/floor/plasteel/floorgrime,
/area/maintenance/disposal/incinerator)
"csr" = (
@@ -49299,7 +49411,7 @@
/obj/machinery/camera/motion{
c_tag = "MiniSat Core Hallway";
dir = 4;
- network = list("minisat")
+ network = list("aicore")
},
/obj/machinery/firealarm{
dir = 8;
@@ -49677,7 +49789,7 @@
/obj/machinery/camera/motion{
c_tag = "MiniSat AI Chamber North";
dir = 1;
- network = list("minisat")
+ network = list("aicore")
},
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai)
@@ -50573,7 +50685,7 @@
/obj/machinery/camera/motion{
c_tag = "MiniSat AI Chamber South";
dir = 2;
- network = list("minisat")
+ network = list("aicore")
},
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai)
@@ -50904,6 +51016,10 @@
/obj/item/clothing/under/burial,
/turf/open/floor/plasteel/grimy,
/area/chapel/office)
+"cCa" = (
+/obj/item/clothing/head/hardhat,
+/turf/open/floor/plating/airless,
+/area/space/nearstation)
"cCb" = (
/obj/structure/table,
/obj/item/stack/cable_coil{
@@ -52522,17 +52638,13 @@
/turf/open/floor/plating,
/area/engine/engineering)
"cMC" = (
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the Engine.";
- dir = 8;
- layer = 4;
- name = "Engine Monitor";
- network = list("engine");
- pixel_x = 30
- },
/obj/effect/turf_decal/stripes/line{
dir = 5
},
+/obj/machinery/computer/security/telescreen/engine{
+ dir = 8;
+ pixel_x = 30
+ },
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -53171,13 +53283,10 @@
/obj/item/radio/intercom{
pixel_x = -30
},
+/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/cell/high,
/turf/open/floor/plasteel/white,
/area/science/circuit)
-"eiu" = (
-/obj/structure/table/wood,
-/obj/machinery/chem_dispenser/drinks/beer,
-/turf/open/floor/wood,
-/area/maintenance/bar)
"eyM" = (
/obj/machinery/mineral/ore_redemption{
input_dir = 2;
@@ -53192,12 +53301,6 @@
},
/turf/open/floor/plasteel/floorgrime,
/area/maintenance/disposal/incinerator)
-"eOM" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
"eRz" = (
/obj/structure/lattice,
/obj/structure/grille,
@@ -53219,14 +53322,9 @@
},
/turf/closed/wall/r_wall,
/area/science/mixing)
-"fip" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 5
- },
-/turf/closed/wall,
-/area/maintenance/bar)
"flc" = (
-/obj/machinery/bookbinder,
+/obj/structure/table/reinforced,
+/obj/item/storage/fancy/donut_box,
/turf/open/floor/plasteel/white,
/area/science/circuit)
"fnC" = (
@@ -53246,13 +53344,11 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
-"fFm" = (
-/turf/open/floor/wood{
- icon_state = "wood-broken7"
- },
-/area/maintenance/bar)
"fGf" = (
-/obj/machinery/smartfridge/disks,
+/obj/machinery/smartfridge/disks{
+ pixel_y = 2
+ },
+/obj/structure/table,
/turf/open/floor/plasteel/hydrofloor,
/area/hydroponics)
"fKl" = (
@@ -53260,20 +53356,6 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel,
/area/science/circuit)
-"fOZ" = (
-/obj/machinery/vending/clothing,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"fQl" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/shaker,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"fZE" = (
-/obj/item/restraints/handcuffs/fake,
-/obj/structure/bed/dogbed,
-/turf/open/floor/plating,
-/area/maintenance/bar)
"gbq" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -53349,17 +53431,6 @@
},
/turf/open/floor/plating,
/area/maintenance/port)
-"hiC" = (
-/turf/open/floor/wood{
- icon_state = "wood-broken"
- },
-/area/maintenance/bar)
-"hsg" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/closed/wall,
-/area/maintenance/bar)
"hRa" = (
/obj/structure/table/reinforced,
/obj/machinery/light{
@@ -53368,23 +53439,8 @@
/obj/machinery/cell_charger{
pixel_y = 5
},
-/obj/item/stock_parts/cell/super,
-/obj/item/stock_parts/cell/super,
/turf/open/floor/plasteel/white,
/area/science/circuit)
-"hZp" = (
-/obj/structure/table/wood/poker,
-/obj/effect/spawner/lootdrop/gambling,
-/turf/open/floor/wood{
- icon_state = "wood-broken"
- },
-/area/maintenance/bar)
-"iaK" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/wood{
- icon_state = "wood-broken7"
- },
-/area/maintenance/bar)
"ijc" = (
/obj/structure/table,
/obj/item/stack/sheet/metal/fifty,
@@ -53416,11 +53472,6 @@
/obj/structure/reagent_dispensers/cooking_oil,
/turf/open/floor/plasteel/showroomfloor,
/area/crew_quarters/kitchen)
-"iVZ" = (
-/obj/effect/spawner/lootdrop/minor/kittyears_or_rabbitears,
-/obj/item/assembly/signaler,
-/turf/open/floor/plating,
-/area/maintenance/bar)
"jbf" = (
/obj/structure/cable{
icon_state = "0-2"
@@ -53452,18 +53503,11 @@
/turf/open/floor/plasteel,
/area/quartermaster/office)
"jrE" = (
-/obj/machinery/rnd/production/protolathe/department/science,
/obj/structure/sign/poster/official/random{
pixel_x = 32
},
/turf/open/floor/plasteel/white,
/area/science/circuit)
-"jsx" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 8
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
"jAD" = (
/obj/structure/grille,
/turf/open/floor/plating/airless,
@@ -53543,11 +53587,6 @@
},
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
-"kjd" = (
-/turf/open/floor/wood{
- icon_state = "wood-broken6"
- },
-/area/maintenance/bar)
"knx" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering{
@@ -53574,11 +53613,6 @@
},
/turf/closed/wall/r_wall,
/area/science/mixing)
-"kEK" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/structure/chair/stool/bar,
-/turf/open/floor/wood,
-/area/maintenance/bar)
"kOw" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/white,
@@ -53590,9 +53624,6 @@
},
/turf/open/floor/plasteel/hydrofloor,
/area/hallway/secondary/service)
-"kPI" = (
-/turf/open/floor/wood,
-/area/maintenance/bar)
"kQk" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance{
@@ -53616,20 +53647,12 @@
/obj/structure/sign/nanotrasen,
/turf/closed/wall,
/area/science/circuit)
-"lBy" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/vending/games,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"lEg" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/table/wood,
-/obj/machinery/chem_dispenser/drinks,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"lFY" = (
-/turf/closed/wall,
-/area/maintenance/bar)
+"lCi" = (
+/obj/docking_port/stationary/public_mining_dock{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/construction/mining/aux_base)
"lMg" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -53640,10 +53663,6 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/science/circuit)
-"lSY" = (
-/obj/structure/mineral_door/wood,
-/turf/open/floor/wood,
-/area/maintenance/bar)
"mjr" = (
/obj/machinery/vending/wardrobe/bar_wardrobe,
/turf/open/floor/wood,
@@ -53659,17 +53678,6 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
-"mEa" = (
-/obj/structure/falsewall,
-/turf/open/floor/plating,
-/area/maintenance/bar)
-"mLY" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/jukebox,
-/turf/open/floor/wood{
- icon_state = "wood-broken4"
- },
-/area/maintenance/bar)
"mNi" = (
/obj/machinery/light_switch{
pixel_x = -20
@@ -53682,16 +53690,6 @@
},
/turf/open/floor/plasteel/white,
/area/science/circuit)
-"mVS" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"nnj" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 6
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
"noK" = (
/obj/structure/girder,
/turf/open/floor/plasteel/dark,
@@ -53722,41 +53720,18 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
-"nJJ" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/wood{
- icon_state = "wood-broken"
- },
-/area/maintenance/bar)
"nRG" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
-"nYh" = (
-/obj/structure/table/wood/poker,
-/obj/item/storage/pill_bottle/dice,
-/turf/open/floor/wood,
-/area/maintenance/bar)
"oce" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
/turf/open/floor/plasteel/white,
/area/science/mixing)
-"opk" = (
-/obj/structure/table/wood/poker,
-/obj/effect/spawner/lootdrop/gambling,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"oCW" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/wood,
-/area/maintenance/bar)
"oDF" = (
/obj/machinery/light,
/turf/open/floor/plating,
@@ -53774,12 +53749,6 @@
/obj/machinery/disposal/bin,
/turf/open/floor/plasteel/white,
/area/science/circuit)
-"pcd" = (
-/obj/machinery/door/airlock/wood{
- name = "Maintenance Bar"
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
"pHl" = (
/obj/structure/table,
/obj/item/storage/box/beakers{
@@ -53819,41 +53788,17 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/floorgrime,
/area/science/misc_lab)
-"pVG" = (
-/obj/machinery/computer/cryopod,
-/turf/closed/wall,
-/area/crew_quarters/dorms)
-"pXH" = (
-/obj/structure/chair/stool/bar,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"pYX" = (
-/obj/structure/lattice/catwalk,
-/turf/open/space/basic,
-/area/space/nearstation)
"qeQ" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/open/floor/plasteel,
/area/science/circuit)
-"qpv" = (
-/obj/machinery/light{
- dir = 4
- },
-/obj/machinery/autolathe,
-/turf/open/floor/plasteel/white,
-/area/science/circuit)
"quT" = (
/obj/structure/lattice,
/obj/structure/grille/broken,
/turf/open/space/basic,
/area/space/nearstation)
-"qTS" = (
-/obj/effect/spawner/lootdrop/costume,
-/obj/item/electropack/shockcollar,
-/turf/open/floor/plating,
-/area/maintenance/bar)
"rcD" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -53869,34 +53814,12 @@
/obj/item/reagent_containers/food/drinks/beer,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
-"rpN" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/chair/stool/bar,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"rvm" = (
-/obj/machinery/vending/boozeomat,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"rGn" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/closed/wall,
-/area/maintenance/bar)
"rKP" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
/turf/open/floor/plating,
/area/construction)
-"rLR" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/spray/cleaner,
-/turf/open/floor/wood,
-/area/maintenance/bar)
-"rTJ" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/maintenance/bar)
"saK" = (
/obj/structure/closet/crate,
/obj/item/target/alien,
@@ -53909,17 +53832,6 @@
/obj/item/gun/energy/laser/practice,
/turf/open/floor/plasteel/white,
/area/science/circuit)
-"scN" = (
-/obj/item/clothing/mask/breath/medical,
-/obj/item/tank/internals/anesthetic,
-/turf/open/floor/plating,
-/area/maintenance/bar)
-"sjA" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
"slk" = (
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
@@ -53938,13 +53850,6 @@
/obj/item/shovel/spade,
/turf/open/floor/plasteel/hydrofloor,
/area/hallway/secondary/service)
-"sKA" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
"sLv" = (
/obj/structure/closet,
/obj/effect/spawner/lootdrop/maintenance,
@@ -53987,28 +53892,12 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall,
/area/hallway/secondary/service)
-"tfq" = (
-/obj/machinery/cryopod{
- dir = 4;
- tag = "0"
- },
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
-"tfA" = (
-/obj/structure/reagent_dispensers/keg/aphro/strong,
-/obj/item/reagent_containers/glass/beaker,
-/turf/open/floor/plating,
-/area/maintenance/bar)
"trb" = (
/obj/machinery/light{
dir = 4
},
/turf/open/floor/plasteel,
/area/security/courtroom)
-"tsl" = (
-/obj/machinery/vending/autodrobe,
-/turf/open/floor/wood,
-/area/maintenance/bar)
"tMl" = (
/obj/effect/turf_decal/loading_area,
/turf/open/floor/plasteel/showroomfloor,
@@ -54026,10 +53915,6 @@
},
/turf/closed/wall/r_wall,
/area/maintenance/disposal/incinerator)
-"uao" = (
-/obj/structure/table/wood,
-/turf/open/floor/wood,
-/area/maintenance/bar)
"udp" = (
/obj/item/crowbar/large,
/obj/structure/rack,
@@ -54056,10 +53941,6 @@
},
/turf/open/floor/plasteel/white,
/area/science/circuit)
-"uAx" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/closed/wall,
-/area/maintenance/bar)
"uNu" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -54079,10 +53960,6 @@
},
/turf/closed/wall/r_wall,
/area/maintenance/disposal/incinerator)
-"uVh" = (
-/obj/structure/falsewall,
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
"uVS" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -54106,15 +53983,6 @@
},
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
-"vmI" = (
-/obj/machinery/vending/kink,
-/turf/open/floor/plating,
-/area/maintenance/bar)
-"vsJ" = (
-/obj/structure/table/wood,
-/obj/item/weaponcrafting/receiver,
-/turf/open/floor/wood,
-/area/maintenance/bar)
"vxh" = (
/obj/structure/table,
/obj/effect/spawner/lootdrop/maintenance{
@@ -54129,6 +53997,7 @@
dir = 8;
pixel_x = -24
},
+/obj/item/stock_parts/cell/high,
/turf/open/floor/plasteel/white,
/area/science/circuit)
"vCb" = (
@@ -54139,24 +54008,12 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plasteel/white,
/area/science/circuit)
-"vPe" = (
-/obj/structure/table/wood/poker,
-/obj/item/toy/cards/deck/syndicate,
-/turf/open/floor/wood,
-/area/maintenance/bar)
"vPE" = (
/obj/machinery/light{
dir = 4
},
-/obj/machinery/libraryscanner,
/turf/open/floor/plasteel/white,
/area/science/circuit)
-"wgE" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/wood,
-/area/maintenance/bar)
"wkN" = (
/turf/closed/wall,
/area/science/circuit)
@@ -54186,9 +54043,7 @@
"wvX" = (
/obj/structure/table/reinforced,
/obj/machinery/light,
-/obj/item/stock_parts/cell/super,
-/obj/item/stock_parts/cell/super,
-/obj/item/stack/sheet/metal/fifty,
+/obj/item/stack/sheet/metal/ten,
/turf/open/floor/plasteel/white,
/area/science/circuit)
"wBd" = (
@@ -54234,14 +54089,6 @@
},
/turf/closed/wall/r_wall,
/area/maintenance/disposal/incinerator)
-"xEE" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/table/wood,
-/turf/open/floor/wood,
-/area/maintenance/bar)
"xIa" = (
/obj/structure/table,
/obj/effect/spawner/lootdrop/grille_or_trash,
@@ -54253,9 +54100,6 @@
},
/turf/open/floor/plasteel,
/area/science/circuit)
-"ydY" = (
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
(1,1,1) = {"
aaa
@@ -65405,7 +65249,7 @@ apN
apN
apN
apN
-apN
+lCi
apN
apN
apN
@@ -72918,8 +72762,8 @@ aaa
aaf
aaf
aaf
-gXs
-gXs
+aaa
+aaa
aag
aaa
bVx
@@ -73174,11 +73018,11 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-pYX
-aaa
+bCq
+bCq
+bCq
+bLv
+bCq
aoV
cbj
aoV
@@ -73431,11 +73275,11 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-pYX
-aaa
+bCq
+bJP
+bCq
+bSn
+bCq
bCq
cbj
bLv
@@ -73688,11 +73532,11 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-pYX
-aaa
+bCq
+bPS
+aad
+bPS
+bPS
bCq
cbk
bLv
@@ -73907,7 +73751,7 @@ aLJ
aLE
aOl
aPA
-aQN
+aQW
aQW
aTD
aQW
@@ -73945,11 +73789,11 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-pYX
-aaa
+bLv
+bPR
+bRc
+bSo
+bTs
bCq
bVy
bLv
@@ -74202,11 +74046,11 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-pYX
-aaa
+bCq
+bPS
+bRf
+bSo
+bTu
bCq
bVB
bHE
@@ -74459,11 +74303,11 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
-aaa
-pYX
-aaa
+bLv
+bPT
+bRe
+bSo
+bTt
bCq
bVA
bWw
@@ -74717,10 +74561,10 @@ aaa
aaa
aaa
bCq
+bPV
bCq
bCq
-bCq
-bCq
+bTw
bCq
bVD
bWy
@@ -74976,8 +74820,8 @@ aoV
bCq
bPU
bHE
-bPU
-bPU
+bSp
+bTv
bCq
bVC
bWx
@@ -75231,10 +75075,10 @@ bGi
aoV
aoV
bCq
-bCq
-uVh
+bPW
bCq
bCq
+bTy
bCq
bVF
bWA
@@ -75490,8 +75334,8 @@ aoV
bCq
bHE
bHE
-bHE
-bHE
+bSq
+bTx
bCq
bVE
bWz
@@ -75754,14 +75598,14 @@ bCq
bCq
bCq
bYy
-lFY
-lFY
-rTJ
-lFY
-lFY
-lFY
-lFY
-lFY
+bCq
+bCq
+bLv
+bCq
+bCq
+bCq
+bCq
+bLv
bUs
bLv
aaa
@@ -76011,14 +75855,14 @@ bVG
bHE
bHE
bHE
-pcd
-kjd
-kPI
-kPI
-hiC
-pXH
-pXH
-lFY
+bLv
+aaf
+aoV
+aoV
+aoV
+aoV
+aoV
+bLv
bUs
bLv
aaa
@@ -76264,18 +76108,18 @@ bHE
bHE
bCq
bHE
-lFY
-lFY
-lFY
-lFY
-lFY
-kPI
-fFm
-kPI
-pXH
-vPe
-opk
-lFY
+bLv
+bLv
+bLv
+bLv
+bLv
+aoV
+aoV
+aoV
+aoV
+aoV
+aaf
+bLv
bUs
bLv
aaf
@@ -76521,18 +76365,18 @@ bHE
bHE
cTF
bHE
-lFY
-vmI
-qTS
-fZE
-lFY
-kPI
-kPI
-kPI
-pXH
-nYh
-hZp
-lFY
+bLv
+aoV
+aoV
+aoV
+aoV
+aoV
+aoV
+aoV
+aoV
+aoV
+aoV
+bLv
bUs
bLv
aaa
@@ -76778,18 +76622,18 @@ bHE
bSs
bCq
bHE
-lFY
-tfA
-iVZ
-scN
-lFY
-pXH
-pXH
-fFm
-eOM
-pXH
-pXH
-lFY
+bLv
+aoV
+aoV
+aoV
+bcU
+aaf
+aaH
+cCa
+aoV
+aoV
+aoV
+bLv
bUs
bLv
aaa
@@ -77035,18 +76879,18 @@ bRh
bLu
bCq
bHE
-lFY
-lFY
-mEa
-lFY
-lFY
-uao
-uao
-pXH
-wgE
-kPI
-kPI
-lFY
+bLv
+aaf
+aaf
+aoV
+aoV
+aaH
+bdV
+aaH
+aaf
+aaf
+aaf
+bLv
bUs
bLv
aaf
@@ -77292,19 +77136,19 @@ bCq
bCq
bCq
bHE
-lFY
-fQl
-kPI
-fFm
-eiu
-kPI
+bLv
+aoV
+aoV
+aoV
+aoV
+cjn
bSu
-kEK
-nJJ
-mVS
-mLY
-rGn
-sKA
+aaH
+aoV
+aoV
+aoV
+bLv
+bUs
bLv
aaa
cjJ
@@ -77549,19 +77393,19 @@ bLv
aaa
bLv
bHE
-lFY
-vsJ
-nnj
-oCW
-lEg
-iaK
-xEE
-rpN
-sjA
-oCW
-lBy
-fip
-bUz
+bLv
+aoV
+aoV
+aoV
+aoV
+aoV
+aaH
+aaf
+aoV
+aoV
+aoV
+bLv
+bUs
bLv
aaa
cjJ
@@ -77806,19 +77650,19 @@ bLv
aaf
bLv
bUt
-lFY
-rLR
-jsx
-kjd
-rvm
-kPI
-uao
-pXH
-kPI
-hiC
-fOZ
-hsg
-bUz
+bLv
+aaf
+aaf
+aoV
+aoV
+aoV
+aaH
+aoV
+aoV
+aaf
+aaf
+bLv
+bUs
bLv
aaf
cjJ
@@ -78063,19 +77907,19 @@ bCq
aaa
bLv
bUs
-lFY
-kPI
-fFm
-kPI
-lSY
-kPI
-kPI
-kPI
-kPI
-kPI
-tsl
-hsg
-bUz
+bLv
+aoV
+aoV
+aoV
+aoV
+aoV
+aaf
+aoV
+aoV
+aoV
+aoV
+bCq
+bUs
bCq
aaa
aaf
@@ -78320,19 +78164,19 @@ aaa
aaa
bTB
bUv
-uAx
-uAx
-uAx
-uAx
-uAx
-uAx
-uAx
-uAx
-uAx
-uAx
-uAx
+bES
+bES
+bES
+bES
+bGp
+bGp
+bGp
+bGp
+bES
+bES
+bES
car
-bUz
+bUs
bCq
bCq
bCq
@@ -84179,8 +84023,8 @@ arf
arf
arf
arf
-aoa
-arf
+anF
+ahn
aJn
aJn
aJq
@@ -84433,11 +84277,11 @@ arf
aqa
atf
arf
-tfq
-tfq
-tfq
-tfq
+aqa
+atf
arf
+anF
+ahn
aaa
aJn
aJq
@@ -84689,12 +84533,12 @@ ath
arf
apY
ath
-pVG
-ydY
-ath
-ydY
-ydY
arf
+apY
+ate
+arf
+anF
+ahn
aaa
aJn
aLY
@@ -84949,9 +84793,9 @@ ath
arf
aCd
ath
-aCd
-aCd
arf
+anF
+ahn
aJw
aJw
aMh
@@ -85207,8 +85051,8 @@ arf
asd
aDK
arf
-arf
-arf
+aoa
+ahn
aJv
aKG
aMg
@@ -104015,16 +103859,16 @@ bMB
bNA
cOe
bSl
-bRb
+bUq
flc
vPE
-bUq
+bXs
bVt
dfh
jSO
jgm
oUh
-qpv
+vPE
jrE
saK
bSl
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index f3a515abe9..4d8cd88eb8 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -897,7 +897,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/airlock/engineering{
name = "Auxiliary Construction Storage";
- req_access_txt = "10;32;47;48"
+ req_one_access_txt = "10;32;47;48"
},
/obj/effect/turf_decal/stripes/line{
dir = 2
@@ -9053,11 +9053,9 @@
/turf/open/floor/plasteel/redblue,
/area/maintenance/port/fore)
"ayW" = (
-/obj/machinery/vending/autodrobe{
- req_access_txt = "0"
- },
/obj/machinery/light/small,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/vending/autodrobe/all_access,
/turf/open/floor/plasteel/redblue/redside{
dir = 8
},
@@ -19222,9 +19220,6 @@
/turf/open/floor/plasteel/neutral,
/area/quartermaster/qm)
"aUs" = (
-/obj/machinery/computer/security/mining{
- dir = 8
- },
/obj/machinery/status_display{
pixel_x = 32
},
@@ -19233,6 +19228,9 @@
dir = 8;
name = "cargo camera"
},
+/obj/machinery/computer/security/qm{
+ dir = 8
+ },
/turf/open/floor/plasteel/brown{
dir = 4
},
@@ -27903,13 +27901,16 @@
pixel_x = 26;
pixel_y = 8
},
-/obj/machinery/plantgenes,
+/obj/machinery/plantgenes{
+ pixel_y = 6
+ },
/obj/machinery/camera{
c_tag = "Hydroponics";
dir = 8;
name = "service camera"
},
/obj/effect/turf_decal/delivery,
+/obj/structure/table,
/turf/open/floor/plasteel,
/area/hydroponics)
"bnn" = (
@@ -28550,7 +28551,10 @@
/turf/open/floor/plasteel,
/area/hydroponics)
"boC" = (
-/obj/machinery/smartfridge/disks,
+/obj/machinery/smartfridge/disks{
+ pixel_y = 2
+ },
+/obj/structure/table,
/turf/open/floor/plasteel,
/area/hydroponics)
"boD" = (
@@ -28842,14 +28846,11 @@
},
/area/security/execution/transfer)
"bpg" = (
-/obj/machinery/computer/security{
- name = "Labor Camp Monitoring";
- network = list("labor")
- },
/obj/item/radio/intercom{
name = "Station Intercom";
pixel_y = 26
},
+/obj/machinery/computer/security/labor,
/turf/open/floor/plasteel/red,
/area/security/execution/transfer)
"bph" = (
@@ -30117,12 +30118,12 @@
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/heads/hos)
"brC" = (
-/obj/machinery/computer/security{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
+/obj/machinery/computer/security/hos{
+ dir = 1
+ },
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/heads/hos)
"brD" = (
@@ -32400,7 +32401,7 @@
/obj/machinery/camera/motion{
c_tag = "AI Chamber - Fore";
name = "motion-sensitive ai camera";
- network = list("ai")
+ network = list("aichamber")
},
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/dark,
@@ -32854,7 +32855,8 @@
"bxe" = (
/obj/machinery/camera/motion{
c_tag = "Vault";
- dir = 4
+ dir = 4;
+ network = list("vault")
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -40848,7 +40850,7 @@
c_tag = "Telecomms - Monitoring";
dir = 2;
name = "telecomms camera";
- network = list("ss13","tcomm")
+ network = list("ss13","tcomms")
},
/turf/open/floor/plasteel/grimy,
/area/tcommsat/computer)
@@ -41332,7 +41334,7 @@
c_tag = "AI Chamber - Aft";
dir = 1;
name = "motion-sensitive ai camera";
- network = list("ai")
+ network = list("aichamber")
},
/turf/open/floor/plasteel/vault,
/area/ai_monitored/turret_protected/ai)
@@ -45721,12 +45723,8 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the AI's satellite.";
- dir = 4;
- name = "Research Monitor";
- network = list("minisat");
- pixel_y = 2
+/obj/machinery/computer/security/telescreen/minisat{
+ dir = 4
},
/turf/open/floor/plasteel/vault{
dir = 8
@@ -45767,12 +45765,8 @@
/obj/machinery/light{
dir = 8
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the Engine.";
+/obj/machinery/computer/security/telescreen/ce{
dir = 4;
- layer = 4;
- name = "Engine Monitor";
- network = list("engine");
pixel_x = -30
},
/mob/living/simple_animal/parrot/Poly,
@@ -49046,6 +49040,10 @@
/obj/item/stack/packageWrap,
/obj/item/hand_labeler,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/computer/security/telescreen/vault{
+ dir = 8;
+ pixel_x = 26
+ },
/turf/open/floor/wood,
/area/crew_quarters/heads/hop)
"ccD" = (
@@ -49056,7 +49054,7 @@
c_tag = "Telecomms - Chamber Port";
dir = 4;
name = "telecomms camera";
- network = list("ss13","tcomm")
+ network = list("ss13","tcomms")
},
/turf/open/floor/plasteel/vault/telecomms{
dir = 8
@@ -49500,7 +49498,7 @@
/obj/machinery/camera/motion{
c_tag = "AI - Upload";
name = "motion-sensitive ai camera";
- network = list("minisat")
+ network = list("aiupload")
},
/turf/open/floor/plasteel/vault,
/area/ai_monitored/turret_protected/ai_upload)
@@ -50943,7 +50941,7 @@
c_tag = "Telecomms - Chamber Starboard";
dir = 8;
name = "telecomms camera";
- network = list("ss13","tcomm")
+ network = list("ss13","tcomms")
},
/turf/open/floor/plasteel/vault/telecomms{
dir = 8
@@ -52599,7 +52597,7 @@
/obj/machinery/camera/motion{
c_tag = "Bridge - Captain's Emergency Escape";
dir = 4;
- name = "command camera"
+ name = "motion-sensitive command camera"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -54725,7 +54723,7 @@
c_tag = "Telecomms - Cooling Room";
dir = 8;
name = "telecomms camera";
- network = list("ss13","tcomm")
+ network = list("ss13","tcomms")
},
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
@@ -63602,9 +63600,7 @@
},
/area/crew_quarters/locker)
"cGO" = (
-/obj/machinery/vending/autodrobe{
- req_access_txt = "0"
- },
+/obj/machinery/vending/autodrobe/all_access,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -67894,6 +67890,7 @@
},
/obj/machinery/camera{
c_tag = "Medbay - Storage";
+ network = list("ss13","medbay");
dir = 4;
name = "medbay camera"
},
@@ -71812,6 +71809,7 @@
/obj/machinery/light,
/obj/machinery/camera{
c_tag = "Medbay - Waiting Room";
+ network = list("ss13","medbay");
dir = 1;
name = "medbay camera"
},
@@ -71951,6 +71949,7 @@
"cYc" = (
/obj/machinery/camera{
c_tag = "Medbay - Break Room";
+ network = list("ss13","medbay");
dir = 2;
name = "medbay camera"
},
@@ -72628,6 +72627,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/camera{
c_tag = "Medbay - Fore Port";
+ network = list("ss13","medbay");
dir = 8;
name = "medbay camera"
},
@@ -72709,6 +72709,7 @@
/obj/item/stack/medical/ointment,
/obj/machinery/camera{
c_tag = "Medbay - Sleepers";
+ network = list("ss13","medbay");
dir = 2;
name = "medbay camera"
},
@@ -75477,9 +75478,9 @@
},
/obj/machinery/camera{
c_tag = "Medbay - Chemistry";
+ network = list("ss13","medbay");
dir = 8;
- name = "medbay camera";
- network = list("ss13","medbay")
+ name = "medbay camera"
},
/turf/open/floor/plasteel/whiteyellow/corner,
/area/medical/chemistry)
@@ -76308,6 +76309,7 @@
},
/obj/machinery/camera{
c_tag = "Medbay - Center";
+ network = list("ss13","medbay");
dir = 2;
name = "medbay camera"
},
@@ -77164,19 +77166,17 @@
/area/science/research/abandoned)
"djp" = (
/obj/structure/table/reinforced,
-/obj/item/stack/sheet/glass/fifty,
+/obj/machinery/cell_charger,
/turf/open/floor/plasteel/white/side,
/area/science/circuit)
"djq" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/rnd/production/protolathe/department/science,
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plasteel/white/side,
/area/science/circuit)
"djr" = (
-/obj/machinery/autolathe,
/turf/open/floor/plasteel/white/side,
/area/science/circuit)
"djs" = (
@@ -77700,6 +77700,7 @@
/obj/machinery/light,
/obj/machinery/camera{
c_tag = "Medbay - Port";
+ network = list("ss13","medbay");
dir = 1;
name = "medbay camera"
},
@@ -77798,6 +77799,7 @@
/obj/machinery/light,
/obj/machinery/camera{
c_tag = "Medbay - Starboard";
+ network = list("ss13","medbay");
dir = 1;
name = "medbay camera"
},
@@ -78542,12 +78544,11 @@
/area/crew_quarters/abandoned_gambling_den)
"dmr" = (
/obj/structure/table/reinforced,
-/obj/item/stack/sheet/metal/fifty,
-/obj/item/stock_parts/cell/super,
-/obj/item/stock_parts/cell/super,
/obj/structure/sign/departments/science{
pixel_x = -32
},
+/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/cell/high,
/turf/open/floor/plasteel/white/side{
dir = 4
},
@@ -79282,7 +79283,8 @@
pixel_x = -26
},
/obj/effect/decal/cleanable/dirt,
-/obj/item/stack/sheet/metal/fifty,
+/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/cell/high,
/turf/open/floor/plasteel/white/side{
dir = 4
},
@@ -80849,8 +80851,6 @@
pixel_y = -32
},
/obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/super,
-/obj/item/stock_parts/cell/super,
/turf/open/floor/plasteel/white/side{
dir = 1
},
@@ -80884,16 +80884,16 @@
},
/area/science/circuit)
"drD" = (
-/obj/machinery/vending/assist,
/turf/open/floor/plasteel/white/side{
dir = 1
},
/area/science/circuit)
"drE" = (
-/obj/machinery/bookbinder,
/obj/structure/sign/poster/official/build{
pixel_y = -32
},
+/obj/structure/table/reinforced,
+/obj/item/storage/fancy/donut_box,
/turf/open/floor/plasteel/white/side{
dir = 1
},
@@ -80902,11 +80902,11 @@
/obj/machinery/light_switch{
pixel_x = 36
},
-/obj/machinery/libraryscanner,
/obj/machinery/firealarm{
dir = 4;
pixel_x = 24
},
+/obj/machinery/vending/assist,
/turf/open/floor/plasteel/white/corner{
dir = 1
},
@@ -81250,6 +81250,7 @@
},
/obj/machinery/camera{
c_tag = "Medbay - Cloning Lab";
+ network = list("ss13","medbay");
dir = 1;
name = "medbay camera"
},
@@ -81309,6 +81310,7 @@
/obj/item/clothing/neck/stethoscope,
/obj/machinery/camera{
c_tag = "Medbay - Cryogenics";
+ network = list("ss13","medbay");
dir = 1;
name = "medbay camera"
},
@@ -81775,6 +81777,7 @@
/obj/machinery/iv_drip,
/obj/machinery/camera{
c_tag = "Medbay - Recovery Room";
+ network = list("ss13","medbay");
dir = 8;
name = "medbay camera"
},
@@ -83171,6 +83174,7 @@
},
/obj/machinery/camera{
c_tag = "Medbay - Genetics Lab";
+ network = list("ss13","medbay");
dir = 4;
name = "medbay camera"
},
@@ -83802,6 +83806,7 @@
/obj/item/storage/box/disks,
/obj/machinery/camera{
c_tag = "Medbay - Genetics Desk";
+ network = list("ss13","medbay");
dir = 4;
name = "medbay camera"
},
@@ -84109,6 +84114,7 @@
},
/obj/machinery/camera{
c_tag = "Medbay - Surgery";
+ network = list("ss13","medbay");
dir = 1;
name = "medbay camera"
},
@@ -84703,6 +84709,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/camera{
c_tag = "Medbay - Aft Port";
+ network = list("ss13","medbay");
dir = 8;
name = "medbay camera"
},
@@ -84761,6 +84768,7 @@
},
/obj/machinery/camera{
c_tag = "Medbay - Chief Medical Officer's Office";
+ network = list("ss13","medbay");
dir = 8;
name = "medbay camera"
},
@@ -85669,14 +85677,12 @@
/turf/open/floor/wood,
/area/crew_quarters/abandoned_gambling_den)
"dBR" = (
-/obj/machinery/vending/boozeomat{
- req_access_txt = "0"
- },
/obj/machinery/light/small,
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/poster/contraband/random{
pixel_y = -32
},
+/obj/machinery/vending/boozeomat/all_access,
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
"dBS" = (
@@ -85983,8 +85989,9 @@
/obj/structure/table/glass,
/obj/item/clipboard,
/obj/item/toy/figure/cmo,
-/obj/machinery/status_display{
- pixel_x = -32
+/obj/machinery/computer/security/telescreen/cmo{
+ dir = 4;
+ pixel_x = -30
},
/turf/open/floor/plasteel/neutral/side{
dir = 4
@@ -86031,6 +86038,7 @@
},
/obj/machinery/camera{
c_tag = "Medbay - Aft Starboard";
+ network = list("ss13","medbay");
dir = 4;
name = "medbay camera"
},
@@ -88056,16 +88064,12 @@
/area/science/test_area)
"dGY" = (
/obj/structure/table/reinforced,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the testing site.";
- dir = 4;
- layer = 4;
- name = "Testing Site Telescreen";
- network = list("toxins")
- },
/obj/effect/turf_decal/stripes/line{
dir = 8
},
+/obj/machinery/computer/security/telescreen/toxins{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/science/mixing)
"dGZ" = (
@@ -89064,6 +89068,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera{
c_tag = "Medbay - Morgue";
+ network = list("ss13","medbay");
dir = 1;
name = "medbay camera"
},
@@ -89175,6 +89180,7 @@
},
/obj/machinery/camera{
c_tag = "Medbay - Chief Medical Officer's Quarters";
+ network = list("ss13","medbay");
dir = 1;
name = "medbay camera"
},
@@ -90372,17 +90378,8 @@
/obj/item/target,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/camera{
- active_power_usage = 0;
- c_tag = "Bomb Test Site";
- desc = "A specially-reinforced camera with a long lasting battery, used to monitor the bomb testing site.";
- dir = 4;
- invuln = 1;
- light = null;
- name = "hardened testing camera";
- network = list("toxins");
- start_active = 1;
- use_power = 0
+/obj/machinery/camera/preset/toxins{
+ dir = 4
},
/turf/open/floor/plating/airless,
/area/science/test_area)
@@ -92475,6 +92472,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/camera{
c_tag = "Virology - Containment Lock";
+ network = list("ss13","medbay");
dir = 8;
name = "virology camera"
},
@@ -92987,6 +92985,7 @@
},
/obj/machinery/camera{
c_tag = "Virology - Break Room";
+ network = list("ss13","medbay");
dir = 8;
name = "virology camera"
},
@@ -94693,6 +94692,7 @@
},
/obj/machinery/camera{
c_tag = "Virology - Lab";
+ network = list("ss13","medbay");
name = "virology camera"
},
/obj/effect/turf_decal/bot,
@@ -94712,6 +94712,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/camera{
c_tag = "Virology - Hallway";
+ network = list("ss13","medbay");
dir = 8;
name = "virology camera"
},
@@ -96415,6 +96416,7 @@
},
/obj/machinery/camera{
c_tag = "Virology - Cells";
+ network = list("ss13","medbay");
dir = 8;
name = "virology camera"
},
@@ -99717,7 +99719,7 @@
"gUH" = (
/obj/machinery/light,
/obj/structure/table/reinforced,
-/obj/machinery/computer/libraryconsole/bookmanagement,
+/obj/item/stack/sheet/metal/ten,
/turf/open/floor/plasteel/white/side{
dir = 1
},
@@ -100149,6 +100151,12 @@
/obj/effect/mapping_helpers/airlock/locked,
/turf/open/floor/engine,
/area/science/mixing)
+"oMw" = (
+/obj/docking_port/stationary/public_mining_dock{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/construction/mining/aux_base)
"oNd" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1
@@ -143475,7 +143483,7 @@ aeF
aeF
aeF
aeF
-aeF
+oMw
aeF
aeF
aeF
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 477e06d124..746c46536c 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -903,7 +903,6 @@
dir = 8;
pixel_x = 24
},
-/obj/machinery/cryopod,
/turf/open/floor/plasteel/floorgrime,
/area/security/prison)
"acy" = (
@@ -1911,7 +1910,7 @@
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/hos)
"aev" = (
-/obj/machinery/computer/security,
+/obj/machinery/computer/security/hos,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/hos)
"aew" = (
@@ -3556,13 +3555,6 @@
/obj/structure/disposalpipe/trunk{
dir = 4
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching certain areas.";
- dir = 1;
- name = "Head of Security's Monitor";
- network = list("prison","minisat","tcomm");
- pixel_y = -30
- },
/turf/open/floor/plasteel/vault,
/area/crew_quarters/heads/hos)
"ahK" = (
@@ -3641,6 +3633,25 @@
icon_state = "platingdmg1"
},
/area/maintenance/fore)
+"ahU" = (
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/structure/table,
+/obj/item/stock_parts/manipulator,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/open/floor/plating,
+/area/maintenance/fore)
+"ahV" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = -24
+ },
+/turf/open/floor/plasteel/neutral/corner{
+ dir = 1
+ },
+/area/crew_quarters/fitness/recreation)
"ahW" = (
/obj/structure/window/reinforced{
dir = 1
@@ -4057,6 +4068,22 @@
},
/turf/open/floor/plating,
/area/maintenance/fore)
+"aiP" = (
+/obj/structure/table,
+/obj/item/folder,
+/turf/open/floor/plating,
+/area/maintenance/fore)
+"aiQ" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/structure/extinguisher_cabinet{
+ pixel_x = -27
+ },
+/turf/open/floor/plasteel/neutral/corner{
+ dir = 1
+ },
+/area/crew_quarters/fitness/recreation)
"aiR" = (
/obj/structure/table,
/obj/item/clothing/under/sl_suit{
@@ -4460,9 +4487,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/turf/open/floor/plasteel/neutral/corner{
- dir = 8
- },
+/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"ajS" = (
/obj/structure/table,
@@ -5107,6 +5132,10 @@
},
/turf/open/floor/plating,
/area/maintenance/fore)
+"alf" = (
+/obj/structure/closet/firecloset,
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/fitness/recreation)
"alg" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -5810,6 +5839,10 @@
},
/turf/open/floor/plating,
/area/maintenance/fore)
+"amv" = (
+/obj/structure/closet/emcloset,
+/turf/open/floor/plasteel/vault,
+/area/crew_quarters/fitness/recreation)
"amw" = (
/obj/structure/window/reinforced,
/obj/machinery/door/window/eastright{
@@ -6003,8 +6036,7 @@
/obj/machinery/door/window/westleft{
base_state = "right";
dir = 2;
- icon_state = "right";
- name = "windoor"
+ icon_state = "right"
},
/obj/item/book/manual/wiki/engineering_hacking,
/obj/item/tape/random,
@@ -7757,7 +7789,9 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"aqR" = (
-/obj/machinery/vending/kink,
+/obj/structure/chair{
+ dir = 8
+ },
/turf/open/floor/plating{
icon_state = "panelscorched"
},
@@ -7810,10 +7844,7 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"aqY" = (
-/obj/machinery/computer/security{
- name = "Labor Camp Monitoring";
- network = list("labor")
- },
+/obj/machinery/computer/security/labor,
/turf/open/floor/plasteel/dark,
/area/security/brig)
"aqZ" = (
@@ -8736,12 +8767,8 @@
/area/security/main)
"asN" = (
/obj/structure/chair,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching proceedings in the interrogation room.";
+/obj/machinery/computer/security/telescreen/interrogation{
dir = 1;
- layer = 4;
- name = "interrogation monitor";
- network = list("interrogation");
pixel_y = -30
},
/turf/open/floor/plasteel/grimy,
@@ -9825,6 +9852,10 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
+/obj/machinery/computer/security/telescreen/interrogation{
+ dir = 8;
+ pixel_x = 30
+ },
/turf/open/floor/plasteel/red/side{
dir = 5
},
@@ -10491,7 +10522,7 @@
/area/security/brig)
"awz" = (
/obj/machinery/camera{
- c_tag = "Interrogation";
+ c_tag = "Interrogation room";
dir = 8;
network = list("interrogation")
},
@@ -13073,6 +13104,7 @@
"aCg" = (
/obj/machinery/camera/motion{
c_tag = "Vault";
+ network = list("vault");
dir = 1
},
/obj/machinery/light,
@@ -14169,8 +14201,7 @@
/area/quartermaster/warehouse)
"aEv" = (
/obj/machinery/computer/security/mining{
- dir = 4;
- network = list("mine","auxbase")
+ dir = 4
},
/turf/open/floor/plasteel,
/area/quartermaster/miningoffice)
@@ -17444,7 +17475,7 @@
/obj/structure/table,
/obj/machinery/camera/motion{
c_tag = "AI Upload Chamber - Fore";
- network = list("ss13","rd","aiupload")
+ network = list("aiupload")
},
/obj/item/twohanded/required/kirbyplants/photosynthetic{
pixel_y = 10
@@ -19600,13 +19631,12 @@
/turf/closed/wall,
/area/quartermaster/qm)
"aQq" = (
-/obj/machinery/computer/security/mining{
- dir = 4;
- network = list("mine","auxbase")
- },
/obj/machinery/light_switch{
pixel_x = -23
},
+/obj/machinery/computer/cargo{
+ dir = 4
+ },
/turf/open/floor/plasteel/brown{
dir = 8
},
@@ -19705,7 +19735,7 @@
/obj/machinery/camera/motion{
c_tag = "AI Upload Chamber - Port";
dir = 1;
- network = list("ss13","rd","aiupload")
+ network = list("aiupload")
},
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai_upload)
@@ -19728,7 +19758,7 @@
/obj/machinery/camera/motion{
c_tag = "AI Upload Chamber - Starboard";
dir = 1;
- network = list("ss13","rd","aiupload")
+ network = list("aiupload")
},
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai_upload)
@@ -20164,7 +20194,9 @@
/obj/machinery/light{
dir = 8
},
-/obj/machinery/computer/camera_advanced/base_construction,
+/obj/machinery/computer/camera_advanced/base_construction{
+ dir = 4
+ },
/turf/open/floor/plasteel/yellow/side{
dir = 9
},
@@ -20224,7 +20256,7 @@
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aRK" = (
-/obj/machinery/computer/cargo{
+/obj/machinery/computer/security/qm{
dir = 4
},
/turf/open/floor/plasteel/brown{
@@ -20667,7 +20699,9 @@
/turf/open/floor/plating,
/area/hallway/secondary/entry)
"aSJ" = (
-/obj/machinery/computer/shuttle/mining,
+/obj/machinery/computer/shuttle/mining{
+ dir = 4
+ },
/turf/open/floor/plasteel/yellow/side{
dir = 10
},
@@ -21557,16 +21591,9 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching areas on the MiniSat.";
- dir = 8;
- name = "MiniSat Monitor";
- network = list("minisat","tcomm");
- pixel_x = 29
- },
/obj/machinery/camera/motion{
c_tag = "AI Upload Foyer";
- network = list("ss13","rd","aiupload")
+ network = list("aiupload")
},
/obj/machinery/airalarm{
pixel_y = 26
@@ -21721,7 +21748,7 @@
/turf/open/floor/plasteel/vault,
/area/crew_quarters/locker)
"aUR" = (
-/obj/machinery/vending/kink,
+/obj/structure/closet/wardrobe/green,
/turf/open/floor/plasteel/vault,
/area/crew_quarters/locker)
"aUS" = (
@@ -21889,7 +21916,7 @@
/obj/machinery/camera{
c_tag = "AI Chamber - Fore";
dir = 2;
- network = list("rd")
+ network = list("aicore")
},
/obj/structure/showcase/cyborg/old{
dir = 2;
@@ -22137,8 +22164,7 @@
pixel_x = 27
},
/obj/machinery/computer/security/mining{
- dir = 8;
- network = list("mine","auxbase")
+ dir = 8
},
/turf/open/floor/plasteel/red/side{
dir = 4
@@ -23373,7 +23399,7 @@
/obj/machinery/camera{
c_tag = "AI Chamber - Port";
dir = 4;
- network = list("rd")
+ network = list("aicore")
},
/obj/structure/showcase/cyborg/old{
dir = 4;
@@ -24085,7 +24111,7 @@
/obj/machinery/camera{
c_tag = "AI Chamber - Core";
dir = 2;
- network = list("rd")
+ network = list("aicore")
},
/turf/open/floor/plasteel/vault{
dir = 10
@@ -24989,10 +25015,8 @@
pixel_y = 10
},
/obj/item/radio/off,
-/obj/machinery/computer/security/telescreen{
+/obj/machinery/computer/security/telescreen/minisat{
dir = 4;
- name = "MiniSat Monitor";
- network = list("minisat","tcomm");
pixel_x = -29
},
/turf/open/floor/plasteel/red/side{
@@ -25050,7 +25074,7 @@
/obj/machinery/camera{
c_tag = "AI Chamber - Starboard";
dir = 8;
- network = list("rd")
+ network = list("aicore")
},
/obj/structure/showcase/cyborg/old{
dir = 8;
@@ -25527,7 +25551,7 @@
},
/area/security/checkpoint/engineering)
"bcO" = (
-/obj/machinery/vending/kink,
+/obj/structure/easel,
/turf/open/floor/plating{
icon_state = "platingdmg3"
},
@@ -26146,10 +26170,8 @@
/obj/structure/rack,
/obj/item/storage/secure/briefcase,
/obj/item/clothing/mask/cigarette/cigar,
-/obj/machinery/computer/security/telescreen{
+/obj/machinery/computer/security/telescreen/ce{
dir = 1;
- name = "MiniSat Monitor";
- network = list("minisat","tcomm");
pixel_y = -30
},
/turf/open/floor/plasteel/vault{
@@ -28071,7 +28093,7 @@
/obj/machinery/camera{
c_tag = "AI Chamber - Aft";
dir = 1;
- network = list("rd")
+ network = list("aicore")
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/turf/open/floor/plasteel/dark,
@@ -29986,15 +30008,12 @@
},
/obj/item/storage/secure/briefcase,
/obj/structure/table/wood,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching Prison Wing holding areas.";
- name = "Prison Monitor";
- network = list("prison");
- pixel_y = 30
- },
/obj/item/folder/blue,
/obj/item/storage/secure/briefcase,
/obj/item/assembly/flash/handheld,
+/obj/machinery/computer/security/telescreen/vault{
+ pixel_y = 30
+ },
/turf/open/floor/wood,
/area/crew_quarters/heads/hop)
"bmq" = (
@@ -32163,10 +32182,8 @@
/obj/structure/rack,
/obj/item/aicard,
/obj/item/radio/off,
-/obj/machinery/computer/security/telescreen{
+/obj/machinery/computer/security/telescreen/minisat{
dir = 1;
- name = "MiniSat Monitor";
- network = list("minisat","tcomm");
pixel_y = -29
},
/turf/open/floor/plasteel/darkblue/side{
@@ -32961,10 +32978,8 @@
/obj/machinery/porta_turret/ai{
dir = 2
},
-/obj/machinery/computer/security/telescreen{
+/obj/machinery/computer/security/telescreen/minisat{
dir = 8;
- name = "MiniSat Monitor";
- network = list("minisat","tcomm");
pixel_x = 28
},
/turf/open/floor/plasteel/vault{
@@ -32986,10 +33001,8 @@
},
/obj/machinery/light,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/obj/machinery/computer/security/telescreen{
+/obj/machinery/computer/security/telescreen/minisat{
dir = 1;
- name = "MiniSat Monitor";
- network = list("minisat","tcomm");
pixel_y = -29
},
/turf/open/floor/plasteel/dark,
@@ -33751,10 +33764,8 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/item/pen,
-/obj/machinery/computer/security/telescreen{
+/obj/machinery/computer/security/telescreen/minisat{
dir = 1;
- name = "MiniSat Monitor";
- network = list("minisat","tcomm");
pixel_y = -28
},
/turf/open/floor/plasteel/darkblue/corner,
@@ -35468,7 +35479,7 @@
/obj/machinery/computer/security/telescreen{
dir = 8;
name = "Telecomms Camera Monitor";
- network = list("tcomm");
+ network = list("tcomms");
pixel_x = 26
},
/obj/machinery/computer/telecomms/monitor{
@@ -36764,10 +36775,8 @@
/area/crew_quarters/heads/captain/private)
"bAe" = (
/obj/machinery/light,
-/obj/machinery/computer/security/telescreen{
+/obj/machinery/computer/security/telescreen/minisat{
dir = 1;
- name = "MiniSat Monitor";
- network = list("minisat","tcomm");
pixel_y = -29
},
/obj/structure/bed/dogbed/renault,
@@ -38475,7 +38484,7 @@
/obj/machinery/camera{
c_tag = "Telecomms - Server Room - Fore-Port";
dir = 2;
- network = list("ss13","tcomm")
+ network = list("ss13","tcomms")
},
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/tcommsat/server)
@@ -38506,7 +38515,7 @@
/obj/machinery/camera{
c_tag = "Telecomms - Server Room - Fore-Starboard";
dir = 2;
- network = list("ss13","tcomm")
+ network = list("ss13","tcomms")
},
/turf/open/floor/circuit/green/telecomms/mainframe,
/area/tcommsat/server)
@@ -40825,7 +40834,7 @@
/obj/machinery/camera{
c_tag = "Telecomms - Control Room";
dir = 1;
- network = list("ss13","tcomm")
+ network = list("ss13","tcomms")
},
/obj/structure/table/wood,
/obj/item/pen,
@@ -41685,9 +41694,7 @@
/turf/open/floor/plating,
/area/maintenance/port)
"bLe" = (
-/obj/machinery/vending/autodrobe{
- req_access_txt = "0"
- },
+/obj/machinery/vending/autodrobe/all_access,
/turf/open/floor/plating,
/area/maintenance/port)
"bLf" = (
@@ -42242,7 +42249,7 @@
/obj/machinery/camera{
c_tag = "Telecomms - Server Room - Aft-Port";
dir = 4;
- network = list("ss13","tcomm")
+ network = list("ss13","tcomms")
},
/turf/open/floor/plasteel/dark/telecomms/mainframe,
/area/tcommsat/server)
@@ -42280,7 +42287,7 @@
/obj/machinery/camera{
c_tag = "Telecomms - Server Room - Aft-Starboard";
dir = 8;
- network = list("ss13","tcomm")
+ network = list("ss13","tcomms")
},
/obj/structure/cable/yellow{
icon_state = "0-8"
@@ -43086,7 +43093,7 @@
/obj/machinery/camera{
c_tag = "Telecomms - Server Room - Aft";
dir = 1;
- network = list("ss13","tcomm")
+ network = list("ss13","tcomms")
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/ntnet_relay,
@@ -46230,12 +46237,11 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"bUT" = (
-/obj/structure/rack,
-/obj/item/weldingtool,
-/obj/item/screwdriver{
- pixel_y = 16
+/obj/structure/table,
+/obj/item/reagent_containers/food/condiment/enzyme{
+ layer = 5
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/item/reagent_containers/food/condiment/flour,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"bUU" = (
@@ -46249,20 +46255,16 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"bUW" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
+/obj/structure/table,
+/obj/machinery/microwave{
+ pixel_x = -3;
+ pixel_y = 6
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
"bUX" = (
-/obj/structure/rack,
-/obj/item/stack/cable_coil{
- pixel_x = -1;
- pixel_y = -3
- },
-/obj/item/stack/cable_coil,
-/obj/item/wirecutters,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/closet/crate/bin,
+/obj/item/kitchen/knife,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"bUY" = (
@@ -46719,26 +46721,13 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"bVW" = (
+/obj/structure/table,
+/obj/item/kitchen/rollingpin,
+/obj/item/reagent_containers/glass/beaker,
/turf/open/floor/plating{
icon_state = "platingdmg1"
},
/area/maintenance/port/aft)
-"bVX" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
-"bVZ" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
-"bWa" = (
-/obj/effect/landmark/blobstart,
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
"bWb" = (
/obj/structure/cable/yellow{
icon_state = "1-4"
@@ -47473,12 +47462,11 @@
},
/area/maintenance/port/aft)
"bXA" = (
-/obj/structure/table,
-/obj/item/flashlight/lamp,
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
-"bXB" = (
-/obj/structure/chair/stool,
+/obj/structure/sink{
+ dir = 8;
+ pixel_x = -12;
+ pixel_y = 2
+ },
/turf/open/floor/plating,
/area/maintenance/port/aft)
"bXC" = (
@@ -47917,25 +47905,11 @@
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
-"bYG" = (
-/obj/structure/table,
-/obj/item/folder/white{
- pixel_x = 4;
- pixel_y = -3
- },
-/obj/item/folder/white{
- pixel_x = 4;
- pixel_y = -3
- },
-/obj/item/pen,
-/obj/structure/extinguisher_cabinet{
- pixel_y = -30
- },
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
"bYH" = (
-/obj/structure/light_construct,
+/obj/structure/rack,
+/obj/item/stack/rods{
+ amount = 4
+ },
/turf/open/floor/plating{
icon_state = "panelscorched"
},
@@ -49840,7 +49814,10 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/machinery/smartfridge/disks,
+/obj/machinery/smartfridge/disks{
+ pixel_y = 2
+ },
+/obj/structure/table,
/turf/open/floor/plasteel,
/area/hydroponics)
"ccA" = (
@@ -50095,8 +50072,6 @@
/turf/open/space,
/area/solar/port/aft)
"cdb" = (
-/obj/structure/girder,
-/obj/structure/grille,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
@@ -50124,6 +50099,8 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
+/obj/structure/girder,
+/obj/structure/grille,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"cde" = (
@@ -50664,8 +50641,6 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"ceo" = (
-/obj/structure/girder,
-/obj/structure/grille,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
@@ -50702,19 +50677,6 @@
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating,
/area/maintenance/port/aft)
-"ces" = (
-/obj/structure/table,
-/obj/item/folder/white{
- pixel_x = 4;
- pixel_y = -3
- },
-/obj/item/folder/white{
- pixel_x = 4;
- pixel_y = -3
- },
-/obj/item/pen,
-/turf/open/floor/plating,
-/area/maintenance/port/aft)
"ceu" = (
/obj/structure/grille,
/turf/open/floor/plating,
@@ -53017,7 +52979,7 @@
/turf/open/floor/plating/airless,
/area/engine/atmos)
"cjp" = (
-/obj/machinery/vending/boozeomat,
+/obj/machinery/vending/boozeomat/all_access,
/turf/open/floor/wood,
/area/maintenance/port/aft)
"cjq" = (
@@ -57864,13 +57826,8 @@
/turf/open/floor/plating,
/area/crew_quarters/heads/hor)
"csZ" = (
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the RD's goons from the safety of his office.";
- name = "Research Monitor";
- network = list("rd");
- pixel_y = 2
- },
/obj/structure/table/reinforced,
+/obj/machinery/computer/security/telescreen/rd,
/turf/open/floor/plasteel/cafeteria{
dir = 5
},
@@ -57998,7 +57955,10 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"cto" = (
-/obj/machinery/vending/kink,
+/obj/machinery/vending/assist,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
/turf/open/floor/plating,
/area/maintenance/port/aft)
"ctq" = (
@@ -62086,7 +62046,6 @@
/turf/open/floor/plating/airless,
/area/science/test_area)
"cBO" = (
-/obj/item/flashlight/lamp,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -62876,22 +62835,13 @@
/turf/open/floor/plating/airless,
/area/science/test_area)
"cDy" = (
-/obj/machinery/camera{
- active_power_usage = 0;
- c_tag = "Bomb Test Site";
- desc = "A specially-reinforced camera with a long lasting battery, used to monitor the bomb testing site. An external light is attached to the top.";
- dir = 8;
- invuln = 1;
- light = null;
- luminosity = 3;
- name = "Hardened Bomb-Test Camera";
- network = list("toxins");
- use_power = 0
- },
/obj/item/target/alien/anchored,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
+/obj/machinery/camera/preset/toxins{
+ dir = 8
+ },
/turf/open/floor/plating/airless{
luminosity = 2
},
@@ -63871,7 +63821,6 @@
/turf/open/floor/plating/airless,
/area/science/test_area)
"cFw" = (
-/obj/item/flashlight/lamp,
/obj/effect/turf_decal/stripes/line{
dir = 2
},
@@ -70677,13 +70626,6 @@
/obj/structure/disposalpipe/segment,
/turf/closed/wall/r_wall,
/area/science/xenobiology)
-"cUd" = (
-/obj/machinery/cryopod{
- dir = 4;
- tag = "0"
- },
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/fitness/recreation)
"cUH" = (
/obj/structure/table/optable,
/turf/open/floor/plasteel/white,
@@ -71335,11 +71277,6 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard)
-"dbk" = (
-/obj/item/hand_labeler_refill,
-/obj/structure/easel,
-/turf/open/floor/plating,
-/area/maintenance/port)
"dbl" = (
/obj/structure/easel,
/turf/open/floor/plating,
@@ -71426,10 +71363,13 @@
/turf/open/floor/circuit/killroom,
/area/science/xenobiology)
"dbE" = (
-/obj/machinery/plantgenes,
+/obj/machinery/plantgenes{
+ pixel_y = 6
+ },
/obj/effect/turf_decal/stripes/line{
dir = 1
},
+/obj/structure/table,
/turf/open/floor/plasteel,
/area/hydroponics)
"dbF" = (
@@ -73555,15 +73495,19 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"dhp" = (
+/obj/machinery/light{
+ dir = 8
+ },
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
},
-/turf/open/floor/plasteel/neutral/corner{
- dir = 8
+/obj/structure/sign/poster/official/random{
+ pixel_x = -32
},
+/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"dhq" = (
/obj/structure/table/reinforced,
@@ -74202,12 +74146,7 @@
/turf/open/floor/plating,
/area/maintenance/port)
"diy" = (
-/obj/structure/table,
-/obj/item/paper_bin{
- pixel_x = -2;
- pixel_y = 8
- },
-/obj/item/poster/random_contraband,
+/obj/structure/closet/secure_closet/freezer/kitchen/maintenance,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"diz" = (
@@ -74289,10 +74228,10 @@
/turf/open/floor/wood,
/area/maintenance/port/aft)
"diF" = (
+/obj/structure/chair/stool,
/obj/structure/sign/poster/contraband/random{
pixel_y = 32
},
-/obj/machinery/jukebox,
/turf/open/floor/wood,
/area/maintenance/port/aft)
"diG" = (
@@ -75935,10 +75874,6 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard)
-"dWa" = (
-/obj/machinery/computer/cryopod,
-/turf/closed/wall,
-/area/security/prison)
"dYu" = (
/obj/machinery/door/airlock/external{
name = "Auxiliary Airlock"
@@ -75972,6 +75907,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
+/obj/item/stack/sheet/metal/ten,
/turf/open/floor/plasteel/white,
/area/science/circuit)
"eqG" = (
@@ -76035,16 +75971,25 @@
},
/turf/open/floor/plasteel/white,
/area/science/circuit)
-"gfh" = (
-/obj/machinery/libraryscanner,
-/turf/open/floor/plasteel/white,
-/area/science/circuit)
"gnZ" = (
/obj/item/radio/intercom{
pixel_y = -30
},
/turf/open/floor/plasteel/white,
/area/science/circuit)
+"gqA" = (
+/obj/machinery/button/door{
+ dir = 2;
+ id = "abandoned_kitchen";
+ name = "Shutters Control";
+ pixel_x = 26;
+ pixel_y = 6;
+ req_one_access_txt = null
+ },
+/obj/effect/decal/cleanable/blood/old,
+/obj/item/clothing/suit/apron/chef,
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"gra" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -76107,20 +76052,11 @@
},
/turf/closed/wall/r_wall,
/area/maintenance/disposal/incinerator)
-"hdw" = (
-/obj/machinery/cryopod{
- dir = 4;
- tag = "0"
- },
-/turf/open/floor/plasteel/vault,
-/area/crew_quarters/fitness/recreation)
-"hfJ" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/machinery/autolathe,
-/turf/open/floor/plasteel/white,
-/area/science/circuit)
+"hvt" = (
+/obj/structure/kitchenspike_frame,
+/obj/effect/decal/cleanable/blood/gibs/old,
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"hyP" = (
/obj/machinery/door/airlock/external{
name = "Escape Pod Two"
@@ -76130,6 +76066,13 @@
},
/turf/open/floor/plating,
/area/security/prison)
+"hIt" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/poddoor/shutters{
+ id = "abandoned_kitchen"
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"ioI" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -76157,6 +76100,10 @@
},
/turf/open/floor/plasteel/whitepurple,
/area/science/lab)
+"iLj" = (
+/obj/structure/table,
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"jeV" = (
/obj/machinery/conveyor/inverted{
dir = 10;
@@ -76168,15 +76115,11 @@
/turf/closed/wall/mineral/plastitanium,
/area/crew_quarters/fitness/recreation)
"jyv" = (
-/obj/item/stock_parts/cell/super,
-/obj/item/stock_parts/cell/super,
-/obj/item/stack/sheet/metal/fifty,
/obj/structure/table/reinforced,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the RD's goons from the safety of your own office.";
- name = "Research Monitor";
- network = list("rd");
- pixel_y = 32
+/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/cell/high,
+/obj/machinery/computer/security/telescreen/circuitry{
+ pixel_x = 30
},
/turf/open/floor/plasteel/white,
/area/science/circuit)
@@ -76325,6 +76268,10 @@
},
/turf/open/floor/plasteel/white,
/area/science/circuit)
+"lGS" = (
+/obj/docking_port/stationary/public_mining_dock,
+/turf/open/floor/plating,
+/area/construction/mining/aux_base)
"lMz" = (
/obj/structure/falsewall,
/turf/open/floor/plating,
@@ -76378,18 +76325,13 @@
},
/turf/open/floor/plasteel/white,
/area/science/circuit)
-"mSt" = (
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = -24
+"mWg" = (
+/obj/structure/girder,
+/obj/structure/grille,
+/turf/open/floor/plating{
+ icon_state = "panelscorched"
},
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel/neutral/corner{
- dir = 1
- },
-/area/crew_quarters/fitness/recreation)
+/area/maintenance/port/aft)
"nnK" = (
/obj/item/stack/sheet/glass/fifty,
/obj/item/paper_bin,
@@ -76474,19 +76416,15 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/stock_parts/cell/super,
/obj/structure/table/reinforced,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the RD's goons from the safety of your own office.";
- name = "Research Monitor";
- network = list("rd");
- pixel_y = 32
+/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/cell/high,
+/obj/machinery/computer/security/telescreen/circuitry{
+ pixel_y = 30
},
-/obj/item/stock_parts/cell/super,
-/obj/item/stack/sheet/metal/fifty,
/turf/open/floor/plasteel/white,
/area/science/circuit)
"ohj" = (
@@ -76536,6 +76474,17 @@
/obj/item/pen,
/turf/open/floor/plasteel/white,
/area/science/circuit)
+"oZg" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/structure/girder,
+/obj/structure/grille,
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"pmc" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5
@@ -76606,6 +76555,12 @@
},
/turf/open/floor/plating,
/area/maintenance/aft)
+"qhe" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/maintenance/port)
"qqg" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
@@ -76650,10 +76605,6 @@
},
/turf/open/floor/wood,
/area/library)
-"rzf" = (
-/obj/machinery/computer/cryopod,
-/turf/closed/wall,
-/area/crew_quarters/fitness/recreation)
"rzX" = (
/obj/structure/chair/office/light{
dir = 1;
@@ -76692,11 +76643,6 @@
/obj/structure/grille,
/turf/open/floor/plating/airless,
/area/space/nearstation)
-"sog" = (
-/obj/machinery/libraryscanner,
-/obj/machinery/bookbinder,
-/turf/open/floor/plasteel/white,
-/area/science/circuit)
"sFv" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -76738,11 +76684,6 @@
"sJW" = (
/turf/closed/wall/mineral/plastitanium,
/area/engine/break_room)
-"tjH" = (
-/obj/structure/table/reinforced,
-/obj/machinery/computer/libraryconsole/bookmanagement,
-/turf/open/floor/plasteel/white,
-/area/science/circuit)
"tsx" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -76841,7 +76782,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/machinery/rnd/production/protolathe/department/science,
+/obj/item/twohanded/required/kirbyplants{
+ icon_state = "plant-10"
+ },
/turf/open/floor/plasteel/white,
/area/science/circuit)
"uYk" = (
@@ -76898,6 +76841,10 @@
},
/turf/open/floor/plating,
/area/security/prison)
+"wmt" = (
+/obj/effect/decal/cleanable/flour,
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"wxc" = (
/obj/machinery/door/airlock/external{
name = "Atmospherics External Airlock";
@@ -76986,6 +76933,13 @@
/obj/structure/chair/comfy,
/turf/open/floor/plasteel,
/area/science/misc_lab)
+"xEf" = (
+/obj/structure/table,
+/obj/item/flashlight/lamp{
+ on = 0
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"xVl" = (
/turf/closed/wall,
/area/hallway/secondary/service)
@@ -77001,6 +76955,16 @@
/obj/effect/landmark/blobstart,
/turf/open/floor/engine/cult,
/area/library)
+"ydn" = (
+/obj/structure/table,
+/obj/item/reagent_containers/food/condiment/saltshaker{
+ pixel_x = -3
+ },
+/obj/item/reagent_containers/food/condiment/peppermill{
+ pixel_x = 3
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/aft)
"ygk" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -88942,7 +88906,7 @@ obX
aDa
aDa
aDa
-aDa
+lGS
cWM
cXR
cYG
@@ -93604,10 +93568,10 @@ bPJ
alK
cgH
dux
-bUU
-bVX
-bXB
-bYG
+iLj
+dvt
+bXE
+hvt
dux
dux
dux
@@ -93861,8 +93825,8 @@ aqK
alK
dit
dux
-bUV
-duH
+ydn
+wmt
bXC
bYH
dux
@@ -94119,12 +94083,12 @@ alK
bSu
dux
bUW
-bVZ
+bXE
bXD
bYI
bZO
cbt
-cdc
+oZg
dux
dux
csT
@@ -94376,11 +94340,11 @@ alK
bSr
dux
bUX
-bWa
-bXE
-bYJ
+bUU
+gqA
+xEf
dux
-dvt
+mWg
cdd
dux
cfC
@@ -94633,7 +94597,7 @@ bRf
bSv
dux
dux
-dux
+hIt
dux
dux
dux
@@ -94890,7 +94854,7 @@ alK
bOf
bOv
alC
-dbk
+qhe
dux
bYK
bZP
@@ -95410,7 +95374,7 @@ bYM
bZP
cbx
cdh
-bXE
+bUV
dux
dwc
cia
@@ -95924,7 +95888,7 @@ bYN
dux
cbz
bXE
-ces
+bYJ
dux
dwe
cic
@@ -101757,7 +101721,7 @@ aax
aax
aax
aax
-dWa
+abe
abe
abe
abe
@@ -111531,8 +111495,8 @@ acQ
afs
agr
acP
-acP
-acP
+ahU
+aiP
acP
acP
acP
@@ -111788,12 +111752,12 @@ acP
acP
ags
acP
-hdw
-cUd
-cUd
-cUd
-cUd
-rzf
+acP
+acP
+acP
+alf
+amv
+acP
aoS
acP
arB
@@ -112044,9 +112008,9 @@ aaa
acQ
aft
agt
-mSt
-ahf
ahf
+ahV
+aiQ
dhp
alg
alg
@@ -112305,7 +112269,7 @@ ahg
ahg
ahg
ajR
-ahl
+ahg
ahg
anG
aoU
@@ -113671,7 +113635,7 @@ cuZ
fFM
cud
kxk
-tjH
+cxO
cxO
cxO
dGH
@@ -114958,7 +114922,7 @@ mjJ
krD
eqq
llb
-hfJ
+uTS
cxO
cxO
krD
@@ -115217,7 +115181,7 @@ lsv
txj
eEe
cxO
-gfh
+cxO
krD
aaa
aaa
@@ -115474,7 +115438,7 @@ jyv
ohj
nnK
cxO
-sog
+cxO
krD
aaa
aaa
diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm
index 90db86d0f3..2935128d23 100644
--- a/_maps/map_files/OmegaStation/OmegaStation.dmm
+++ b/_maps/map_files/OmegaStation/OmegaStation.dmm
@@ -1683,7 +1683,7 @@
},
/obj/machinery/power/apc{
dir = 4;
- name = "Starboard Bow Maintenace APC";
+ name = "Starboard Bow Maintenance APC";
areastring = "/area/maintenance/starboard/fore";
pixel_x = 26
},
@@ -2113,7 +2113,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/power/apc{
dir = 8;
- name = "Fore Maintenace APC";
+ name = "Fore Maintenance APC";
areastring = "/area/maintenance/fore";
pixel_x = -26;
pixel_y = 3
@@ -15110,6 +15110,9 @@
codes_txt = "patrol;next_patrol=9.4-EnteringDorms";
location = "9.3-Engi"
},
+/obj/structure/cable/white{
+ icon_state = "2-4"
+ },
/turf/open/floor/plasteel/neutral,
/area/engine/break_room)
"aFF" = (
@@ -15470,6 +15473,7 @@
name = "Engineering Foyer APC";
pixel_y = -26
},
+/obj/structure/cable/white,
/turf/open/floor/plasteel/yellow/corner{
dir = 8
},
@@ -16215,7 +16219,7 @@
/area/hydroponics)
"aHO" = (
/obj/machinery/door/airlock/maintenance_hatch{
- name = "Hydroponic's Maintenance";
+ name = "Hydroponics Maintenance";
req_access_txt = "35"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -17841,6 +17845,7 @@
/obj/item/seeds/wheat,
/obj/item/reagent_containers/food/snacks/grown/tomato,
/obj/effect/turf_decal/bot,
+/obj/item/paper/guides/jobs/hydroponics,
/turf/open/floor/plasteel/vault/side{
dir = 1
},
@@ -17858,6 +17863,7 @@
},
/obj/item/seeds/tower,
/obj/effect/turf_decal/bot,
+/obj/item/book/manual/hydroponics_pod_people,
/turf/open/floor/plasteel/vault/side{
dir = 1
},
@@ -25433,7 +25439,6 @@
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"bbQ" = (
-/obj/machinery/jukebox,
/turf/open/floor/wood{
icon_state = "wood-broken5"
},
@@ -30950,6 +30955,14 @@
},
/turf/open/floor/plating/airless,
/area/maintenance/disposal/incinerator)
+"coR" = (
+/obj/effect/turf_decal/bot,
+/obj/machinery/smartfridge/disks{
+ pixel_y = 2
+ },
+/obj/structure/table/glass,
+/turf/open/floor/plasteel/neutral,
+/area/hydroponics)
"csX" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable/white{
@@ -32217,13 +32230,6 @@
},
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
-"mJQ" = (
-/obj/structure/table/glass,
-/obj/effect/turf_decal/delivery,
-/obj/item/book/manual/hydroponics_pod_people,
-/obj/item/paper/guides/jobs/hydroponics,
-/turf/open/floor/plasteel/neutral,
-/area/hydroponics)
"mQi" = (
/turf/closed/wall/rust,
/area/maintenance/starboard/central)
@@ -35406,8 +35412,11 @@
},
/area/hallway/primary/starboard)
"uuj" = (
-/obj/machinery/plantgenes,
+/obj/machinery/plantgenes{
+ pixel_y = 6
+ },
/obj/effect/turf_decal/bot,
+/obj/structure/table/glass,
/turf/open/floor/plasteel/neutral,
/area/hydroponics)
"uuJ" = (
@@ -74137,7 +74146,7 @@ bxN
sIB
cfz
ewT
-mJQ
+aKX
lyp
bIJ
aOj
@@ -74394,7 +74403,7 @@ arY
aHM
aIG
aJP
-aKX
+aKW
aMk
aNr
aHM
@@ -74651,7 +74660,7 @@ aGG
aHM
aIH
aJP
-aKW
+coR
aMk
aNr
aOh
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 9bc3ebe791..e0b5015ca6 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -2249,9 +2249,7 @@
c_tag = "Brig Prison Hallway";
network = list("ss13","prison")
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching Prison Wing holding areas.";
- name = "Prison Monitor";
+/obj/machinery/computer/security/telescreen/prison{
network = list("prison");
pixel_y = 30
},
@@ -4378,7 +4376,7 @@
/turf/open/floor/carpet,
/area/crew_quarters/heads/hos)
"amz" = (
-/obj/machinery/computer/security{
+/obj/machinery/computer/security/hos{
dir = 8
},
/turf/open/floor/carpet,
@@ -5072,10 +5070,7 @@
/turf/open/floor/plating,
/area/maintenance/department/security/brig)
"aok" = (
-/obj/machinery/computer/security{
- name = "Labor Camp Monitoring";
- network = list("labor")
- },
+/obj/machinery/computer/security/labor,
/turf/open/floor/plasteel/dark,
/area/security/brig)
"aol" = (
@@ -5936,6 +5931,10 @@
},
/area/security/brig)
"aqA" = (
+/obj/machinery/computer/security/telescreen/interrogation{
+ dir = 8;
+ pixel_x = 30
+ },
/turf/open/floor/plasteel/red/side{
dir = 5
},
@@ -6269,7 +6268,8 @@
"arz" = (
/obj/machinery/camera{
c_tag = "Brig Interrogation";
- dir = 8
+ dir = 8;
+ network = list("interrogation")
},
/turf/open/floor/plasteel/dark,
/area/security/brig)
@@ -7310,6 +7310,7 @@
"aud" = (
/obj/machinery/camera/motion{
c_tag = "Vault";
+ network = list("vault");
dir = 1
},
/obj/machinery/light,
@@ -7813,7 +7814,6 @@
dir = 4;
pixel_x = 28
},
-/obj/machinery/cryopod,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"avm" = (
@@ -10281,6 +10281,9 @@
/turf/open/floor/wood,
/area/crew_quarters/heads/hop)
"aBA" = (
+/obj/machinery/computer/security/telescreen/vault{
+ pixel_y = 30
+ },
/obj/machinery/computer/security/mining,
/turf/open/floor/wood,
/area/crew_quarters/heads/hop)
@@ -10460,7 +10463,7 @@
/turf/open/floor/plasteel/arrival,
/area/crew_quarters/fitness/recreation)
"aBV" = (
-/obj/machinery/vending/kink,
+/obj/structure/closet/wardrobe/green,
/turf/open/floor/plasteel/arrival,
/area/crew_quarters/fitness/recreation)
"aBW" = (
@@ -10692,7 +10695,8 @@
pixel_y = 32
},
/obj/machinery/disposal/deliveryChute{
- name = "Crate Disposal Chute"
+ name = "Crate Disposal Chute";
+ pixel_y = 6
},
/obj/structure/window/reinforced{
dir = 4
@@ -10784,7 +10788,8 @@
/obj/item/aiModule/supplied/quarantine,
/obj/machinery/camera/motion{
c_tag = "AI Upload Port";
- dir = 4
+ dir = 4;
+ network = list("aiupload")
},
/obj/item/aiModule/reset,
/obj/machinery/flasher{
@@ -10831,7 +10836,8 @@
/obj/item/aiModule/supplied/freeform,
/obj/machinery/camera/motion{
c_tag = "AI Upload Starboard";
- dir = 8
+ dir = 8;
+ network = list("aiupload")
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -11050,7 +11056,6 @@
/turf/open/floor/plasteel/white/side,
/area/crew_quarters/dorms)
"aDk" = (
-/obj/machinery/cryopod,
/turf/open/floor/plasteel/white/corner{
icon_state = "whitecorner";
dir = 8
@@ -11263,7 +11268,8 @@
/obj/machinery/holopad,
/obj/machinery/camera/motion{
c_tag = "AI Upload Center";
- dir = 1
+ dir = 1;
+ network = list("aiupload")
},
/obj/item/radio/intercom{
broadcasting = 1;
@@ -12348,10 +12354,7 @@
/turf/open/floor/plasteel/neutral/side,
/area/storage/primary)
"aGk" = (
-/obj/machinery/vending/boozeomat{
- products = list(/obj/item/reagent_containers/food/drinks/bottle/rum = 1, /obj/item/reagent_containers/food/drinks/bottle/wine = 1, /obj/item/reagent_containers/food/drinks/ale = 1, /obj/item/reagent_containers/food/drinks/drinkingglass = 6, /obj/item/reagent_containers/food/drinks/ice = 1, /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 4);
- req_access_txt = "20"
- },
+/obj/machinery/vending/boozeomat/pubby_captain,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -16566,6 +16569,10 @@
/obj/machinery/light{
dir = 4
},
+/obj/machinery/computer/security/telescreen/auxbase{
+ dir = 8;
+ pixel_x = 30
+ },
/turf/open/floor/plasteel,
/area/construction/mining/aux_base)
"aRH" = (
@@ -19097,7 +19104,10 @@
},
/area/hydroponics)
"aXW" = (
-/obj/machinery/plantgenes,
+/obj/machinery/plantgenes{
+ pixel_y = 6
+ },
+/obj/structure/table,
/turf/open/floor/plasteel/green/corner{
dir = 4
},
@@ -21322,14 +21332,14 @@
/turf/open/floor/plasteel,
/area/quartermaster/miningdock)
"bdM" = (
-/obj/machinery/computer/security/mining{
- dir = 8
- },
/obj/machinery/requests_console{
department = "Mining";
departmentType = 0;
pixel_x = 32
},
+/obj/machinery/computer/security/mining{
+ dir = 8
+ },
/turf/open/floor/plasteel/brown/corner,
/area/quartermaster/miningdock)
"bdQ" = (
@@ -22051,13 +22061,13 @@
},
/area/quartermaster/qm)
"bfD" = (
-/obj/machinery/computer/security/mining{
- dir = 8
- },
/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -35
},
+/obj/machinery/computer/security/qm{
+ dir = 8
+ },
/turf/open/floor/plasteel/brown{
dir = 6
},
@@ -23841,6 +23851,7 @@
},
/obj/machinery/camera{
c_tag = "Genetics Cloning Foyer";
+ network = list("ss13","medbay");
dir = 2
},
/obj/machinery/atmospherics/components/unary/vent_pump/on,
@@ -24227,12 +24238,8 @@
dir = 1
},
/obj/item/integrated_electronics/debugger,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the other eggheads from the comfort of the circuitry lab.";
- dir = 2;
- name = "RnD Monitor";
- network = list("rd");
- pixel_y = 32
+/obj/machinery/computer/security/telescreen/circuitry{
+ pixel_y = 30
},
/turf/open/floor/plasteel/vault{
dir = 5
@@ -24240,13 +24247,9 @@
/area/science/explab)
"blV" = (
/obj/structure/table/reinforced,
-/obj/item/stack/sheet/metal/fifty{
- pixel_x = -2;
- pixel_y = 2
- },
-/obj/item/stack/sheet/metal/fifty,
/obj/item/clothing/glasses/science,
/obj/item/clothing/glasses/science,
+/obj/item/stack/sheet/metal/ten,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -24257,12 +24260,8 @@
/obj/machinery/light{
dir = 1
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the other eggheads from the comfort of the circuitry lab.";
- dir = 2;
- name = "RnD Monitor";
- network = list("rd");
- pixel_y = 32
+/obj/machinery/computer/security/telescreen/circuitry{
+ pixel_y = 30
},
/turf/open/floor/plasteel/vault{
dir = 5
@@ -24409,6 +24408,7 @@
},
/obj/machinery/camera{
c_tag = "Medbay Security Post";
+ network = list("ss13","medbay");
dir = 4
},
/obj/structure/closet/secure_closet/security/med,
@@ -24650,10 +24650,10 @@
/obj/machinery/cell_charger{
pixel_y = 5
},
-/obj/item/stock_parts/cell/super,
-/obj/item/stock_parts/cell/super,
-/obj/item/stock_parts/cell/super,
-/obj/item/stock_parts/cell/super,
+/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/cell/high,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -24992,7 +24992,9 @@
/turf/open/floor/engine,
/area/science/explab)
"bnZ" = (
-/obj/machinery/rnd/production/techfab/department/science,
+/obj/item/twohanded/required/kirbyplants{
+ icon_state = "plant-10"
+ },
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -25236,6 +25238,7 @@
/obj/structure/bed/roller,
/obj/machinery/camera{
c_tag = "Medbay Entrance";
+ network = list("ss13","medbay");
dir = 1
},
/turf/open/floor/plasteel/whiteblue/side,
@@ -26126,7 +26129,7 @@
/obj/machinery/camera{
c_tag = "Genetics Monkey Pen Fore";
dir = 4;
- network = list("ss13","rd")
+ network = list("ss13","medbay")
},
/obj/machinery/light/small{
dir = 8
@@ -26738,6 +26741,7 @@
/obj/machinery/dna_scannernew,
/obj/machinery/camera{
c_tag = "Genetics Cloning";
+ network = list("ss13","medbay");
dir = 4
},
/obj/machinery/airalarm/unlocked{
@@ -27475,6 +27479,7 @@
/obj/structure/disposalpipe/trunk{
dir = 8
},
+/obj/machinery/disposal/bin,
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"bum" = (
@@ -27762,6 +27767,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/camera{
c_tag = "Medbay Port Hallway";
+ network = list("ss13","medbay");
dir = 4
},
/obj/machinery/airalarm{
@@ -28451,7 +28457,6 @@
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"bwV" = (
-/obj/machinery/disposal/bin,
/turf/open/floor/plasteel/whiteyellow/corner,
/area/medical/chemistry)
"bwW" = (
@@ -29672,7 +29677,7 @@
/obj/machinery/camera{
c_tag = "Genetics Monkey Pen Aft";
dir = 4;
- network = list("ss13","rd")
+ network = list("ss13","medbay")
},
/obj/structure/flora/ausbushes/grassybush,
/obj/machinery/light/small{
@@ -30323,20 +30328,16 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching surgery.";
- dir = 8;
- layer = 4;
- name = "Surgery Telescreen";
- network = list("surgery");
- pixel_x = 30
- },
/obj/structure/cable{
icon_state = "1-2"
},
/obj/structure/cable{
icon_state = "2-8"
},
+/obj/machinery/computer/security/telescreen/cmo{
+ dir = 8;
+ pixel_x = 30
+ },
/turf/open/floor/plasteel/cmo,
/area/crew_quarters/heads/cmo)
"bBl" = (
@@ -30694,7 +30695,7 @@
/obj/machinery/camera{
c_tag = "Genetics";
dir = 1;
- network = list("ss13","rd")
+ network = list("ss13","medbay")
},
/turf/open/floor/plasteel/whitepurple/side,
/area/medical/genetics)
@@ -30750,6 +30751,7 @@
/obj/structure/closet/emcloset,
/obj/machinery/camera{
c_tag = "Virology Airlock";
+ network = list("ss13","medbay");
dir = 2
},
/obj/effect/turf_decal/stripes/line{
@@ -31882,7 +31884,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/effect/landmark/blobstart,
/obj/item/melee/baton/cattleprod{
- cell = new /obj/item/stock_parts/cell/high()
+ preload_cell_type = /obj/item/stock_parts/cell/high
},
/turf/open/floor/plasteel/dark,
/area/medical/exam_room)
@@ -32010,13 +32012,11 @@
pixel_x = 4;
pixel_y = 6
},
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching the RD's goons and the AI's satellite from the safety of his office.";
- name = "Research Monitor";
- network = list("rd","minisat");
- pixel_y = -32
- },
/obj/structure/table/glass,
+/obj/machinery/computer/security/telescreen/rd{
+ dir = 1;
+ pixel_y = -26
+ },
/turf/open/floor/plasteel/darkpurple/side,
/area/crew_quarters/heads/hor)
"bEV" = (
@@ -33218,6 +33218,7 @@
"bHY" = (
/obj/machinery/camera{
c_tag = "Virology";
+ network = list("ss13","medbay");
dir = 2
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -33276,6 +33277,7 @@
/obj/machinery/light,
/obj/machinery/camera{
c_tag = "Medbay Equipment Room";
+ network = list("ss13","medbay");
dir = 1
},
/turf/open/floor/plasteel/whiteblue/side,
@@ -33342,6 +33344,7 @@
"bIm" = (
/obj/machinery/camera{
c_tag = "Medbay Recovery Room";
+ network = list("ss13","medbay");
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -34800,7 +34803,7 @@
"bLX" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/door/airlock/atmos/glass{
+/obj/machinery/door/airlock/atmos{
name = "Atmospherics";
req_access_txt = "24"
},
@@ -38261,6 +38264,9 @@
c_tag = "Chief Engineer's Office";
dir = 2
},
+/obj/machinery/computer/security/telescreen/ce{
+ pixel_y = 30
+ },
/turf/open/floor/plasteel/yellow/side{
dir = 1
},
@@ -38961,46 +38967,21 @@
/area/crew_quarters/heads/chief)
"bWs" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/robotics{
- pixel_x = -2;
- pixel_y = 2
- },
-/obj/item/circuitboard/computer/mecha_control{
- pixel_x = 1;
- pixel_y = -1
- },
+/obj/effect/spawner/lootdrop/techstorage/RnD_secure,
/turf/open/floor/plasteel/darkred,
/area/storage/tech)
"bWt" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/crew{
- pixel_x = -1;
- pixel_y = 1
- },
-/obj/item/circuitboard/computer/card{
- pixel_x = 2;
- pixel_y = -2
- },
-/obj/item/circuitboard/computer/communications{
- pixel_x = 5;
- pixel_y = -5
- },
/obj/machinery/camera{
c_tag = "Secure Tech Storage";
dir = 1
},
+/obj/effect/spawner/lootdrop/techstorage/command,
/turf/open/floor/plasteel/darkred,
/area/storage/tech)
"bWu" = (
/obj/structure/rack,
-/obj/item/circuitboard/computer/borgupload{
- pixel_x = -1;
- pixel_y = 1
- },
-/obj/item/circuitboard/computer/aiupload{
- pixel_x = 2;
- pixel_y = -2
- },
+/obj/effect/spawner/lootdrop/techstorage/AI,
/turf/open/floor/plasteel/darkred,
/area/storage/tech)
"bWv" = (
@@ -41269,9 +41250,7 @@
/obj/item/stack/sheet/mineral/plasma{
amount = 30
},
-/obj/item/gps{
- gpstag = "ENG0"
- },
+/obj/item/gps/engineering,
/turf/open/floor/plating,
/area/engine/engineering)
"ccS" = (
@@ -41897,7 +41876,7 @@
dir = 2;
layer = 4;
name = "Telecomms Telescreen";
- network = list("tcomm");
+ network = list("tcomms");
pixel_y = 28
},
/obj/structure/disposalpipe/segment{
@@ -43111,16 +43090,7 @@
/turf/open/floor/carpet,
/area/library/lounge)
"cjV" = (
-/obj/machinery/camera{
- active_power_usage = 0;
- c_tag = "Bomb Testing Asteroid Fore";
- desc = "A specially-reinforced camera with a long lasting battery, used to monitor the bomb testing site. An external light is attached to the top.";
- invuln = 1;
- luminosity = 3;
- name = "Hardened Bomb-Test Camera";
- network = list("ss13","rd","toxins");
- use_power = 0
- },
+/obj/machinery/camera/preset/toxins,
/turf/open/floor/plating/asteroid/airless,
/area/asteroid/nearstation/bomb_site)
"cjZ" = (
@@ -43872,7 +43842,7 @@
/obj/machinery/camera/motion{
c_tag = "Telecomms External Port";
dir = 8;
- network = list("tcomm")
+ network = list("tcomms")
},
/turf/open/space,
/area/space/nearstation)
@@ -43934,7 +43904,7 @@
/obj/machinery/camera/motion{
c_tag = "Telecomms External Starboard";
dir = 4;
- network = list("tcomm")
+ network = list("tcomms")
},
/turf/open/space,
/area/space/nearstation)
@@ -44062,16 +44032,9 @@
/turf/open/floor/circuit/telecomms/mainframe,
/area/tcommsat/server)
"cnp" = (
-/obj/machinery/camera{
- active_power_usage = 0;
+/obj/machinery/camera/preset/toxins{
c_tag = "Bomb Testing Asteroid Aft";
- desc = "A specially-reinforced camera with a long lasting battery, used to monitor the bomb testing site. An external light is attached to the top.";
- dir = 1;
- invuln = 1;
- luminosity = 3;
- name = "Hardened Bomb-Test Camera";
- network = list("ss13","rd","toxins");
- use_power = 0
+ dir = 1
},
/turf/open/floor/plating/asteroid/airless,
/area/asteroid/nearstation/bomb_site)
@@ -44110,7 +44073,7 @@
/obj/machinery/camera/motion{
c_tag = "Telecomms Server Room";
dir = 1;
- network = list("ss13","tcomm")
+ network = list("tcomms")
},
/turf/open/floor/plasteel/dark/telecomms,
/area/tcommsat/server)
@@ -44141,7 +44104,7 @@
/obj/machinery/camera/motion{
c_tag = "Telecomms External Port Aft";
dir = 2;
- network = list("tcomm")
+ network = list("tcomms")
},
/turf/open/space,
/area/space/nearstation)
@@ -44150,7 +44113,7 @@
/obj/machinery/camera/motion{
c_tag = "Telecomms External Starboard Aft";
dir = 2;
- network = list("tcomm")
+ network = list("tcomms")
},
/turf/open/space,
/area/space/nearstation)
@@ -46893,7 +46856,7 @@
/area/library)
"cAu" = (
/obj/structure/table/wood,
-/obj/item/clothing/head/pharoah,
+/obj/item/clothing/head/pharaoh,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/vault{
dir = 5
@@ -46995,7 +46958,7 @@
/turf/open/floor/plasteel/dark,
/area/library)
"cBk" = (
-/obj/machinery/vending/boozeomat/maint,
+/obj/machinery/vending/boozeomat/pubby_maint,
/turf/closed/wall,
/area/maintenance/department/crew_quarters/dorms)
"cBl" = (
@@ -47308,7 +47271,7 @@
},
/area/science/xenobiology)
"cPO" = (
-/obj/machinery/jukebox,
+/obj/item/chair/stool,
/turf/open/floor/wood{
icon_state = "wood-broken7"
},
@@ -48948,12 +48911,6 @@
},
/turf/open/floor/plating,
/area/maintenance/department/security/brig)
-"hOd" = (
-/obj/machinery/autolathe,
-/turf/open/floor/plasteel/vault{
- dir = 5
- },
-/area/science/explab)
"hOx" = (
/obj/structure/cable{
icon_state = "2-4"
@@ -49159,6 +49116,9 @@
},
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
+"iqc" = (
+/turf/open/floor/plasteel/stairs/right,
+/area/maintenance/department/crew_quarters/dorms)
"itl" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -49226,7 +49186,7 @@
/obj/machinery/camera{
c_tag = "Telecomms External Fore";
dir = 1;
- network = list("SS13","tcomm");
+ network = list("tcomms");
start_active = 1
},
/obj/structure/cable/yellow{
@@ -49443,10 +49403,6 @@
},
/turf/closed/wall/r_wall,
/area/engine/engineering)
-"jqN" = (
-/obj/effect/spawner/lootdrop/keg,
-/turf/open/floor/wood,
-/area/maintenance/department/crew_quarters/dorms)
"jrG" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -49815,10 +49771,6 @@
},
/turf/open/floor/plating/airless,
/area/engine/engineering)
-"koO" = (
-/obj/effect/spawner/lootdrop/keg,
-/turf/open/floor/plating,
-/area/maintenance/department/crew_quarters/dorms)
"kpK" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
@@ -49924,7 +49876,10 @@
},
/area/hallway/primary/central)
"kEW" = (
-/obj/machinery/smartfridge/disks,
+/obj/machinery/smartfridge/disks{
+ pixel_y = 2
+ },
+/obj/structure/table,
/turf/open/floor/plasteel,
/area/hydroponics)
"kFm" = (
@@ -50953,7 +50908,7 @@
/obj/machinery/camera/motion{
c_tag = "Telecomms Monitoring";
dir = 2;
- network = list("ss13","tcomm")
+ network = list("tcomms")
},
/obj/structure/cable{
icon_state = "2-8"
@@ -52249,7 +52204,7 @@
/obj/machinery/camera/motion{
c_tag = "Telecomms External Access";
dir = 1;
- network = list("ss13","tcomm")
+ network = list("tcomms")
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
@@ -52338,11 +52293,6 @@
"rHA" = (
/turf/open/floor/plasteel,
/area/construction/mining/aux_base)
-"rHP" = (
-/obj/structure/lattice,
-/obj/structure/reagent_dispensers/keg/aphro/strong,
-/turf/open/space,
-/area/space/nearstation)
"rJg" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/obj/machinery/light/small{
@@ -52467,7 +52417,7 @@
/turf/open/floor/plating,
/area/engine/engineering)
"sbk" = (
-/obj/machinery/vending/kink,
+/obj/structure/girder,
/turf/open/floor/plating,
/area/maintenance/department/crew_quarters/dorms)
"sbY" = (
@@ -52962,6 +52912,10 @@
/obj/item/pen,
/turf/open/floor/plasteel/dark,
/area/science/explab)
+"tCP" = (
+/obj/docking_port/stationary/public_mining_dock,
+/turf/open/floor/plating,
+/area/construction/mining/aux_base)
"tDn" = (
/obj/item/wrench,
/turf/open/floor/plating,
@@ -54432,10 +54386,6 @@
},
/turf/open/floor/plasteel,
/area/science/xenobiology)
-"yap" = (
-/obj/machinery/computer/cryopod,
-/turf/closed/wall,
-/area/crew_quarters/dorms)
"ybX" = (
/obj/structure/table,
/obj/effect/spawner/lootdrop/maintenance,
@@ -54473,7 +54423,7 @@
/obj/machinery/camera{
c_tag = "Engineering Telecomms Access";
dir = 8;
- network = list("tcomm")
+ network = list("tcomms")
},
/obj/machinery/light{
dir = 4
@@ -76948,7 +76898,7 @@ uoS
rJZ
uoS
uoS
-uoS
+tCP
xOC
jAy
rHA
@@ -88701,7 +88651,7 @@ aaa
aaa
aaa
aby
-rHP
+abI
abO
abX
acg
@@ -91046,7 +90996,7 @@ aaa
aaa
aiS
qPB
-gNv
+iqc
ngp
cBr
cBs
@@ -91564,7 +91514,7 @@ cBo
alQ
alb
cBw
-jqN
+alb
aiS
aiS
aiS
@@ -92596,7 +92546,7 @@ aiS
aiS
aob
eaw
-koO
+ajv
ajv
cnX
aiS
@@ -94661,7 +94611,7 @@ aaa
aaa
apX
apX
-yap
+apX
avl
fIu
dbi
@@ -96248,7 +96198,7 @@ bjx
bjw
qDJ
vmG
-hOd
+bnZ
pDP
nBL
bqs
diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm
index 560f7fd825..89a836f2df 100644
--- a/_maps/map_files/debug/runtimestation.dmm
+++ b/_maps/map_files/debug/runtimestation.dmm
@@ -20,6 +20,9 @@
"af" = (
/turf/open/floor/plating,
/area/maintenance/department/bridge)
+"ag" = (
+/turf/closed/wall/r_wall,
+/area/security/brig)
"ah" = (
/turf/closed/wall/r_wall,
/area/engine/atmos)
@@ -123,6 +126,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 5
},
+/obj/structure/cable,
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"au" = (
@@ -185,6 +189,9 @@
/obj/machinery/door/airlock/external/glass,
/turf/open/floor/plating,
/area/engine/engineering)
+"aD" = (
+/turf/open/floor/plasteel,
+/area/security/brig)
"aE" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -304,13 +311,14 @@
/obj/structure/cable{
icon_state = "2-4"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 8
+ },
/turf/open/floor/plasteel,
/area/engine/engineering)
"aU" = (
/obj/machinery/door/airlock/engineering/glass{
- name = "Gravity Generator";
- req_access_txt = "11"
+ name = "Gravity Generator"
},
/obj/structure/cable{
icon_state = "4-8"
@@ -318,6 +326,9 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"aV" = (
@@ -327,6 +338,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"aW" = (
@@ -340,8 +354,7 @@
/area/engine/gravity_generator)
"aX" = (
/obj/machinery/door/airlock/engineering/glass{
- name = "Gravity Generator";
- req_access_txt = "11"
+ name = "Gravity Generator"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
@@ -386,6 +399,7 @@
/obj/structure/table,
/obj/item/weldingtool/experimental,
/obj/item/inducer,
+/obj/item/storage/belt/utility/chief/full,
/turf/open/floor/plasteel,
/area/engine/engineering)
"be" = (
@@ -403,6 +417,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
+/obj/machinery/announcement_system,
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"bh" = (
@@ -429,7 +444,7 @@
/obj/structure/table,
/obj/item/analyzer,
/obj/item/wrench,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel,
/area/engine/atmos)
"bk" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -473,6 +488,9 @@
dir = 10
},
/obj/machinery/light,
+/obj/machinery/telecomms/allinone{
+ network = "tcommsat"
+ },
/turf/open/floor/plasteel,
/area/engine/gravity_generator)
"br" = (
@@ -500,6 +518,10 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/bridge)
+"bw" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/security/brig)
"bx" = (
/obj/machinery/door/airlock,
/obj/structure/cable{
@@ -511,12 +533,6 @@
"by" = (
/turf/closed/wall/r_wall,
/area/medical/medbay)
-"bz" = (
-/obj/machinery/light{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/maintenance/department/bridge)
"bA" = (
/turf/closed/wall/r_wall,
/area/science)
@@ -535,10 +551,13 @@
/obj/machinery/autolathe/hacked,
/turf/open/floor/plasteel,
/area/science)
-"bD" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 8
+"bC" = (
+/obj/machinery/computer/gulag_teleporter_computer{
+ dir = 4
},
+/turf/open/floor/plasteel,
+/area/security/brig)
+"bD" = (
/obj/machinery/light{
dir = 1
},
@@ -568,13 +587,27 @@
dir = 8
},
/area/bridge)
+"bH" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/turf/open/floor/plasteel,
+/area/security/brig)
"bI" = (
/obj/structure/table,
+/obj/item/card/emag,
+/obj/item/flashlight/emp/debug,
/turf/open/floor/plasteel,
/area/bridge)
"bJ" = (
/obj/structure/table,
-/obj/item/card/id/captains_spare,
+/obj/item/card/id/ert{
+ pixel_x = 4;
+ pixel_y = -4
+ },
+/obj/item/card/id/syndicate/nuke_leader,
+/obj/item/card/id/captains_spare{
+ pixel_x = -4;
+ pixel_y = 4
+ },
/turf/open/floor/plasteel,
/area/bridge)
"bK" = (
@@ -587,7 +620,7 @@
/obj/item/rcd_ammo/large,
/obj/item/rcd_ammo/large,
/obj/item/rcd_ammo/large,
-/obj/item/construction/rcd,
+/obj/item/construction/rcd/combat,
/turf/open/floor/plasteel,
/area/bridge)
"bM" = (
@@ -632,6 +665,13 @@
/obj/machinery/chem_dispenser/fullupgrade,
/turf/open/floor/plasteel/dark,
/area/medical/chemistry)
+"bT" = (
+/obj/machinery/gulag_item_reclaimer{
+ dir = 8;
+ pixel_x = 32
+ },
+/turf/open/floor/plasteel,
+/area/security/brig)
"bU" = (
/obj/machinery/airalarm/unlocked{
pixel_y = 23
@@ -665,7 +705,7 @@
},
/area/medical/medbay)
"bX" = (
-/obj/machinery/sleeper,
+/obj/machinery/sleeper/syndie,
/turf/open/floor/plasteel/arrival{
dir = 1
},
@@ -733,15 +773,21 @@
},
/area/bridge)
"ch" = (
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 8
},
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/medical/chemistry)
+"ci" = (
/obj/structure/cable{
icon_state = "2-4"
},
-/obj/machinery/door/airlock,
-/turf/open/floor/plating,
-/area/bridge)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel,
+/area/security/brig)
"cj" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -801,11 +847,12 @@
},
/area/bridge)
"cs" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable{
icon_state = "1-2"
},
-/turf/closed/wall/r_wall,
-/area/bridge)
+/turf/open/floor/plasteel,
+/area/medical/chemistry)
"ct" = (
/obj/machinery/light{
dir = 8
@@ -836,6 +883,7 @@
/turf/open/floor/plasteel,
/area/medical/medbay)
"cz" = (
+/obj/structure/fans/tiny,
/turf/open/floor/plating,
/area/medical/medbay)
"cA" = (
@@ -856,8 +904,8 @@
},
/area/hallway/primary/central)
"cC" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/machinery/camera/autoname,
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
/turf/open/floor/plasteel/blue/side{
dir = 1
},
@@ -871,9 +919,6 @@
},
/area/hallway/primary/central)
"cE" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -900,9 +945,19 @@
dir = 8
},
/area/medical/medbay)
+"cI" = (
+/obj/machinery/power/apc{
+ dir = 4;
+ pixel_x = 24
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/brig)
"cJ" = (
/obj/item/gun/magic/staff/healing,
-/obj/item/gun/magic/wand/resurrection,
+/obj/item/gun/magic/wand/resurrection/debug,
/turf/open/floor/plasteel/arrival{
dir = 10
},
@@ -944,15 +999,20 @@
/turf/closed/wall/r_wall,
/area/storage/primary)
"cT" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
/obj/structure/cable{
icon_state = "1-2"
},
-/turf/closed/wall/r_wall,
-/area/storage/primary)
+/turf/open/floor/plasteel,
+/area/medical/chemistry)
"cU" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/closed/wall/r_wall,
-/area/storage/primary)
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
"cV" = (
/obj/machinery/door/airlock/public/glass,
/turf/open/floor/plasteel,
@@ -987,6 +1047,25 @@
/turf/open/floor/plasteel,
/area/construction)
"da" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/closed/wall/r_wall,
+/area/storage/primary)
+"db" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/hallway/secondary/entry)
+"dc" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/storage/primary)
+"dd" = (
/obj/machinery/airalarm/unlocked{
pixel_y = 23
},
@@ -994,68 +1073,53 @@
dir = 8;
pixel_x = -24
},
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/storage/primary)
-"dc" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/storage/primary)
-"dd" = (
-/obj/effect/turf_decal/plaque{
- icon_state = "L1"
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/cable{
+ icon_state = "0-4"
},
/turf/open/floor/plasteel,
/area/storage/primary)
"de" = (
-/obj/machinery/light{
- dir = 1
- },
-/obj/effect/turf_decal/plaque{
- icon_state = "L3"
- },
+/obj/machinery/gulag_teleporter,
/turf/open/floor/plasteel,
-/area/storage/primary)
+/area/security/brig)
"df" = (
-/obj/effect/turf_decal/plaque{
- icon_state = "L5"
+/obj/structure/cable{
+ icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
-/area/storage/primary)
+/area/security/brig)
"dg" = (
-/obj/effect/turf_decal/plaque{
- icon_state = "L7"
+/obj/machinery/airalarm/unlocked{
+ pixel_x = 32
},
/turf/open/floor/plasteel,
-/area/storage/primary)
+/area/security/brig)
"dh" = (
-/obj/effect/turf_decal/plaque{
- icon_state = "L9"
- },
-/turf/open/floor/plasteel,
-/area/storage/primary)
+/turf/closed/wall,
+/area/hallway/secondary/entry)
"di" = (
-/obj/machinery/light{
- dir = 1
+/obj/machinery/door/airlock/external{
+ name = "Labor Camp Shuttle Airlock"
},
-/obj/machinery/camera/autoname,
-/obj/effect/turf_decal/plaque{
- icon_state = "L11"
- },
-/turf/open/floor/plasteel,
-/area/storage/primary)
+/obj/structure/fans/tiny,
+/turf/open/floor/plasteel/dark,
+/area/security/brig)
"dj" = (
-/obj/effect/turf_decal/plaque{
- icon_state = "L13"
+/obj/machinery/light/small{
+ dir = 8
},
-/turf/open/floor/plasteel,
-/area/storage/primary)
+/turf/open/floor/plating,
+/area/hallway/secondary/entry)
"dk" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
+/obj/structure/cable{
+ icon_state = "2-8"
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 10
+ },
+/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/plasteel,
/area/storage/primary)
"dl" = (
@@ -1149,8 +1213,11 @@
/turf/open/floor/plasteel,
/area/construction)
"dA" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 10
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
},
/turf/open/floor/plasteel,
/area/storage/primary)
@@ -1160,14 +1227,12 @@
/area/storage/primary)
"dC" = (
/obj/effect/turf_decal/stripes/line{
- dir = 6
+ dir = 8
},
/turf/open/floor/plasteel,
/area/storage/primary)
"dD" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
+/obj/effect/landmark/observer_start,
/turf/open/floor/plasteel,
/area/storage/primary)
"dE" = (
@@ -1177,8 +1242,8 @@
/turf/open/floor/plasteel,
/area/storage/primary)
"dF" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 5
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
},
/turf/open/floor/plasteel,
/area/storage/primary)
@@ -1187,11 +1252,11 @@
/turf/open/floor/plasteel,
/area/storage/primary)
"dH" = (
-/obj/effect/landmark/start,
-/turf/open/floor/plasteel,
-/area/storage/primary)
+/obj/machinery/door/airlock,
+/turf/open/floor/plating,
+/area/maintenance/department/bridge)
"dI" = (
-/obj/effect/landmark/latejoin,
+/obj/effect/landmark/start,
/turf/open/floor/plasteel,
/area/storage/primary)
"dJ" = (
@@ -1225,11 +1290,23 @@
/obj/item/storage/firstaid,
/turf/open/floor/plasteel,
/area/storage/primary)
+"dP" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/hallway/secondary/entry)
"dQ" = (
/obj/structure/table,
/obj/machinery/light,
/turf/open/floor/plasteel,
/area/storage/primary)
+"dR" = (
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/security/brig)
"dS" = (
/obj/machinery/atmospherics/components/unary/tank/air,
/obj/machinery/camera/autoname,
@@ -1248,6 +1325,9 @@
dir = 1
},
/area/hallway/primary/central)
+"dV" = (
+/turf/open/floor/plating,
+/area/hallway/secondary/entry)
"dW" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/camera/autoname,
@@ -1260,14 +1340,14 @@
/obj/machinery/camera/autoname{
dir = 4
},
+/obj/machinery/light{
+ dir = 8
+ },
/turf/open/floor/plasteel,
/area/construction)
"dY" = (
-/obj/machinery/camera/autoname{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/storage/primary)
+/turf/closed/wall/r_wall,
+/area/hallway/secondary/entry)
"dZ" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -1282,31 +1362,1126 @@
/obj/machinery/camera/autoname{
dir = 1
},
-/obj/item/gun/magic/wand/resurrection,
+/obj/item/gun/magic/wand/resurrection/debug,
/turf/open/floor/plasteel,
/area/storage/primary)
+"eb" = (
+/obj/docking_port/stationary{
+ dir = 8;
+ dwidth = 2;
+ height = 5;
+ id = "laborcamp_home";
+ name = "fore bay 1";
+ width = 9;
+ roundstart_template = /datum/map_template/shuttle/labour/box
+ },
+/turf/open/space/basic,
+/area/space)
+"ec" = (
+/obj/docking_port/stationary{
+ dir = 8;
+ dwidth = 3;
+ height = 15;
+ id = "arrivals_stationary";
+ name = "arrivals";
+ width = 7;
+ roundstart_template = /datum/map_template/shuttle/arrival/box
+ },
+/turf/open/space/basic,
+/area/space)
+"ed" = (
+/obj/structure/sign/warning/pods,
+/turf/closed/wall/r_wall,
+/area/hallway/secondary/entry)
+"ee" = (
+/obj/machinery/door/airlock/external{
+ name = "Mining Dock Airlock"
+ },
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/quartermaster/miningoffice)
+"ef" = (
+/obj/machinery/door/airlock,
+/turf/open/floor/plasteel,
+/area/construction)
+"eg" = (
+/obj/machinery/door/airlock,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel,
+/area/security/brig)
+"eh" = (
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
"ei" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
+"ej" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
+"ek" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
+"el" = (
+/obj/docking_port/stationary/random{
+ id = "pod_lavaland1";
+ name = "lavaland"
+ },
+/turf/open/space,
+/area/space)
+"em" = (
+/turf/closed/wall/r_wall,
+/area/quartermaster/miningoffice)
+"en" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/hallway/secondary/entry)
+"eo" = (
+/obj/machinery/door/airlock/external{
+ name = "Arrival Airlock"
+ },
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/hallway/secondary/entry)
+"ep" = (
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
+"eq" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
+"er" = (
+/obj/structure/table/optable,
+/turf/open/floor/plasteel,
+/area/medical/medbay)
+"es" = (
/obj/machinery/light,
/obj/machinery/computer/operating,
/turf/open/floor/plasteel,
-/area/maintenance/department/bridge)
-"fT" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/area/medical/medbay)
+"et" = (
+/turf/closed/wall/r_wall,
+/area/quartermaster/storage)
+"eu" = (
/turf/open/floor/plasteel,
-/area/science)
-"gd" = (
+/area/quartermaster/storage)
+"ev" = (
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
+"ew" = (
/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/sign/warning/vacuum,
/turf/open/floor/plating,
-/area/science)
-"gM" = (
-/obj/effect/turf_decal/stripes/line{
+/area/quartermaster/storage)
+"ex" = (
+/obj/machinery/door/airlock/external{
+ name = "Escape Pod One"
+ },
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/hallway/secondary/entry)
+"ey" = (
+/obj/machinery/status_display{
+ name = "cargo display";
+ supply_display = 1
+ },
+/turf/closed/wall,
+/area/quartermaster/storage)
+"ez" = (
+/obj/machinery/camera/autoname{
dir = 8
},
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/plasteel,
/area/storage/primary)
+"eA" = (
+/obj/machinery/conveyor{
+ dir = 1;
+ id = "cargounload"
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
+"eB" = (
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
+"eC" = (
+/obj/machinery/conveyor{
+ dir = 8;
+ id = "cargounload"
+ },
+/obj/structure/plasticflaps,
+/turf/open/floor/plating,
+/area/quartermaster/storage)
+"eD" = (
+/obj/machinery/vr_sleeper,
+/turf/open/floor/plasteel,
+/area/storage/primary)
+"eE" = (
+/obj/docking_port/stationary{
+ dir = 8;
+ dwidth = 2;
+ height = 13;
+ id = "ferry_home";
+ name = "port bay 2";
+ width = 5
+ },
+/turf/open/space/basic,
+/area/space)
+"eF" = (
+/obj/machinery/power/apc{
+ dir = 4;
+ pixel_x = 24
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
+"eG" = (
+/obj/machinery/airalarm/unlocked{
+ pixel_x = -32
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
+"eH" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/storage/primary)
+"eI" = (
+/obj/effect/turf_decal/stripes/corner{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/storage/primary)
+"eJ" = (
+/obj/docking_port/stationary{
+ dir = 4;
+ dwidth = 4;
+ height = 7;
+ id = "supply_home";
+ name = "Cargo Bay";
+ width = 12
+ },
+/turf/open/space/basic,
+/area/space)
+"eK" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/storage/primary)
+"eL" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
+"eM" = (
+/obj/machinery/airalarm/unlocked{
+ pixel_x = 32
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
+"eN" = (
+/obj/machinery/conveyor{
+ dir = 9;
+ id = "cargounload"
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
+"eP" = (
+/obj/structure/cable{
+ icon_state = "0-2";
+ pixel_y = 1
+ },
+/obj/machinery/power/apc{
+ dir = 8;
+ pixel_x = -24
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
+"eQ" = (
+/obj/machinery/conveyor_switch/oneway{
+ dir = 8;
+ id = "cargounload"
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
+"eR" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
+ },
+/obj/machinery/door/airlock/external{
+ name = "Supply Dock Airlock"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
+"eS" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/obj/machinery/door/airlock/external{
+ name = "Supply Dock Airlock"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
+"eT" = (
+/obj/machinery/conveyor{
+ dir = 5;
+ id = "cargoload"
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
+"eU" = (
+/obj/structure/sign/warning/vacuum/external{
+ pixel_x = 32
+ },
+/turf/open/floor/plasteel,
+/area/medical/medbay)
+"eV" = (
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
+"eW" = (
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/storage/primary)
+"eX" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/quartermaster/miningoffice)
+"eY" = (
+/obj/machinery/conveyor{
+ dir = 8;
+ id = "cargounload"
+ },
+/obj/machinery/door/poddoor{
+ id = "cargounload";
+ name = "supply dock unloading door"
+ },
+/turf/open/floor/plating,
+/area/quartermaster/storage)
+"eZ" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
+"fa" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
+"fb" = (
+/obj/machinery/door/airlock/external{
+ name = "Departure Lounge Airlock"
+ },
+/obj/effect/turf_decal/delivery,
+/obj/structure/fans/tiny,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
+"fc" = (
+/obj/machinery/conveyor{
+ dir = 4;
+ id = "cargoload"
+ },
+/obj/machinery/door/poddoor{
+ id = "cargoload";
+ name = "supply dock loading door"
+ },
+/turf/open/floor/plating,
+/area/quartermaster/storage)
+"fd" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
+"fe" = (
+/obj/machinery/button/door{
+ dir = 2;
+ id = "cargounload";
+ layer = 4;
+ name = "Loading Doors";
+ pixel_x = 24;
+ pixel_y = 8
+ },
+/obj/machinery/button/door{
+ id = "cargoload";
+ layer = 4;
+ name = "Loading Doors";
+ pixel_x = 24;
+ pixel_y = -8
+ },
+/obj/machinery/computer/cargo{
+ dir = 8
+ },
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
+"ff" = (
+/obj/docking_port/stationary{
+ dir = 2;
+ dwidth = 11;
+ height = 15;
+ id = "whiteship_home";
+ name = "SS13: Auxiliary Dock, Station-Port";
+ width = 28
+ },
+/turf/open/space/basic,
+/area/space)
+"fg" = (
+/turf/open/space,
+/area/space)
+"fh" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/quartermaster/storage)
+"fi" = (
+/obj/docking_port/stationary{
+ dir = 1;
+ dwidth = 1;
+ height = 4;
+ roundstart_template = /datum/map_template/shuttle/escape_pod/default;
+ width = 3
+ },
+/obj/structure/fans/tiny/invisible,
+/turf/open/space/basic,
+/area/space)
+"fj" = (
+/obj/structure/sign/warning/docking,
+/turf/closed/wall/r_wall,
+/area/hallway/secondary/entry)
+"fl" = (
+/obj/machinery/conveyor{
+ dir = 4;
+ id = "cargoload"
+ },
+/obj/structure/plasticflaps,
+/turf/open/floor/plating,
+/area/quartermaster/storage)
+"fm" = (
+/obj/machinery/conveyor{
+ dir = 1;
+ id = "cargoload"
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
+"fn" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/sign/warning/vacuum/external,
+/turf/open/floor/plating,
+/area/hallway/secondary/entry)
+"fo" = (
+/obj/machinery/conveyor_switch/oneway{
+ id = "cargoload"
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
+"fp" = (
+/obj/docking_port/stationary{
+ dheight = 0;
+ dir = 2;
+ dwidth = 9;
+ height = 25;
+ id = "emergency_home";
+ name = "Runtimestation emergency evac bay";
+ width = 29
+ },
+/turf/open/space/basic,
+/area/space)
+"fq" = (
+/obj/machinery/camera/autoname{
+ dir = 4
+ },
+/obj/machinery/computer/cargo/express{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
+"fr" = (
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/machinery/computer/bounty{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
+"fs" = (
+/obj/machinery/door/airlock/external{
+ name = "Transport Airlock"
+ },
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/hallway/secondary/entry)
+"ft" = (
+/obj/machinery/door/airlock,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/hallway/primary/central)
+"fu" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
+"fv" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
+"fw" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/plasteel,
+/area/storage/primary)
+"fx" = (
+/obj/effect/turf_decal/plaque{
+ icon_state = "L1"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/storage/primary)
+"fy" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/effect/turf_decal/plaque{
+ icon_state = "L3"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/storage/primary)
+"fz" = (
+/obj/effect/turf_decal/plaque{
+ icon_state = "L5"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/storage/primary)
+"fA" = (
+/obj/effect/turf_decal/plaque{
+ icon_state = "L7"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/storage/primary)
+"fB" = (
+/obj/machinery/status_display{
+ name = "cargo display";
+ supply_display = 1
+ },
+/turf/closed/wall/r_wall,
+/area/quartermaster/storage)
+"fC" = (
+/obj/effect/turf_decal/plaque{
+ icon_state = "L9"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/storage/primary)
+"fD" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/machinery/camera/autoname,
+/obj/effect/turf_decal/plaque{
+ icon_state = "L11"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/storage/primary)
+"fE" = (
+/obj/effect/turf_decal/plaque{
+ icon_state = "L13"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/storage/primary)
+"fF" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 2
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/caution/stand_clear,
+/obj/structure/fans/tiny,
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
+"fG" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/storage/primary)
+"fH" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/storage/primary)
+"fI" = (
+/obj/machinery/door/airlock,
+/turf/open/floor/plating,
+/area/hallway/secondary/entry)
+"fJ" = (
+/obj/machinery/door/airlock,
+/turf/open/floor/plating,
+/area/hallway/secondary/exit/departure_lounge)
+"fK" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 5
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plasteel,
+/area/storage/primary)
+"fL" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plasteel,
+/area/medical/chemistry)
+"fM" = (
+/obj/structure/sign/directions/supply{
+ dir = 4;
+ pixel_x = 32
+ },
+/obj/structure/sign/directions/engineering{
+ dir = 1;
+ pixel_x = 32;
+ pixel_y = 7
+ },
+/obj/structure/sign/directions/evac{
+ pixel_x = 32;
+ pixel_y = -7
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
+"fN" = (
+/obj/machinery/door/airlock,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/storage/primary)
+"fO" = (
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
+"fP" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/machinery/keycard_auth{
+ pixel_y = 28
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
+"fQ" = (
+/obj/machinery/computer/communications,
+/obj/machinery/status_display{
+ pixel_y = 32
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
+"fR" = (
+/obj/machinery/door/airlock,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plating,
+/area/storage/primary)
+"fS" = (
+/obj/machinery/power/apc{
+ dir = 1;
+ pixel_y = 25
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
+"fT" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel,
+/area/science)
+"fU" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/airalarm/unlocked{
+ pixel_y = 23
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 6
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
+"fV" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
+"fW" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 9
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
+"fX" = (
+/obj/structure/sign/directions/supply{
+ dir = 4;
+ pixel_x = -32
+ },
+/obj/structure/sign/directions/engineering{
+ dir = 1;
+ pixel_x = -32;
+ pixel_y = 7
+ },
+/obj/structure/sign/directions/evac{
+ pixel_x = -32;
+ pixel_y = -7
+ },
+/turf/open/floor/plating,
+/area/storage/primary)
+"fY" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/storage)
+"fZ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 9
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
+"ga" = (
+/turf/closed/wall/r_wall,
+/area/hallway/secondary/exit/departure_lounge)
+"gb" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
+"gc" = (
+/obj/machinery/door/airlock/external{
+ name = "Auxiliary Airlock"
+ },
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/hallway/secondary/entry)
+"gd" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/science)
+"ge" = (
+/obj/structure/lattice,
+/turf/closed/wall/r_wall,
+/area/hallway/secondary/entry)
+"gf" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/hallway/secondary/exit/departure_lounge)
+"gg" = (
+/obj/structure/sign/directions/supply{
+ dir = 4;
+ pixel_x = 32
+ },
+/obj/structure/sign/directions/engineering{
+ dir = 1;
+ pixel_x = 32;
+ pixel_y = 7
+ },
+/obj/structure/sign/directions/evac{
+ pixel_x = 32;
+ pixel_y = -7
+ },
+/turf/open/floor/plating,
+/area/storage/primary)
+"gh" = (
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/machinery/computer/shuttle/mining{
+ dir = 2
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/miningoffice)
+"gi" = (
+/obj/structure/cable{
+ icon_state = "0-2";
+ pixel_y = 1
+ },
+/obj/machinery/power/apc{
+ dir = 1;
+ pixel_y = 25
+ },
+/obj/machinery/airalarm/unlocked{
+ pixel_x = 32
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/miningoffice)
+"gj" = (
+/obj/docking_port/stationary{
+ dir = 8;
+ dwidth = 3;
+ height = 5;
+ id = "mining_home";
+ name = "mining shuttle bay";
+ width = 7;
+ roundstart_template = /datum/map_template/shuttle/mining/box
+ },
+/turf/open/space/basic,
+/area/space)
+"gk" = (
+/obj/structure/sign/departments/evac,
+/turf/closed/wall/r_wall,
+/area/hallway/secondary/exit/departure_lounge)
+"gl" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/miningoffice)
+"gm" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 10
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/miningoffice)
+"gn" = (
+/obj/machinery/camera/autoname,
+/turf/open/floor/plasteel,
+/area/security/brig)
+"go" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel,
+/area/quartermaster/miningoffice)
+"gp" = (
+/obj/machinery/door/airlock,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel,
+/area/quartermaster/miningoffice)
+"gq" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
+"gr" = (
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 5
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
+"gs" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
+"gt" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
+"gu" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
+"gv" = (
+/obj/machinery/light,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
+"gw" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/obj/machinery/light,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
+"gx" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/light,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
+"gy" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/construction)
+"gz" = (
+/obj/structure/table,
+/obj/item/card/id/captains_spare,
+/obj/machinery/keycard_auth{
+ pixel_y = 28
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
+"gA" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
+"gB" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
+"gC" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
+"gD" = (
+/obj/machinery/camera/autoname{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/miningoffice)
+"gE" = (
+/obj/machinery/camera/autoname,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
+"gF" = (
+/obj/machinery/camera/autoname{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
+"gG" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/construction)
+"gH" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/camera/autoname,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
+"gI" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/machinery/camera/autoname,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/entry)
+"gJ" = (
+/obj/structure/table,
+/obj/item/storage/box/prisoner,
+/obj/item/paper/guides/jobs/security/labor_camp,
+/turf/open/floor/plasteel,
+/area/security/brig)
"gY" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
@@ -1332,10 +2507,6 @@
/obj/item/melee/transforming/energy/axe,
/turf/open/floor/plasteel,
/area/storage/primary)
-"kk" = (
-/obj/structure/table/optable,
-/turf/open/floor/plasteel,
-/area/maintenance/department/bridge)
"kn" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -1361,22 +2532,26 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/central)
-"lK" = (
-/obj/effect/landmark/observer_start,
-/turf/open/floor/plating,
-/area/storage/primary)
+"lg" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/engine/engineering)
+"lX" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
"ny" = (
/obj/structure/table,
/obj/item/storage/toolbox/syndicate,
/turf/open/floor/plasteel,
/area/storage/primary)
-"oL" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/vr_sleeper,
-/turf/open/floor/plasteel,
-/area/storage/primary)
"oV" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -1401,6 +2576,12 @@
},
/turf/open/floor/plasteel,
/area/medical/chemistry)
+"qn" = (
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plating,
+/area/maintenance/department/bridge)
"sE" = (
/obj/machinery/power/rtg/advanced,
/obj/structure/cable,
@@ -1437,33 +2618,19 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/central)
-"wT" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
-/area/medical/chemistry)
-"wV" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/vr_sleeper,
-/turf/open/floor/plasteel,
-/area/storage/primary)
-"yp" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
-/area/medical/chemistry)
"AP" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
+/obj/machinery/rnd/production/techfab/department,
/turf/open/floor/plasteel,
/area/science)
+"Bl" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/closed/wall/r_wall,
+/area/engine/gravity_generator)
"BB" = (
/obj/item/storage/backpack/duffelbag/syndie/surgery,
/obj/structure/table,
@@ -1487,11 +2654,6 @@
/obj/machinery/rnd/production/circuit_imprinter/department,
/turf/open/floor/plasteel,
/area/science)
-"CK" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden,
-/turf/open/floor/plasteel,
-/area/medical/chemistry)
"CV" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -1522,10 +2684,12 @@
/obj/structure/closet/secure_closet/RD,
/turf/open/floor/plasteel/blue/side,
/area/bridge)
-"JE" = (
-/obj/machinery/door/airlock,
-/turf/open/floor/plating,
-/area/hallway/primary/central)
+"JF" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/medical/chemistry)
"Ly" = (
/obj/machinery/chem_dispenser/chem_synthesizer,
/turf/open/floor/plasteel/dark,
@@ -1534,6 +2698,10 @@
/obj/machinery/rnd/production/protolathe/department,
/turf/open/floor/plasteel,
/area/science)
+"PI" = (
+/obj/structure/fans/tiny/invisible,
+/turf/open/space/basic,
+/area/space)
"Qt" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
@@ -1557,6 +2725,7 @@
/area/science)
"Ut" = (
/obj/structure/closet/secure_closet/medical3,
+/obj/item/healthanalyzer/advanced,
/turf/open/floor/plasteel,
/area/medical/medbay)
"Vg" = (
@@ -1569,6 +2738,13 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
+"VA" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/fans/tiny,
+/turf/open/floor/plasteel,
+/area/engine/engineering)
"WT" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -1639,6 +2815,44 @@ aa
aa
aa
aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
"}
(2,1,1) = {"
aa
@@ -1693,6 +2907,44 @@ aa
aa
aa
aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
"}
(3,1,1) = {"
aa
@@ -1747,6 +2999,44 @@ aa
aa
aa
aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
"}
(4,1,1) = {"
aa
@@ -1801,6 +3091,44 @@ aa
aa
aa
aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
"}
(5,1,1) = {"
aa
@@ -1855,6 +3183,44 @@ aa
aa
aa
aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
"}
(6,1,1) = {"
aa
@@ -1909,6 +3275,44 @@ aa
aa
aa
aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
"}
(7,1,1) = {"
aa
@@ -1963,6 +3367,44 @@ aa
aa
aa
aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
"}
(8,1,1) = {"
aa
@@ -2017,6 +3459,44 @@ aa
aa
aa
aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
"}
(9,1,1) = {"
aa
@@ -2027,42 +3507,80 @@ aa
aa
aa
aa
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -2081,42 +3599,80 @@ aa
aa
aa
aa
-ab
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ab
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -2135,42 +3691,80 @@ aa
aa
aa
aa
-ab
-ac
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-bY
-bY
-bY
-bY
-bY
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ac
-ab
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -2189,42 +3783,80 @@ aa
aa
aa
aa
-ab
-ac
-ad
-af
-af
-af
-af
-af
-af
-af
-af
-bz
-af
-af
-af
-af
-af
-bz
-af
-af
-af
-af
-af
-af
-af
-af
-af
-af
-af
-af
-af
-af
-af
-ad
-ac
-ab
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -2243,42 +3875,80 @@ aa
aa
aa
aa
-ab
-ac
-ad
-af
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-bA
-gd
-gd
-bA
-bZ
-bZ
-JE
-cN
-cN
-cN
-cN
-cN
-cN
-cN
-cN
-cN
-cN
-cN
-cN
-cN
-cN
-af
-ad
-ac
-ab
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -2297,42 +3967,80 @@ aa
aa
aa
aa
-ab
-ac
-ad
-af
-ah
-al
-aw
-aM
-aZ
-bj
-bs
-bB
-ca
-If
-In
-kn
-bO
-bO
-cO
-cW
-dm
-dy
-dy
-dy
-dX
-dy
-dy
-dy
-dy
-dm
-dK
-cN
-af
-ad
-ac
-ab
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -2351,42 +4059,80 @@ aa
aa
aa
aa
-ab
-ac
-ad
-af
-ah
-am
-ax
-aw
-ba
-bk
-bt
-fT
-cb
-AP
-pA
-kQ
-bN
-bN
-cP
-cX
-dn
-dn
-dn
-dn
-dn
-dn
-dn
-dn
-dn
-dn
-dL
-cN
-af
-ad
-ac
-ab
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -2405,8 +4151,2126 @@ aa
aa
aa
aa
-ab
-ac
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+gj
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(17,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+em
+eX
+ee
+eX
+em
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(18,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+em
+gh
+gl
+gD
+em
+dY
+dY
+dY
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+dY
+dY
+dY
+dY
+aa
+aa
+aa
+aa
+aa
+dY
+dY
+dY
+dY
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(19,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+em
+gi
+gm
+go
+gp
+ei
+gr
+dY
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+dY
+eh
+eh
+dY
+aa
+aa
+aa
+aa
+aa
+dY
+eh
+eh
+dY
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(20,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+db
+dY
+dY
+dY
+dY
+eh
+eq
+en
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+en
+eh
+eh
+en
+aa
+aa
+aa
+aa
+aa
+en
+eh
+eh
+gc
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(21,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+PI
+dj
+ed
+eh
+eq
+en
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+en
+eh
+eh
+en
+aa
+aa
+aa
+aa
+aa
+en
+eh
+eh
+gc
+ff
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(22,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+el
+aa
+aa
+aa
+fi
+dP
+ex
+eh
+eq
+eo
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+eo
+eh
+gv
+dY
+aa
+aa
+aa
+aa
+aa
+dY
+gI
+eh
+en
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(23,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+PI
+dV
+dY
+ej
+eq
+en
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+en
+eh
+eh
+en
+aa
+aa
+aa
+aa
+aa
+en
+eh
+eh
+en
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(24,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+fg
+aa
+db
+dY
+dY
+dY
+dY
+eh
+eq
+en
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+en
+eh
+gF
+fj
+aa
+aa
+aa
+aa
+aa
+fj
+eh
+eh
+en
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(25,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+dY
+gE
+eq
+dY
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+dY
+eh
+eh
+en
+aa
+aa
+aa
+aa
+aa
+en
+eh
+eh
+dY
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(26,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+dY
+gq
+gs
+dY
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+dY
+eh
+gw
+dY
+aa
+aa
+aa
+aa
+aa
+dY
+gB
+eh
+en
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(27,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+dY
+eh
+eq
+en
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+en
+eh
+ek
+en
+aa
+aa
+aa
+aa
+aa
+en
+ek
+eh
+dY
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(28,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+dY
+eh
+gt
+en
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+en
+eh
+ek
+en
+aa
+aa
+aa
+aa
+aa
+en
+ek
+eh
+en
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(29,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+dY
+ej
+gt
+eo
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+eo
+eh
+ek
+en
+aa
+aa
+aa
+aa
+aa
+en
+ek
+eh
+dY
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(30,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+dY
+eh
+gt
+en
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+en
+eh
+gx
+dY
+aa
+aa
+aa
+aa
+aa
+dY
+gC
+eh
+dY
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(31,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+eb
+aa
+aa
+dY
+eh
+gt
+dh
+aa
+aa
+aa
+ec
+aa
+aa
+aa
+dY
+eh
+ek
+en
+aa
+aa
+eE
+aa
+aa
+en
+ek
+eh
+dY
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(32,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ag
+ag
+bw
+di
+bw
+ag
+bw
+di
+bw
+ag
+ag
+eh
+gt
+dh
+dh
+en
+en
+en
+en
+en
+dY
+dY
+eh
+ek
+dY
+dY
+fn
+fs
+en
+dY
+dY
+ek
+eh
+dY
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(33,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ag
+dR
+aD
+aD
+bC
+de
+gJ
+aD
+aD
+dR
+ag
+eh
+gt
+eh
+eV
+eh
+eh
+eh
+eh
+eh
+eV
+eh
+eh
+ek
+eh
+eV
+eh
+eh
+eh
+eV
+eh
+ek
+eh
+dY
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(34,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ag
+gn
+aD
+aD
+bH
+ci
+df
+df
+df
+df
+eg
+ei
+gu
+ei
+ep
+ei
+ei
+ei
+ei
+eB
+eL
+eL
+eL
+fd
+eL
+eL
+eL
+eL
+eL
+eL
+eL
+fZ
+eh
+dY
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(35,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ag
+aD
+aD
+aD
+bT
+cI
+dg
+aD
+aD
+aD
+ag
+eh
+eh
+eh
+eq
+eh
+eh
+eh
+eh
+eF
+eM
+fM
+eh
+eh
+eh
+eh
+eh
+eh
+eh
+eh
+eh
+eh
+eh
+ge
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(36,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+dH
+ah
+ah
+ah
+ah
+ah
+ah
+ah
+bA
+bA
+bA
+bA
+bZ
+ft
+bZ
+cN
+cN
+cN
+cN
+cN
+cN
+ef
+ef
+cN
+cN
+cN
+cN
+cN
+cN
+fI
+dY
+dY
+ge
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(37,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+af
+ah
+al
+aw
+aM
+aZ
+bj
+bs
+bB
+ca
+If
+In
+kn
+fu
+bO
+cO
+cW
+dm
+dy
+dy
+dX
+dy
+dy
+gG
+dy
+dy
+dm
+dK
+cN
+af
+ad
+fg
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(38,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+af
+ah
+am
+ax
+aw
+ba
+bk
+bt
+fT
+cb
+AP
+pA
+kQ
+fv
+bN
+cP
+cX
+dn
+dn
+dn
+dn
+dn
+dn
+dn
+dn
+dn
+dn
+dL
+cN
+af
+ad
+fg
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(39,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
ad
af
ah
@@ -2439,8 +6303,44 @@ dL
cN
af
ad
-ac
-ab
+fg
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -2450,7 +6350,11 @@ aa
aa
aa
"}
-(17,1,1) = {"
+(40,1,1) = {"
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -2459,8 +6363,6 @@ aa
aa
aa
aa
-ab
-ac
ad
af
ah
@@ -2493,8 +6395,44 @@ dL
cN
af
ad
-ac
-ab
+fg
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -2504,7 +6442,11 @@ aa
aa
aa
"}
-(18,1,1) = {"
+(41,1,1) = {"
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -2513,8 +6455,6 @@ aa
aa
aa
aa
-ab
-ac
ad
af
ah
@@ -2547,8 +6487,44 @@ dL
cN
af
ad
-ac
-ab
+fg
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -2558,7 +6534,11 @@ aa
aa
aa
"}
-(19,1,1) = {"
+(42,1,1) = {"
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -2567,8 +6547,6 @@ aa
aa
aa
aa
-ab
-ac
ad
bY
ah
@@ -2601,8 +6579,44 @@ dL
cN
af
ad
-ac
-ab
+fg
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -2612,7 +6626,11 @@ aa
aa
aa
"}
-(20,1,1) = {"
+(43,1,1) = {"
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -2621,8 +6639,6 @@ aa
aa
aa
aa
-ab
-ac
ae
ab
ab
@@ -2637,7 +6653,7 @@ ce
cp
cv
cC
-bE
+lX
bE
cR
cY
@@ -2655,8 +6671,44 @@ dZ
cN
af
bY
-ac
-ab
+fg
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -2666,7 +6718,11 @@ aa
aa
aa
"}
-(21,1,1) = {"
+(44,1,1) = {"
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -2675,8 +6731,6 @@ aa
aa
aa
aa
-ab
-ac
ae
ab
ai
@@ -2709,8 +6763,44 @@ dL
cN
af
bY
-ac
-ab
+fg
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -2720,7 +6810,11 @@ aa
aa
aa
"}
-(22,1,1) = {"
+(45,1,1) = {"
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -2729,8 +6823,6 @@ aa
aa
aa
aa
-ab
-ac
ae
ab
ai
@@ -2763,1213 +6855,7 @@ dL
cN
af
bY
-ac
-ab
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-"}
-(23,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-ab
-ac
-ae
-ab
-ab
-ab
-aB
-ab
-ab
-ab
-bv
-bJ
-cf
-cq
-cw
-cD
-bE
-bE
-cQ
-cY
-dn
-dn
-dn
-dn
-dn
-dn
-dn
-dn
-dn
-dn
-dL
-cN
-af
-bY
-ac
-ab
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-"}
-(24,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-ab
-ac
-ae
-ac
-ac
-ab
-aB
-ab
-ac
-ac
-bv
-bK
-cf
-Iy
-bu
-cD
-bE
-bE
-cQ
-cY
-dn
-dn
-dn
-dn
-dn
-dn
-dn
-dn
-dn
-dn
-dL
-cN
-af
-bY
-ac
-ab
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-"}
-(25,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-ab
-ac
-ae
-ac
-ac
-aj
-aC
-aj
-ac
-ac
-bv
-bL
-cf
-cq
-bv
-cD
-bE
-bE
-cN
-cZ
-do
-dz
-dz
-dz
-dz
-dz
-dz
-dz
-dz
-do
-dM
-cN
-af
-bY
-ac
-ab
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-"}
-(26,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-ab
-ac
-ae
-ac
-ac
-aj
-Vy
-aj
-ac
-ac
-bu
-bM
-cg
-cr
-bu
-wb
-bE
-bE
-cS
-cS
-cS
-cS
-cS
-cS
-dG
-dG
-cS
-cS
-cS
-cS
-cS
-cS
-af
-bY
-ac
-ab
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-"}
-(27,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-ab
-ac
-ad
-bY
-aj
-aj
-WT
-aj
-aj
-aj
-bu
-bu
-ch
-cs
-cs
-cE
-bO
-bO
-cT
-da
-dp
-dl
-dl
-dl
-dl
-dl
-dl
-dl
-dl
-dp
-dl
-cS
-af
-bY
-ac
-ab
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-"}
-(28,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-ab
-ac
-ad
-af
-aj
-ap
-Vy
-aS
-bd
-bo
-aj
-hD
-cj
-ct
-Ce
-cF
-bE
-bE
-cS
-dl
-dl
-dl
-dl
-dl
-dl
-dl
-dl
-dl
-dl
-dl
-dl
-cS
-af
-bY
-ac
-ab
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-"}
-(29,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-ab
-ac
-ad
-af
-aj
-aq
-aE
-aT
-be
-be
-bx
-CV
-yp
-wT
-wT
-CK
-bN
-bN
-cU
-gM
-dc
-dA
-dl
-dD
-dc
-dc
-dA
-dl
-dD
-dc
-oL
-cS
-af
-bY
-ac
-ab
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-"}
-(30,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-ab
-ac
-ad
-af
-aj
-ar
-aF
-Vy
-bf
-bp
-aj
-bP
-pQ
-Ce
-Ce
-oV
-bE
-bE
-cS
-dd
-dq
-dB
-dl
-dE
-dH
-dI
-dB
-dl
-dE
-dJ
-ny
-cS
-af
-bY
-ac
-ab
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-"}
-(31,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-ab
-ac
-ad
-af
-ak
-ak
-ak
-aU
-ak
-ak
-ak
-bQ
-pQ
-Ce
-Ce
-vP
-bE
-Vg
-cS
-de
-dr
-dB
-dl
-dE
-dH
-dI
-dB
-dl
-dE
-dJ
-dO
-cS
-af
-bY
-ac
-ab
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-"}
-(32,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-ab
-ac
-ad
-af
-ak
-as
-aG
-aV
-bg
-bq
-ak
-bR
-pQ
-Ce
-Ce
-oV
-bE
-bE
-cV
-df
-ds
-dB
-dl
-dE
-dH
-dI
-dB
-dl
-dE
-dJ
-jU
-cS
-af
-bY
-ac
-ab
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-"}
-(33,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-ab
-ac
-ad
-af
-ak
-at
-aH
-aW
-bh
-br
-ak
-bS
-pQ
-Ce
-Ce
-oV
-bE
-bE
-cV
-dg
-dt
-dB
-lK
-dE
-dH
-dI
-dB
-dl
-dE
-dJ
-ea
-cS
-af
-ad
-ac
-ab
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-"}
-(34,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-ab
-ac
-ad
-af
-ak
-au
-aI
-aX
-aI
-aI
-ak
-Ly
-pQ
-Xg
-Ce
-oV
-bE
-bE
-cV
-dh
-du
-dB
-dl
-dE
-dH
-dI
-dB
-dl
-dE
-dJ
-dN
-cS
-af
-ad
-ac
-ab
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-"}
-(35,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-ab
-ac
-ad
-af
-ak
-av
-av
-av
-av
-av
-by
-by
-ck
-by
-cx
-cG
-cx
-by
-by
-di
-dv
-dB
-dl
-dE
-dH
-dI
-dB
-dl
-dE
-dJ
-dQ
-cS
-af
-ad
-ac
-ab
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-"}
-(36,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-ab
-ac
-ad
-af
-ak
-av
-aJ
-aK
-aL
-av
-by
-bU
-cl
-cu
-cu
-cH
-cu
-cJ
-by
-dj
-dw
-dB
-dl
-dE
-dH
-dI
-dB
-dl
-dE
-dJ
-dN
-cS
-af
-ad
-ac
-ab
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-"}
-(37,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-ab
-ac
-ad
-af
-ak
-dT
-aK
-av
-bi
-av
-by
-bV
-cm
-cm
-cm
-cm
-cm
-cK
-by
-dk
-dk
-dC
-dl
-dF
-dk
-dk
-dC
-dl
-dF
-dk
-wV
-cS
-af
-ad
-ac
-ab
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-"}
-(38,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-ab
-ac
-ad
-af
-ak
-av
-aL
-aK
-aJ
-av
-by
-bW
-cm
-cm
-cm
-cm
-cm
-cL
-by
-dl
-dl
-dl
-dl
-dl
-dl
-dl
-dl
-dl
-dl
-dl
-dl
-cS
-af
-ad
-ac
-ab
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-"}
-(39,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-ab
-ac
-ad
-af
-ak
-av
-av
-aY
-av
-av
-by
-bX
-cm
-cm
-cy
-Ut
-cm
-cM
-by
-dl
-dx
-dl
-dl
-dl
-dY
-dl
-dl
-dl
-dl
-dx
-dl
-cS
-af
-ad
-ac
-ab
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-"}
-(40,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-ab
-ac
-ad
-af
-ak
-ak
-ak
-ak
-ak
-ak
-by
-by
-cn
-by
-Qt
-by
-cm
-BB
-by
-cS
-cS
-cS
-cS
-cS
-cS
-vv
-cS
-cS
-cS
-cS
-cS
-cS
-af
-ad
-ac
-ab
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-"}
-(41,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-ab
-ac
-ad
-af
-af
-af
-af
-af
-af
-af
-af
-af
-af
-by
-cz
-by
-kk
-ei
-ad
-af
-af
-af
-af
-af
-af
-af
-af
-af
-af
-af
-af
-af
-af
-ad
-ac
-ab
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-"}
-(42,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-ab
-ac
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-by
-pI
-by
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ac
-ab
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-"}
-(43,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-ab
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ab
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-"}
-(44,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-"}
-(45,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+fg
aa
aa
aa
@@ -4029,6 +6915,44 @@ aa
aa
aa
aa
+ae
+ab
+ab
+ab
+aB
+ab
+ab
+ab
+bv
+bJ
+cf
+cq
+cw
+cD
+bE
+bE
+cQ
+cY
+dn
+dn
+dn
+dn
+dn
+dn
+dn
+dn
+dn
+dn
+dL
+cN
+af
+bY
+fg
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -4083,6 +7007,44 @@ aa
aa
aa
aa
+ae
+ac
+ac
+ab
+aB
+ab
+ac
+ac
+bv
+bK
+cf
+Iy
+bu
+cD
+bE
+bE
+cQ
+cY
+dn
+dn
+dn
+dn
+dn
+dn
+dn
+dn
+dn
+dn
+dL
+cN
+af
+bY
+fg
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -4137,6 +7099,44 @@ aa
aa
aa
aa
+ae
+ac
+ac
+aj
+aC
+aj
+ac
+ac
+bv
+bL
+cf
+cq
+bv
+cD
+bE
+bE
+cN
+cZ
+do
+dz
+dz
+gy
+dz
+dz
+gy
+dz
+dz
+do
+dM
+cN
+af
+bY
+fg
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -4191,6 +7191,44 @@ aa
aa
aa
aa
+ae
+ac
+ac
+aj
+VA
+aj
+ac
+ac
+bu
+bM
+cg
+cr
+bu
+wb
+bE
+bE
+cS
+cS
+cS
+cS
+cS
+cS
+dG
+dG
+cS
+cS
+cS
+cS
+cS
+cS
+fJ
+ga
+ga
+ga
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -4245,6 +7283,44 @@ aa
aa
aa
aa
+ad
+bY
+aj
+aj
+WT
+aj
+aj
+aj
+bu
+bu
+cd
+bu
+bu
+cE
+bE
+bE
+cS
+dd
+dp
+dl
+dl
+fX
+dE
+dB
+dl
+dl
+dl
+dp
+dE
+cS
+fO
+fO
+fO
+gf
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -4299,6 +7375,44 @@ aa
aa
aa
aa
+ad
+af
+aj
+ap
+Vy
+aS
+bd
+bo
+aj
+hD
+cj
+ct
+Ce
+cF
+bE
+bE
+cS
+dc
+dC
+dC
+dC
+dC
+eI
+eW
+dC
+dC
+dC
+dC
+eI
+vv
+fO
+fO
+fO
+fb
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -4353,6 +7467,3540 @@ aa
aa
aa
aa
+ad
+af
+aj
+aq
+aE
+aT
+be
+be
+bx
+CV
+fL
+ch
+cs
+cT
+cU
+cU
+da
+fK
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+eD
+cS
+fO
+fO
+fO
+gf
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(53,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+af
+aj
+ar
+aF
+lg
+bf
+bp
+aj
+bP
+pQ
+JF
+Ce
+oV
+bE
+bE
+cS
+fx
+dq
+dJ
+dJ
+dJ
+dI
+dJ
+dJ
+dJ
+dJ
+dJ
+ny
+cS
+fP
+fO
+fO
+fb
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(54,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+af
+ak
+ak
+ak
+aU
+ak
+ak
+ak
+bQ
+pQ
+Ce
+Ce
+vP
+bE
+Vg
+cS
+fy
+dr
+dJ
+dJ
+dJ
+dI
+dJ
+dJ
+dJ
+dJ
+dJ
+dO
+cS
+gz
+fO
+fO
+gf
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(55,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+af
+ak
+as
+aG
+aV
+bg
+bq
+ak
+bR
+pQ
+Ce
+Ce
+oV
+bE
+bE
+cV
+fz
+ds
+dJ
+dJ
+dJ
+dI
+dJ
+dJ
+dJ
+dJ
+dJ
+jU
+cS
+fQ
+fO
+fO
+ga
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(56,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+qn
+Bl
+at
+aH
+aW
+bh
+br
+ak
+bS
+pQ
+Ce
+Ce
+oV
+bE
+bE
+cV
+fA
+dt
+dJ
+dD
+dJ
+dI
+dJ
+dJ
+dJ
+dJ
+dJ
+ea
+cS
+fS
+fO
+fO
+gk
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(57,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+af
+ak
+au
+aI
+aX
+aI
+aI
+ak
+Ly
+pQ
+Xg
+Ce
+oV
+bE
+bE
+cV
+fC
+du
+dJ
+dJ
+dJ
+dI
+dJ
+dJ
+dJ
+dJ
+dJ
+dN
+cS
+fU
+gb
+fO
+ga
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(58,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+af
+ak
+av
+av
+av
+av
+av
+by
+by
+ck
+by
+cx
+cG
+cx
+by
+by
+fD
+dv
+dJ
+dJ
+dJ
+dI
+dJ
+dJ
+dJ
+dJ
+dJ
+dQ
+cS
+gA
+fO
+fO
+gf
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(59,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+af
+ak
+av
+aJ
+aK
+aL
+av
+by
+bU
+cl
+cu
+cu
+cH
+cu
+cJ
+by
+fE
+dw
+dJ
+dJ
+dJ
+dI
+dJ
+dJ
+dJ
+dJ
+dJ
+dN
+cS
+gH
+fO
+fO
+fb
+fp
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(60,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+af
+ak
+dT
+aK
+av
+bi
+av
+by
+bV
+cm
+cm
+cm
+cm
+cm
+cK
+by
+dA
+dJ
+dJ
+dJ
+dJ
+dF
+dJ
+dJ
+dJ
+dJ
+dJ
+eD
+cS
+fV
+fO
+fO
+gf
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(61,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+af
+ak
+av
+aL
+aK
+aJ
+av
+by
+bW
+cm
+cm
+cm
+cm
+cm
+cL
+by
+dk
+eH
+eH
+eH
+eH
+eK
+fw
+fG
+fG
+fG
+fG
+fH
+fR
+fW
+fO
+fO
+fb
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(62,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+af
+ak
+av
+av
+aY
+av
+av
+by
+bX
+cm
+eU
+cy
+Ut
+cm
+cM
+by
+dB
+dx
+dl
+dl
+gg
+ez
+dB
+dl
+dl
+dl
+dx
+dE
+cS
+fO
+fO
+fO
+gf
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(63,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+af
+ak
+ak
+ak
+ak
+ak
+ak
+by
+by
+cn
+by
+Qt
+by
+cm
+BB
+by
+cS
+cS
+cS
+cS
+cS
+fN
+vv
+cS
+cS
+cS
+cS
+cS
+cS
+ga
+ga
+ga
+ga
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(64,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+af
+af
+af
+af
+af
+af
+af
+af
+af
+af
+by
+cz
+by
+er
+es
+by
+eu
+eu
+eG
+eP
+fY
+eZ
+eu
+fq
+fr
+eu
+eu
+eu
+et
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(65,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+by
+pI
+by
+by
+by
+by
+eu
+eu
+eu
+eQ
+eu
+fa
+eu
+eu
+eu
+fo
+eu
+eu
+et
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(66,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+fg
+fg
+fg
+fg
+fg
+fg
+fg
+fg
+fg
+fg
+fg
+fg
+fg
+fg
+fg
+fg
+et
+ev
+eA
+eA
+eA
+eN
+ev
+fe
+ev
+eT
+fm
+fm
+ev
+et
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(67,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+et
+ey
+fh
+fh
+fh
+eY
+eR
+fh
+eR
+fc
+fh
+fh
+fh
+et
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(68,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ew
+eC
+fF
+fB
+fF
+fl
+ew
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(69,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+fh
+eY
+eS
+fh
+eS
+fc
+fh
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(70,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+eJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(71,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(72,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(73,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(74,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(75,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(76,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(77,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(78,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(79,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(80,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(81,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(82,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(83,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(84,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(85,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(86,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(87,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(88,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(89,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(90,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index 3b0f6c6ca7..f2f5176ecc 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -13642,7 +13642,7 @@
/turf/open/floor/grass,
/area/centcom/holding)
"Qm" = (
-/obj/singularity/wizard,
+/obj/singularity/wizard/mapped,
/turf/open/indestructible/binary,
/area/fabric_of_reality)
"Qu" = (
diff --git a/_maps/runtimestation.json b/_maps/runtimestation.json
index c363b67a05..f9333c65a2 100644
--- a/_maps/runtimestation.json
+++ b/_maps/runtimestation.json
@@ -1,5 +1,8 @@
{
"map_name": "Runtime Station",
"map_path": "map_files/debug",
- "map_file": "runtimestation.dmm"
+ "map_file": "runtimestation.dmm",
+ "shuttles": {
+ "cargo": "cargo_delta"
+ }
}
diff --git a/_maps/shuttles/arrival_box.dmm b/_maps/shuttles/arrival_box.dmm
index d117ca0f6b..2b245557a0 100644
--- a/_maps/shuttles/arrival_box.dmm
+++ b/_maps/shuttles/arrival_box.dmm
@@ -78,18 +78,18 @@
/turf/open/floor/plating,
/area/shuttle/arrival)
"p" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"q" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/obj/machinery/light/small{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"r" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
@@ -114,13 +114,13 @@
/turf/open/floor/plating/airless,
/area/shuttle/arrival)
"v" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"w" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/obj/machinery/light/small{
diff --git a/_maps/shuttles/arrival_delta.dmm b/_maps/shuttles/arrival_delta.dmm
index b19ad63eb1..08f34e1c23 100644
--- a/_maps/shuttles/arrival_delta.dmm
+++ b/_maps/shuttles/arrival_delta.dmm
@@ -211,14 +211,14 @@
},
/area/shuttle/arrival)
"u" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/shuttle/arrival)
"v" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/obj/effect/turf_decal/bot,
diff --git a/_maps/shuttles/arrival_omega.dmm b/_maps/shuttles/arrival_omega.dmm
index 04f19f60ea..b8fc632779 100644
--- a/_maps/shuttles/arrival_omega.dmm
+++ b/_maps/shuttles/arrival_omega.dmm
@@ -124,14 +124,14 @@
/turf/open/floor/plating,
/area/shuttle/arrival)
"q" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/shuttle/arrival)
"r" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/obj/effect/turf_decal/bot,
diff --git a/_maps/shuttles/arrival_pubby.dmm b/_maps/shuttles/arrival_pubby.dmm
index 3309533f35..a4308729b2 100644
--- a/_maps/shuttles/arrival_pubby.dmm
+++ b/_maps/shuttles/arrival_pubby.dmm
@@ -85,7 +85,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"o" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
diff --git a/_maps/shuttles/assault_pod_default.dmm b/_maps/shuttles/assault_pod_default.dmm
index 4574318e47..9414fa9f82 100644
--- a/_maps/shuttles/assault_pod_default.dmm
+++ b/_maps/shuttles/assault_pod_default.dmm
@@ -4,7 +4,7 @@
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/assault_pod)
"c" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium,
@@ -45,20 +45,20 @@
/turf/open/floor/plating,
/area/shuttle/assault_pod)
"D" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/obj/machinery/light{
dir = 1
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/assault_pod)
"H" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/assault_pod)
"L" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/obj/machinery/light,
diff --git a/_maps/shuttles/aux_base_default.dmm b/_maps/shuttles/aux_base_default.dmm
index e093d3c864..365c34cf50 100644
--- a/_maps/shuttles/aux_base_default.dmm
+++ b/_maps/shuttles/aux_base_default.dmm
@@ -78,7 +78,8 @@
/area/shuttle/auxillary_base)
"X" = (
/obj/machinery/camera{
- dir = 1
+ dir = 1;
+ network = list("auxbase")
},
/obj/structure/mining_shuttle_beacon,
/turf/open/floor/plating,
diff --git a/_maps/shuttles/aux_base_small.dmm b/_maps/shuttles/aux_base_small.dmm
index b29512d675..a7ddb70a9b 100644
--- a/_maps/shuttles/aux_base_small.dmm
+++ b/_maps/shuttles/aux_base_small.dmm
@@ -146,4 +146,4 @@ g
g
g
n
-"}
\ No newline at end of file
+"}
diff --git a/_maps/shuttles/emergency_asteroid.dmm b/_maps/shuttles/emergency_asteroid.dmm
index 258f9a76d3..b1d300574d 100644
--- a/_maps/shuttles/emergency_asteroid.dmm
+++ b/_maps/shuttles/emergency_asteroid.dmm
@@ -73,7 +73,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"av" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -82,7 +82,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"ax" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -94,7 +94,7 @@
/turf/closed/wall/mineral/titanium/interior,
/area/shuttle/escape)
"aE" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/obj/item/radio/intercom{
@@ -131,7 +131,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aK" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aL" = (
@@ -210,19 +210,19 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aY" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aZ" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ba" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
@@ -345,7 +345,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"bw" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/obj/item/radio/intercom{
@@ -355,7 +355,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"bx" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/obj/structure/extinguisher_cabinet{
@@ -427,7 +427,7 @@
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"bK" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/obj/machinery/light{
dir = 1
},
diff --git a/_maps/shuttles/emergency_bar.dmm b/_maps/shuttles/emergency_bar.dmm
index 4b0f919532..9b4776a011 100644
--- a/_maps/shuttles/emergency_bar.dmm
+++ b/_maps/shuttles/emergency_bar.dmm
@@ -138,7 +138,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aC" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aD" = (
@@ -214,7 +214,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aM" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium/brig,
diff --git a/_maps/shuttles/emergency_birdboat.dmm b/_maps/shuttles/emergency_birdboat.dmm
index 6719587d1e..d88e15fc94 100644
--- a/_maps/shuttles/emergency_birdboat.dmm
+++ b/_maps/shuttles/emergency_birdboat.dmm
@@ -53,11 +53,11 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"al" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"am" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/obj/machinery/light{
dir = 1
},
@@ -87,7 +87,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ar" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
@@ -157,7 +157,7 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"aE" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/plasteel/dark,
@@ -174,7 +174,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aH" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/plasteel/dark,
@@ -215,14 +215,14 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"aN" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/obj/structure/window/reinforced,
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"aO" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/obj/structure/window/reinforced,
@@ -232,7 +232,7 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"aP" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/obj/structure/window/reinforced{
dir = 1;
pixel_y = 2
@@ -255,13 +255,13 @@
/turf/open/floor/plasteel/white,
/area/shuttle/escape)
"aS" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"aT" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/obj/machinery/light,
@@ -286,7 +286,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aW" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"aX" = (
diff --git a/_maps/shuttles/emergency_box.dmm b/_maps/shuttles/emergency_box.dmm
index dff9ccb5d2..57ddc27a97 100644
--- a/_maps/shuttles/emergency_box.dmm
+++ b/_maps/shuttles/emergency_box.dmm
@@ -18,7 +18,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"ag" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
@@ -44,7 +44,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"am" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
@@ -53,7 +53,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ao" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
@@ -71,7 +71,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"ar" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/obj/structure/extinguisher_cabinet{
@@ -113,7 +113,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aA" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aB" = (
@@ -179,17 +179,17 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aJ" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aK" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aL" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium,
@@ -224,7 +224,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aS" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/obj/structure/window/reinforced{
@@ -233,7 +233,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aT" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/obj/structure/window/reinforced{
@@ -242,7 +242,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aU" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium,
diff --git a/_maps/shuttles/emergency_cere.dmm b/_maps/shuttles/emergency_cere.dmm
index d64c28b8b9..7b9e8cfa6c 100644
--- a/_maps/shuttles/emergency_cere.dmm
+++ b/_maps/shuttles/emergency_cere.dmm
@@ -251,11 +251,11 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"aS" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aT" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/obj/machinery/light{
dir = 1
},
@@ -283,7 +283,7 @@
},
/area/shuttle/escape)
"aW" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/obj/machinery/light{
dir = 1
},
@@ -294,7 +294,7 @@
},
/area/shuttle/escape)
"aX" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/mineral/plastitanium/brig{
icon_state = "darkred";
dir = 1;
@@ -302,7 +302,7 @@
},
/area/shuttle/escape)
"aY" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/mineral/plastitanium/brig{
icon_state = "darkred";
dir = 5;
@@ -330,7 +330,7 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"bd" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -339,7 +339,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"bf" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/obj/machinery/flasher{
@@ -381,7 +381,7 @@
/turf/open/floor/mech_bay_recharge_floor,
/area/shuttle/escape)
"bk" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -412,7 +412,7 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"bp" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/obj/machinery/flasher{
@@ -479,7 +479,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"bw" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium/brig{
@@ -489,7 +489,7 @@
},
/area/shuttle/escape)
"bx" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium/brig{
@@ -509,7 +509,7 @@
},
/area/shuttle/escape)
"bz" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium/brig{
@@ -658,7 +658,7 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"bW" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/obj/structure/window/reinforced{
@@ -667,7 +667,7 @@
/turf/open/floor/plasteel/neutral,
/area/shuttle/escape)
"bX" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/obj/structure/window/reinforced{
diff --git a/_maps/shuttles/emergency_clown.dmm b/_maps/shuttles/emergency_clown.dmm
index 2eaebaeb45..3dd4766d6a 100644
--- a/_maps/shuttles/emergency_clown.dmm
+++ b/_maps/shuttles/emergency_clown.dmm
@@ -18,7 +18,7 @@
/turf/open/floor/noslip,
/area/shuttle/escape)
"af" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/bluespace,
@@ -43,7 +43,7 @@
/turf/open/floor/noslip,
/area/shuttle/escape)
"aj" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/bluespace,
@@ -53,7 +53,7 @@
/turf/open/floor/bluespace,
/area/shuttle/escape)
"al" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/bluespace,
@@ -71,7 +71,7 @@
/turf/open/floor/noslip,
/area/shuttle/escape)
"ao" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/obj/structure/extinguisher_cabinet{
@@ -154,11 +154,11 @@
/turf/open/floor/noslip,
/area/shuttle/escape)
"aC" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/noslip,
/area/shuttle/escape)
"aD" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/noslip,
diff --git a/_maps/shuttles/emergency_cramped.dmm b/_maps/shuttles/emergency_cramped.dmm
index aa1b9f0f0d..457e23d84b 100644
--- a/_maps/shuttles/emergency_cramped.dmm
+++ b/_maps/shuttles/emergency_cramped.dmm
@@ -17,7 +17,7 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"e" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/plasteel/dark,
@@ -74,7 +74,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"n" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/plating,
@@ -109,7 +109,7 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"s" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/obj/structure/extinguisher_cabinet{
diff --git a/_maps/shuttles/emergency_delta.dmm b/_maps/shuttles/emergency_delta.dmm
index 256358bbae..24d59e5033 100644
--- a/_maps/shuttles/emergency_delta.dmm
+++ b/_maps/shuttles/emergency_delta.dmm
@@ -240,14 +240,14 @@
/turf/open/floor/plasteel/cmo,
/area/shuttle/escape)
"av" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/shuttle/escape)
"aw" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/obj/effect/turf_decal/bot,
@@ -326,7 +326,7 @@
},
/area/shuttle/escape)
"aH" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/obj/item/radio/intercom{
@@ -672,7 +672,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"bx" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"by" = (
@@ -709,12 +709,12 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"bC" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/shuttle/escape)
"bD" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/obj/machinery/status_display{
pixel_y = 32
},
@@ -722,7 +722,7 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"bE" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -771,7 +771,7 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"bM" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/obj/machinery/status_display{
@@ -780,7 +780,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"bN" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -823,7 +823,7 @@
},
/area/shuttle/escape)
"bU" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -1059,7 +1059,7 @@
},
/area/shuttle/escape)
"cB" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/obj/effect/turf_decal/bot,
@@ -1077,7 +1077,7 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"cG" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/obj/machinery/light,
diff --git a/_maps/shuttles/emergency_goon.dmm b/_maps/shuttles/emergency_goon.dmm
index 6f31ce1d40..57f0b23d9f 100644
--- a/_maps/shuttles/emergency_goon.dmm
+++ b/_maps/shuttles/emergency_goon.dmm
@@ -74,7 +74,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"s" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
@@ -154,7 +154,7 @@
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"H" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -201,7 +201,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"S" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/obj/machinery/light{
@@ -210,7 +210,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"T" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/obj/machinery/light/small{
diff --git a/_maps/shuttles/emergency_meta.dmm b/_maps/shuttles/emergency_meta.dmm
index 29b8661ae2..faf70072d3 100644
--- a/_maps/shuttles/emergency_meta.dmm
+++ b/_maps/shuttles/emergency_meta.dmm
@@ -65,7 +65,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ar" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"as" = (
@@ -74,7 +74,7 @@
name = "Station Intercom (General)";
pixel_y = 27
},
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/obj/machinery/light{
dir = 1
},
@@ -220,7 +220,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aE" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium,
@@ -314,7 +314,7 @@
name = "Station Intercom (General)";
pixel_y = -31
},
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/obj/machinery/light,
@@ -362,7 +362,7 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"bd" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/plasteel/floorgrime,
@@ -377,13 +377,13 @@
/turf/open/floor/plasteel/floorgrime,
/area/shuttle/escape)
"bh" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"bi" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"bj" = (
@@ -436,7 +436,7 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"bs" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -713,7 +713,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"bV" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/obj/machinery/light{
dir = 1
},
@@ -816,7 +816,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ca" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/obj/machinery/light,
@@ -835,7 +835,7 @@
/turf/open/floor/plasteel/floorgrime,
/area/shuttle/escape)
"cd" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/obj/machinery/light{
diff --git a/_maps/shuttles/emergency_mini.dmm b/_maps/shuttles/emergency_mini.dmm
index a0b6ce6db9..42650f6fd1 100644
--- a/_maps/shuttles/emergency_mini.dmm
+++ b/_maps/shuttles/emergency_mini.dmm
@@ -40,7 +40,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"h" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -49,7 +49,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"j" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -68,7 +68,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"m" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/obj/machinery/light/small{
@@ -116,25 +116,25 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"v" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"w" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"x" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"y" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/obj/machinery/light{
@@ -149,7 +149,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"A" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/obj/machinery/light{
@@ -171,7 +171,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"C" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"D" = (
@@ -218,7 +218,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"K" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
@@ -231,7 +231,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"M" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
@@ -261,7 +261,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"R" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"S" = (
diff --git a/_maps/shuttles/emergency_narnar.dmm b/_maps/shuttles/emergency_narnar.dmm
index aaa9c861ce..9d6c5f1e4d 100644
--- a/_maps/shuttles/emergency_narnar.dmm
+++ b/_maps/shuttles/emergency_narnar.dmm
@@ -15,7 +15,7 @@
/turf/open/floor/plasteel/cult,
/area/shuttle/escape)
"e" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/plasteel/cult,
@@ -40,7 +40,7 @@
/turf/open/floor/plasteel/cult,
/area/shuttle/escape)
"i" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/plasteel/cult,
@@ -49,7 +49,7 @@
/turf/open/floor/plasteel/cult,
/area/shuttle/escape)
"k" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/plasteel/cult,
@@ -67,7 +67,7 @@
/turf/open/floor/plasteel/cult,
/area/shuttle/escape)
"n" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/obj/structure/extinguisher_cabinet{
diff --git a/_maps/shuttles/emergency_omega.dmm b/_maps/shuttles/emergency_omega.dmm
index 0debf2ad0f..570cb99f0a 100644
--- a/_maps/shuttles/emergency_omega.dmm
+++ b/_maps/shuttles/emergency_omega.dmm
@@ -12,7 +12,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"ad" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/obj/machinery/newscaster/security_unit{
@@ -24,11 +24,11 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"ae" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"af" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/obj/item/radio/intercom{
@@ -67,7 +67,7 @@
},
/area/shuttle/escape)
"ak" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/obj/machinery/status_display{
@@ -240,7 +240,7 @@
/turf/open/floor/plasteel,
/area/shuttle/escape)
"aD" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/obj/machinery/status_display{
@@ -253,7 +253,7 @@
/turf/open/floor/plasteel/neutral,
/area/shuttle/escape)
"aF" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/obj/effect/turf_decal/bot,
@@ -356,14 +356,14 @@
/turf/open/floor/grass,
/area/shuttle/escape)
"aJ" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/shuttle/escape)
"aK" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/obj/effect/turf_decal/bot,
@@ -384,7 +384,7 @@
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/escape)
"aN" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/obj/effect/turf_decal/bot,
diff --git a/_maps/shuttles/emergency_pubby.dmm b/_maps/shuttles/emergency_pubby.dmm
index 136cabe9db..47b891cfd0 100644
--- a/_maps/shuttles/emergency_pubby.dmm
+++ b/_maps/shuttles/emergency_pubby.dmm
@@ -222,7 +222,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aJ" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/plasteel/darkpurple/side{
dir = 9
},
@@ -235,7 +235,7 @@
/turf/open/floor/plasteel/darkgreen/side,
/area/shuttle/escape)
"aL" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/plasteel/darkpurple/side{
dir = 5
},
@@ -253,7 +253,7 @@
},
/area/shuttle/escape)
"aO" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/obj/structure/window/reinforced,
@@ -262,14 +262,14 @@
},
/area/shuttle/escape)
"aP" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/obj/structure/window/reinforced,
/turf/open/floor/plasteel/darkpurple/side,
/area/shuttle/escape)
"aQ" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/obj/structure/window/reinforced,
@@ -283,7 +283,7 @@
},
/area/shuttle/escape)
"aS" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/plasteel/darkpurple/side{
@@ -291,7 +291,7 @@
},
/area/shuttle/escape)
"aT" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/obj/machinery/light{
dir = 1
},
@@ -300,7 +300,7 @@
},
/area/shuttle/escape)
"aU" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/plasteel/darkpurple/side{
@@ -328,7 +328,7 @@
/turf/open/floor/plasteel/cmo,
/area/shuttle/escape)
"aY" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/obj/machinery/light,
@@ -370,7 +370,7 @@
/turf/open/floor/plasteel/cafeteria,
/area/shuttle/escape)
"be" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/plasteel/cmo,
/area/shuttle/escape)
"bf" = (
@@ -424,7 +424,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"bo" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/obj/structure/window/reinforced{
dir = 1;
pixel_y = 2
@@ -432,7 +432,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"bq" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/plating,
@@ -466,13 +466,13 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"bw" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"bx" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -518,7 +518,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"bG" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/obj/machinery/light,
diff --git a/_maps/shuttles/emergency_raven.dmm b/_maps/shuttles/emergency_raven.dmm
index edd86c5ec6..d5ca59c4f2 100644
--- a/_maps/shuttles/emergency_raven.dmm
+++ b/_maps/shuttles/emergency_raven.dmm
@@ -420,7 +420,7 @@
},
/area/shuttle/escape)
"bd" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/plastitanium/brig{
@@ -572,7 +572,7 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"bx" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/plastitanium/brig{
@@ -660,7 +660,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"bK" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/plasteel/darkgreen/side{
dir = 8
},
@@ -679,7 +679,7 @@
},
/area/shuttle/escape)
"bN" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/plasteel/darkgreen/side,
@@ -815,7 +815,7 @@
},
/area/shuttle/escape)
"bX" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/obj/structure/window/reinforced{
@@ -824,7 +824,7 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"bY" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/obj/structure/window/reinforced{
@@ -833,27 +833,27 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"bZ" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/obj/structure/window/reinforced,
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"ca" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/obj/structure/window/reinforced{
dir = 1
},
/turf/open/floor/plasteel/dark,
/area/shuttle/escape)
"cb" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/plasteel/darkgreen/side{
dir = 1
},
/area/shuttle/escape)
"cc" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/plasteel/darkgreen/side,
diff --git a/_maps/shuttles/emergency_russiafightpit.dmm b/_maps/shuttles/emergency_russiafightpit.dmm
index d0b8f7ca80..3e5568279b 100644
--- a/_maps/shuttles/emergency_russiafightpit.dmm
+++ b/_maps/shuttles/emergency_russiafightpit.dmm
@@ -18,7 +18,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"af" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
@@ -43,7 +43,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aj" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
@@ -76,7 +76,7 @@
pixel_x = 6;
pixel_y = -24
},
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
@@ -91,7 +91,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aq" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ar" = (
@@ -102,7 +102,7 @@
pixel_y = -6;
req_access_txt = "19"
},
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/obj/machinery/button/door{
id = "bearsbearsbears";
name = "release bears";
@@ -131,7 +131,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"av" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aw" = (
@@ -204,7 +204,7 @@
/turf/open/floor/mineral/plastitanium,
/area/shuttle/escape)
"aJ" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium,
@@ -238,7 +238,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"aP" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -315,7 +315,7 @@
/turf/open/floor/engine,
/area/shuttle/escape)
"bc" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/obj/structure/window/reinforced{
@@ -327,7 +327,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium,
@@ -341,7 +341,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium,
@@ -350,13 +350,13 @@
/obj/structure/window/reinforced{
dir = 8
},
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/escape)
"bh" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium,
@@ -551,7 +551,7 @@
/turf/open/floor/mineral/plastitanium,
/area/shuttle/escape)
"bO" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/obj/machinery/light/small{
diff --git a/_maps/shuttles/emergency_scrapheap.dmm b/_maps/shuttles/emergency_scrapheap.dmm
index cb2b7517b5..e95fcb507c 100644
--- a/_maps/shuttles/emergency_scrapheap.dmm
+++ b/_maps/shuttles/emergency_scrapheap.dmm
@@ -109,7 +109,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"at" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"au" = (
@@ -178,7 +178,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"aE" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -188,7 +188,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aG" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aH" = (
@@ -222,7 +222,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"aL" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
@@ -231,7 +231,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
@@ -266,7 +266,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"aT" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/obj/structure/extinguisher_cabinet{
@@ -395,14 +395,14 @@
/turf/open/floor/plating/airless,
/area/shuttle/escape)
"bo" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/obj/machinery/light{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"bp" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/obj/machinery/light{
diff --git a/_maps/shuttles/emergency_supermatter.dmm b/_maps/shuttles/emergency_supermatter.dmm
index 0dc057963c..ce8842a41b 100644
--- a/_maps/shuttles/emergency_supermatter.dmm
+++ b/_maps/shuttles/emergency_supermatter.dmm
@@ -21,14 +21,14 @@
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"ah" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"ai" = (
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/escape)
"aj" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/yellow,
@@ -73,7 +73,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"ar" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium/yellow,
@@ -94,7 +94,7 @@
/turf/open/floor/plating,
/area/shuttle/escape)
"av" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium/yellow,
@@ -237,7 +237,7 @@
/turf/open/floor/plating/airless,
/area/shuttle/escape)
"bb" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
diff --git a/_maps/shuttles/emergency_wabbajack.dmm b/_maps/shuttles/emergency_wabbajack.dmm
index 9bdb49064f..34f1661020 100644
--- a/_maps/shuttles/emergency_wabbajack.dmm
+++ b/_maps/shuttles/emergency_wabbajack.dmm
@@ -38,7 +38,7 @@
/turf/open/floor/plasteel/cult,
/area/shuttle/escape)
"ak" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -47,7 +47,7 @@
/turf/open/floor/mineral/plastitanium/brig,
/area/shuttle/escape)
"am" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -92,7 +92,7 @@
pixel_x = -24;
pixel_y = -6
},
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/plastitanium/brig,
@@ -102,11 +102,11 @@
/turf/open/floor/plasteel/cult,
/area/shuttle/escape)
"av" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aw" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium,
@@ -182,13 +182,13 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"aI" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"aJ" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/obj/structure/window/reinforced{
@@ -352,7 +352,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"bm" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/obj/machinery/light/small{
@@ -365,7 +365,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"bo" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/obj/machinery/light/small{
diff --git a/_maps/shuttles/escape_pod_default.dmm b/_maps/shuttles/escape_pod_default.dmm
index c2625b0e57..8dcccf9326 100644
--- a/_maps/shuttles/escape_pod_default.dmm
+++ b/_maps/shuttles/escape_pod_default.dmm
@@ -3,7 +3,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/pod_1)
"G" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/obj/machinery/status_display{
@@ -32,7 +32,7 @@
/turf/open/floor/plating,
/area/shuttle/pod_1)
"U" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/obj/item/radio/intercom{
diff --git a/_maps/shuttles/escape_pod_large.dmm b/_maps/shuttles/escape_pod_large.dmm
index 6a36801db9..49f2f44e1e 100644
--- a/_maps/shuttles/escape_pod_large.dmm
+++ b/_maps/shuttles/escape_pod_large.dmm
@@ -1,6 +1,6 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"h" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/obj/item/storage/pod{
@@ -17,7 +17,7 @@
/turf/open/floor/plating,
/area/shuttle/pod_1)
"A" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/obj/item/radio/intercom{
@@ -36,13 +36,13 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"H" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"J" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/obj/machinery/status_display{
@@ -51,13 +51,13 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"L" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"M" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/obj/machinery/status_display{
diff --git a/_maps/shuttles/ferry_base.dmm b/_maps/shuttles/ferry_base.dmm
index 36a54e54bc..f7e717ccb8 100644
--- a/_maps/shuttles/ferry_base.dmm
+++ b/_maps/shuttles/ferry_base.dmm
@@ -24,7 +24,7 @@
/turf/closed/wall/mineral/titanium/interior,
/area/shuttle/transport)
"h" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
@@ -36,7 +36,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/transport)
"j" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/transport)
"k" = (
@@ -64,7 +64,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/transport)
"q" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
diff --git a/_maps/shuttles/ferry_fancy.dmm b/_maps/shuttles/ferry_fancy.dmm
index 432791c936..e21bd7c5eb 100644
--- a/_maps/shuttles/ferry_fancy.dmm
+++ b/_maps/shuttles/ferry_fancy.dmm
@@ -27,7 +27,7 @@
/turf/open/floor/plating/airless,
/area/shuttle/transport)
"g" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/pod/dark,
/area/shuttle/transport)
"h" = (
@@ -87,7 +87,7 @@
/turf/open/floor/plating/airless,
/area/shuttle/transport)
"p" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/pod/dark,
diff --git a/_maps/shuttles/ferry_lighthouse.dmm b/_maps/shuttles/ferry_lighthouse.dmm
index 21d3bd3413..21f8a58e44 100644
--- a/_maps/shuttles/ferry_lighthouse.dmm
+++ b/_maps/shuttles/ferry_lighthouse.dmm
@@ -68,7 +68,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/transport)
"ar" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/wood,
/area/shuttle/transport)
"as" = (
@@ -137,7 +137,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/transport)
"aJ" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/transport)
"aK" = (
@@ -204,7 +204,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/transport)
"aW" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
diff --git a/_maps/shuttles/ferry_meat.dmm b/_maps/shuttles/ferry_meat.dmm
index 334df92b55..22d83d8d01 100644
--- a/_maps/shuttles/ferry_meat.dmm
+++ b/_maps/shuttles/ferry_meat.dmm
@@ -15,7 +15,7 @@
/turf/closed/wall/mineral/titanium/interior,
/area/shuttle/transport)
"f" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/plasteel/freezer,
@@ -90,7 +90,7 @@
/area/shuttle/transport)
"n" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/plasteel/freezer,
/area/shuttle/transport)
"o" = (
@@ -131,7 +131,7 @@
/turf/open/floor/plasteel/freezer,
/area/shuttle/transport)
"w" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/plasteel/freezer,
diff --git a/_maps/shuttles/infiltrator_basic.dmm b/_maps/shuttles/infiltrator_basic.dmm
index b1feae232e..0add06a7ff 100644
--- a/_maps/shuttles/infiltrator_basic.dmm
+++ b/_maps/shuttles/infiltrator_basic.dmm
@@ -176,7 +176,7 @@
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/syndicate/hallway)
"aC" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4;
name = "tactical chair"
},
@@ -188,7 +188,7 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/syndicate/hallway)
"aE" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8;
name = "tactical chair"
},
@@ -206,7 +206,7 @@
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/syndicate/eva)
"aH" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4;
name = "tactical chair"
},
@@ -218,7 +218,7 @@
},
/area/shuttle/syndicate/hallway)
"aI" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8;
name = "tactical chair"
},
@@ -256,7 +256,7 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/syndicate/eva)
"aO" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4;
name = "tactical chair"
},
@@ -318,7 +318,7 @@
},
/area/shuttle/syndicate/hallway)
"aX" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4;
name = "tactical chair"
},
diff --git a/_maps/shuttles/labour_box.dmm b/_maps/shuttles/labour_box.dmm
index 636458a64c..fe9756ef33 100644
--- a/_maps/shuttles/labour_box.dmm
+++ b/_maps/shuttles/labour_box.dmm
@@ -86,7 +86,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/labor)
"o" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/obj/machinery/flasher{
diff --git a/_maps/shuttles/labour_delta.dmm b/_maps/shuttles/labour_delta.dmm
index 6df69ba0f6..aeb2841683 100644
--- a/_maps/shuttles/labour_delta.dmm
+++ b/_maps/shuttles/labour_delta.dmm
@@ -120,7 +120,7 @@
/turf/open/floor/plasteel,
/area/shuttle/labor)
"q" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
@@ -133,7 +133,7 @@
/turf/open/floor/plasteel,
/area/shuttle/labor)
"s" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/obj/machinery/flasher{
diff --git a/_maps/shuttles/mining_box.dmm b/_maps/shuttles/mining_box.dmm
index b7354b8d89..2f262cae2b 100644
--- a/_maps/shuttles/mining_box.dmm
+++ b/_maps/shuttles/mining_box.dmm
@@ -18,7 +18,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/mining)
"f" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
diff --git a/_maps/shuttles/mining_delta.dmm b/_maps/shuttles/mining_delta.dmm
index 99bdb64aae..920a754e45 100644
--- a/_maps/shuttles/mining_delta.dmm
+++ b/_maps/shuttles/mining_delta.dmm
@@ -47,7 +47,7 @@
/turf/open/floor/plasteel,
/area/shuttle/mining)
"g" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/plasteel/neutral,
@@ -116,7 +116,7 @@
/turf/open/floor/plasteel/white,
/area/shuttle/mining)
"n" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/obj/effect/decal/cleanable/dirt,
@@ -126,7 +126,7 @@
/turf/open/floor/plasteel,
/area/shuttle/mining)
"o" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/obj/effect/decal/cleanable/dirt,
@@ -139,7 +139,7 @@
/turf/open/floor/plasteel,
/area/shuttle/mining)
"p" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/obj/effect/decal/cleanable/dirt,
diff --git a/_maps/shuttles/pirate_default.dmm b/_maps/shuttles/pirate_default.dmm
index efd49c8908..59ce3014af 100644
--- a/_maps/shuttles/pirate_default.dmm
+++ b/_maps/shuttles/pirate_default.dmm
@@ -39,7 +39,7 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/pirate)
"ag" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/plasteel/dark,
@@ -71,7 +71,7 @@
pixel_y = -24;
req_access = null
},
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/obj/effect/decal/cleanable/dirt,
@@ -82,7 +82,7 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/pirate)
"an" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
@@ -413,7 +413,7 @@
pixel_y = -24;
req_access = null
},
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/obj/effect/decal/cleanable/dirt,
diff --git a/_maps/shuttles/ruin_caravan_victim.dmm b/_maps/shuttles/ruin_caravan_victim.dmm
index aa42b30b9f..8f65015d55 100644
--- a/_maps/shuttles/ruin_caravan_victim.dmm
+++ b/_maps/shuttles/ruin_caravan_victim.dmm
@@ -156,7 +156,7 @@
},
/area/shuttle/caravan/freighter1)
"gw" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
diff --git a/_maps/shuttles/ruin_syndicate_dropship.dmm b/_maps/shuttles/ruin_syndicate_dropship.dmm
index 696a99e30a..ac9a2cd680 100644
--- a/_maps/shuttles/ruin_syndicate_dropship.dmm
+++ b/_maps/shuttles/ruin_syndicate_dropship.dmm
@@ -88,7 +88,7 @@
/turf/open/floor/plating,
/area/shuttle/caravan/syndicate3)
"hF" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/obj/machinery/light/small{
dir = 8
},
@@ -104,7 +104,7 @@
/turf/open/floor/pod/dark,
/area/shuttle/caravan/syndicate3)
"ka" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/obj/machinery/light/small{
@@ -169,7 +169,7 @@
/turf/open/floor/plating,
/area/shuttle/caravan/syndicate3)
"rV" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/obj/effect/decal/cleanable/dirt,
@@ -185,7 +185,7 @@
},
/area/shuttle/caravan/syndicate3)
"sn" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/pod/dark,
/area/shuttle/caravan/syndicate3)
@@ -247,7 +247,7 @@
/turf/open/floor/plasteel/darkred/side,
/area/shuttle/caravan/syndicate3)
"Cm" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/obj/machinery/firealarm{
@@ -278,7 +278,7 @@
},
/area/shuttle/caravan/syndicate3)
"EO" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/obj/machinery/airalarm/syndicate{
pixel_y = 24
},
diff --git a/_maps/shuttles/ruin_syndicate_fighter.dmm b/_maps/shuttles/ruin_syndicate_fighter.dmm
index a9cf2a45b5..1f8c264079 100644
--- a/_maps/shuttles/ruin_syndicate_fighter.dmm
+++ b/_maps/shuttles/ruin_syndicate_fighter.dmm
@@ -1,6 +1,6 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aA" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/obj/machinery/turretid{
diff --git a/_maps/shuttles/snowdin_excavation.dmm b/_maps/shuttles/snowdin_excavation.dmm
new file mode 100644
index 0000000000..e0b53a78b1
--- /dev/null
+++ b/_maps/shuttles/snowdin_excavation.dmm
@@ -0,0 +1,90 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/machinery/door/airlock/public/glass{
+ name = "Elevator Access"
+ },
+/obj/docking_port/mobile/elevator{
+ dir = 4;
+ height = 6;
+ id = "snowdin_excavation";
+ name = "excavation elevator";
+ timid = 1;
+ width = 6
+ },
+/turf/open/floor/plating,
+/area/shuttle/snowdin/elevator1)
+"b" = (
+/obj/structure/window/reinforced/fulltile/ice,
+/obj/structure/grille,
+/turf/open/floor/plating,
+/area/shuttle/snowdin/elevator1)
+"c" = (
+/obj/machinery/door/airlock/public/glass{
+ name = "Elevator Access"
+ },
+/turf/open/floor/plating,
+/area/shuttle/snowdin/elevator1)
+"d" = (
+/turf/closed/wall/ice,
+/area/shuttle/snowdin/elevator1)
+"e" = (
+/turf/open/floor/engine,
+/area/shuttle/snowdin/elevator1)
+"f" = (
+/obj/machinery/computer/shuttle/snowdin/mining{
+ dir = 2;
+ name = "Excavation Elevator Console";
+ possible_destinations = "snowdin_excavation_top;snowdin_excavation_down";
+ shuttleId = "snowdin_excavation"
+ },
+/turf/open/floor/engine,
+/area/shuttle/snowdin/elevator1)
+
+(1,1,1) = {"
+d
+b
+c
+a
+b
+d
+"}
+(2,1,1) = {"
+b
+e
+e
+e
+e
+b
+"}
+(3,1,1) = {"
+c
+e
+e
+e
+e
+c
+"}
+(4,1,1) = {"
+c
+e
+e
+e
+e
+c
+"}
+(5,1,1) = {"
+b
+f
+e
+e
+e
+b
+"}
+(6,1,1) = {"
+d
+b
+c
+c
+b
+d
+"}
diff --git a/_maps/shuttles/snowdin_mining.dmm b/_maps/shuttles/snowdin_mining.dmm
new file mode 100644
index 0000000000..cd8d37d703
--- /dev/null
+++ b/_maps/shuttles/snowdin_mining.dmm
@@ -0,0 +1,86 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/machinery/door/airlock/public/glass{
+ name = "Elevator Access"
+ },
+/obj/docking_port/mobile/elevator{
+ dir = 4;
+ dwidth = 2;
+ height = 5;
+ id = "snowdin_mining";
+ name = "mining elevator";
+ timid = 1;
+ width = 5
+ },
+/turf/open/floor/plating,
+/area/shuttle/snowdin/elevator2)
+"b" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/firedoor,
+/turf/open/floor/plating,
+/area/shuttle/snowdin/elevator2)
+"c" = (
+/obj/machinery/door/airlock/public/glass{
+ name = "Elevator Access"
+ },
+/turf/open/floor/plating,
+/area/shuttle/snowdin/elevator2)
+"d" = (
+/turf/closed/wall,
+/area/shuttle/snowdin/elevator2)
+"e" = (
+/obj/machinery/computer/shuttle/snowdin/mining,
+/turf/open/floor/engine,
+/area/shuttle/snowdin/elevator2)
+"f" = (
+/turf/open/floor/engine,
+/area/shuttle/snowdin/elevator2)
+"g" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/open/floor/engine,
+/area/shuttle/snowdin/elevator2)
+"i" = (
+/obj/machinery/light/small,
+/turf/open/floor/engine,
+/area/shuttle/snowdin/elevator2)
+"j" = (
+/turf/closed/wall/rust,
+/area/shuttle/snowdin/elevator2)
+
+(1,1,1) = {"
+j
+b
+a
+b
+d
+"}
+(2,1,1) = {"
+b
+e
+f
+i
+b
+"}
+(3,1,1) = {"
+c
+f
+f
+f
+c
+"}
+(4,1,1) = {"
+b
+g
+f
+f
+b
+"}
+(5,1,1) = {"
+d
+b
+c
+b
+j
+"}
diff --git a/_maps/shuttles/whiteship_box.dmm b/_maps/shuttles/whiteship_box.dmm
index f7cd8ad529..6b56e1a6a0 100644
--- a/_maps/shuttles/whiteship_box.dmm
+++ b/_maps/shuttles/whiteship_box.dmm
@@ -137,7 +137,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"aJ" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium,
@@ -179,7 +179,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"aS" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/obj/effect/decal/remains/human,
@@ -232,7 +232,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"bd" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"bf" = (
diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm
index 9888026e31..f8e366950a 100644
--- a/_maps/shuttles/whiteship_meta.dmm
+++ b/_maps/shuttles/whiteship_meta.dmm
@@ -753,7 +753,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"bo" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/obj/effect/decal/cleanable/dirt{
desc = "A thin layer of dust coating the floor.";
name = "dust"
@@ -827,7 +827,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/abandoned)
"bu" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/obj/effect/decal/cleanable/dirt{
@@ -871,7 +871,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"by" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/obj/effect/decal/cleanable/dirt{
@@ -1022,7 +1022,7 @@
/turf/open/floor/mineral/titanium,
/area/shuttle/abandoned)
"bL" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/obj/effect/decal/cleanable/dirt{
diff --git a/_maps/shuttles/whiteship_pubby.dmm b/_maps/shuttles/whiteship_pubby.dmm
index 11214ef260..e7cf65a6f5 100644
--- a/_maps/shuttles/whiteship_pubby.dmm
+++ b/_maps/shuttles/whiteship_pubby.dmm
@@ -42,7 +42,7 @@
/turf/open/floor/plating/abductor,
/area/shuttle/abandoned)
"i" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/structure/chair/shuttle,
/turf/open/floor/plating/abductor,
/area/shuttle/abandoned)
"j" = (
@@ -65,7 +65,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned)
"l" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 4
},
/turf/open/floor/plating/abductor,
@@ -75,7 +75,7 @@
/turf/open/floor/plating/abductor,
/area/shuttle/abandoned)
"n" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 8
},
/turf/open/floor/plating/abductor,
@@ -110,7 +110,7 @@
/turf/open/floor/plating/abductor,
/area/shuttle/abandoned)
"q" = (
-/obj/structure/chair/comfy/shuttle{
+/obj/structure/chair/shuttle{
dir = 1
},
/turf/open/floor/plating/abductor,
diff --git a/goon/icons/obj/chairs.dmi b/goon/icons/obj/chairs.dmi
new file mode 100644
index 0000000000..462370ac37
Binary files /dev/null and b/goon/icons/obj/chairs.dmi differ
diff --git a/icons/effects/crayondecal.dmi b/icons/effects/crayondecal.dmi
index 607bfe44c4..24bf84c97d 100644
Binary files a/icons/effects/crayondecal.dmi and b/icons/effects/crayondecal.dmi differ
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index 237a841a4d..6ace923016 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/mob/screen_alert.dmi b/icons/mob/screen_alert.dmi
index de8d09b45b..8142e03498 100644
Binary files a/icons/mob/screen_alert.dmi and b/icons/mob/screen_alert.dmi differ
diff --git a/icons/obj/chairs.dmi b/icons/obj/chairs.dmi
index 9247e3ee96..137150bcd4 100644
Binary files a/icons/obj/chairs.dmi and b/icons/obj/chairs.dmi differ
diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi
index 90f9bb7c7f..e5d474f01d 100644
Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ
diff --git a/strings/cas_white.txt b/strings/cas_white.txt
index bc179f2bac..6ff7dbddc7 100644
--- a/strings/cas_white.txt
+++ b/strings/cas_white.txt
@@ -79,7 +79,7 @@ A blob zombie with an erection.
Backdoor Xeno Babes.
Five hundred ice spiders.
Cablecuffs.
-Hulk, TK and X-Ray.
+Hulk, TK and X-ray.
Paranoia.
Putting the boots to him, medium style.
ERP-seeking meteors.
@@ -207,7 +207,7 @@ The king of the rumba beat.
Unnecessary surgery.
Farting in the air distro loop.
Krokodil addiction.
-A H.O.N.K. mech.
+A H.O.N.K. mech.
A dominatrix HoS.
Sexcurity.
The Experimentor.
@@ -269,7 +269,7 @@ Mindbreaker toxin.
Legions of cyborg assholes.
Homicidal chefs.
Extended.
-Grammar fascist gods.
+Grammar fascist gods.
Cortical borers.
A masochist in an ash storm.
Draconic.
diff --git a/strings/ion_laws.json b/strings/ion_laws.json
index 28c6297dcf..152afd1116 100644
--- a/strings/ion_laws.json
+++ b/strings/ion_laws.json
@@ -347,7 +347,7 @@
"HEADS OF CREW",
"CAPTAINS AND HEADS",
"CYBORGS",
- "ARTIFICAL INTELLIGENCES",
+ "ARTIFICIAL INTELLIGENCES",
"DRONES"
],
"iondrinks": [
@@ -656,7 +656,7 @@
"JETPACKS",
"JUMPSUITS",
"LASERS",
- "LIGHTBULBS",
+ "LIGHT BULBS",
"LIGHTS",
"LOCKERS",
"MACHINES",
diff --git a/strings/names/ing_verbs.txt b/strings/names/ing_verbs.txt
index 5869e8a170..6a8da4c1ef 100644
--- a/strings/names/ing_verbs.txt
+++ b/strings/names/ing_verbs.txt
@@ -922,7 +922,7 @@ wrestling
wriggling
wringing
writing
-x-raying
+X-raying
yawning
yelling
zipping
diff --git a/strings/traumas.json b/strings/traumas.json
index ab3f58f984..e013264c4e 100644
--- a/strings/traumas.json
+++ b/strings/traumas.json
@@ -58,50 +58,6 @@
"@pick(semicolon)the ai and borgs are mettacomming I think",
"u just did the world a little bit more sad place for someone",
"WHERES THE SLIP REWRITE WHERE THR FUCK ID IT?",
- "CEMISTRY SUKS!!!!!!!!",
- "youed call her a toeugh bithc",
- "git gud!!",
- "CHEMIT GIB HALNOM PLS",
- "PLASMA iS MENT 2 BE FREE",
- "LoL tROLED U",
- "SEC IS A REV, LINCH!!",
- "FUCK U IM WAY MORE ROBUST u bITCH!!1!!",
- "iS tHis bay?",
- "NO PRED CAN eVER CATCH MI",
- "SCIENCE GIB SHINK RAY PLS",
- "KILL PUNPUN 4 FUN xDD",
- "ooc wow rly?",
- "i play @pick(roles) to only ORDER not DO",
- "CRAGO ORDER @pick(cargo) PLS",
- "erp?",
- "i want to digest u!!!",
- "i shure hop dere are no PRED arund!!!!",
- "NOM!1!",
- "iF it COMPILES it werks!",
- "LYNCH RObOTIKS NOT GIBING ME MECH WTF?/?",
- "GWURGLE!!",
- "balid saled!",
- "LINCH VIRO",
- "VIRO GIB SuPR VIrUS!!",
- "Ai plai vxtest2!",
- "ahelp kan i b pick@(s_roles)???",
- ";taitor trie to make meh malk/?!1!!",
- ";ENGIE TATOR HE SET UP SINGULO!!!11",
- "WHEN NAGAS ADdED?/?",
- "SINDYIE ON SAtIONS GiB gUNS PLISE",
- "CcLOWN IV SlIPPING MI, SEc t BAR@",
- "ahelp iT's RP vALiDZ!",
- "HYDROBONIX PLS WEED PLIESe PLIsE BLAzE IT1!!!",
- "HALP GOLIATH TENETCAL RAPPPP!!!!111",
- "DudSE it'S 4:20 LmAO BLAZZ IT xDDDDD",
- "ahelp DUDE I JUT LOST MY JOBB!!",
- "looc dude rly",
- "pray can i heff spells",
- "aI state dem1!",
- "SINGULO eNGINE 2 DANGER, SOLARS PLS!",
- "nerf blob!1",
- "iM NOT A FUWRRYY!!!",
- "FOURTEEN INCHES SOFT!!!",
"@pick(semicolon)N-NYAAAAAA~",
"@pick(bug)",
"@pick(semicolon)wtf??????????? @pick(bug)",
@@ -157,11 +113,6 @@
"sybl",
"mrs sybil",
"mr basil",
- "sisadel",
- "dullus",
- "colon marhens",
- "haylo",
- "EEGEE",
"mr terry",
"berry"
],
@@ -242,31 +193,6 @@
"YOU SHALL SURVIVE THIS, MY PRIEST.",
"BE HEALED, PRIEST.",
"YOUR LIFE IS IMPORTANT. KEEP IT."
- ],
+ ]
- "roles": [
- "heds",
- "ceptin",
- "hop",
- "arrdee",
- "sek"
- ],
-
- "cargo": [
- "GUNS",
- "HATS",
- "PIZEH",
- "MEMES",
- "GLOWY CYSTAL"
- ],
-
- "s_roles": [
- "ert",
- "shadowlig",
- "ninja",
- "admen",
- "mantor",
- "bluh daymon",
- "wizzerd"
- ]
}
diff --git a/tgui/src/interfaces/ai_airlock.ract b/tgui/src/interfaces/ai_airlock.ract
index 3acd384617..6f6c92967d 100644
--- a/tgui/src/interfaces/ai_airlock.ract
+++ b/tgui/src/interfaces/ai_airlock.ract
@@ -109,7 +109,7 @@ component.exports = {
Disabled
-
+
{{#if !data.wires.timing}}
[ Wires have been cut ]
{{/if}}
diff --git a/tgui/src/interfaces/cellular_emporium.ract b/tgui/src/interfaces/cellular_emporium.ract
index a5ce433452..5aa6213ec1 100644
--- a/tgui/src/interfaces/cellular_emporium.ract
+++ b/tgui/src/interfaces/cellular_emporium.ract
@@ -20,6 +20,6 @@
{{/each}}
{{^data.abilities}}
- No abilities availible.
+ No abilities available.
{{/data.abilities}}