diff --git a/_maps/map_files/Snaxi/IcemoonUnderground_Above.dmm b/_maps/map_files/Snaxi/IcemoonUnderground_Above.dmm
index 403f155854..153ad4265d 100644
--- a/_maps/map_files/Snaxi/IcemoonUnderground_Above.dmm
+++ b/_maps/map_files/Snaxi/IcemoonUnderground_Above.dmm
@@ -112,7 +112,7 @@
/obj/machinery/light/small{
dir = 8
},
-/turf/closed/mineral/random/snow,
+/turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/underground/unexplored/rivers)
"eH" = (
/obj/machinery/airalarm{
@@ -581,7 +581,7 @@
desc = "A horn off of a bicycle. This one has been charred to hell and back, yet somehow it still honks.";
name = "charred bike horn"
},
-/turf/closed/mineral/random/snow,
+/turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/underground/unexplored/rivers)
"nN" = (
/turf/closed/wall/r_wall,
@@ -722,6 +722,9 @@
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
+"rs" = (
+/turf/open/floor/plating/asteroid/snow/icemoon,
+/area/icemoon/underground/unexplored/rivers)
"ry" = (
/obj/effect/turf_decal/tile/purple{
dir = 8
@@ -809,6 +812,9 @@
},
/turf/open/floor/plasteel/white,
/area/mine/living_quarters)
+"sL" = (
+/turf/open/transparent/openspace/icemoon,
+/area/icemoon/underground/unexplored/rivers)
"sM" = (
/obj/structure/table,
/obj/item/storage/firstaid/toxin{
@@ -2367,7 +2373,7 @@
/obj/machinery/light/small{
dir = 1
},
-/turf/closed/mineral/random/snow,
+/turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/underground/unexplored/rivers)
"WE" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -29940,9 +29946,9 @@ ah
ah
ah
ah
+rs
ah
-ah
-ah
+rs
ah
ah
ah
@@ -30199,8 +30205,8 @@ ah
ah
ah
ah
-ah
-ah
+rs
+rs
ah
ah
ah
@@ -30456,8 +30462,8 @@ ah
ah
ah
ah
-ah
-ah
+rs
+rs
ah
ah
ah
@@ -30712,10 +30718,10 @@ ah
ah
ah
nE
-ah
-ah
-ah
-ah
+rs
+sL
+sL
+rs
ah
ah
ah
@@ -30968,11 +30974,11 @@ ah
ah
ah
ah
-ah
-ah
-ah
-ah
-ah
+rs
+rs
+rs
+sL
+rs
ah
ah
ah
@@ -31498,8 +31504,8 @@ ah
ah
ah
ah
-ah
-ah
+rs
+rs
ah
ah
ah
@@ -31749,14 +31755,14 @@ ah
ah
ah
ah
+rs
+rs
+rs
+rs
ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
+rs
+rs
+rs
ah
ah
ah
@@ -32005,14 +32011,14 @@ Gw
op
nd
ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
+sL
+rs
+rs
+rs
+rs
+rs
+rs
+rs
ah
ah
ah
@@ -32262,15 +32268,15 @@ GI
Lg
nd
ah
-ah
-ah
-ah
+sL
+sL
+rs
op
WE
op
-ah
-ah
-ah
+rs
+rs
+rs
ah
ah
ah
@@ -32519,17 +32525,17 @@ GN
Lu
nd
ah
-ah
-ah
-ah
+rs
+rs
+rs
op
sa
op
-ah
-ah
-ah
-ah
-ah
+rs
+rs
+rs
+rs
+rs
ah
ah
ah
@@ -32782,11 +32788,11 @@ nd
op
WM
op
-ah
-ah
-ah
-ah
-ah
+rs
+rs
+rs
+rs
+rs
ah
ah
ah
@@ -33039,10 +33045,10 @@ Rx
ry
WO
op
-ah
-ah
-ah
-ah
+rs
+rs
+rs
+rs
ah
ah
ah
@@ -33296,9 +33302,9 @@ sa
sa
sa
op
-ah
-ah
-ah
+rs
+rs
+rs
ah
ah
ah
@@ -33553,8 +33559,8 @@ TA
sa
Xf
op
-ah
-ah
+rs
+rs
ah
ah
ah
@@ -33810,8 +33816,8 @@ TA
sa
sa
op
-ah
-ah
+rs
+rs
ah
ah
ah
@@ -37651,8 +37657,8 @@ ah
ah
ah
ah
-ah
-ah
+rs
+rs
op
sa
Ho
@@ -37908,8 +37914,8 @@ ah
ah
ah
ah
-ah
-ah
+rs
+rs
op
ET
HY
@@ -38165,18 +38171,18 @@ ah
ah
ah
ah
-ah
-ah
+rs
+rs
op
op
Iq
op
op
-ah
-ah
-ah
-ah
-ah
+rs
+rs
+rs
+rs
+rs
ah
ah
ah
@@ -38422,19 +38428,19 @@ ah
ah
ah
ah
-ah
-ah
-ah
+rs
+rs
+rs
op
Iv
op
-ah
-ah
-ah
-ah
-ah
-ah
-ah
+rs
+rs
+rs
+rs
+rs
+rs
+rs
ah
ah
ah
@@ -38680,18 +38686,18 @@ ah
ah
ah
ah
-ah
-ah
+rs
+rs
op
Ho
op
-ah
-ah
-ah
-ah
-ah
-ah
-ah
+rs
+rs
+sL
+rs
+rs
+rs
+rs
ah
ah
ah
@@ -38937,18 +38943,18 @@ ah
ah
ah
ah
-ah
-ah
+sL
+rs
op
Ho
op
-ah
-ah
-ah
-ah
-ah
-ah
-ah
+rs
+sL
+sL
+sL
+rs
+rs
+rs
ah
ah
ah
@@ -39193,21 +39199,21 @@ ah
ah
ah
ah
-ah
-ah
-ah
+sL
+sL
+rs
op
Ho
op
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
+rs
+sL
+sL
+sL
+rs
+rs
+rs
+rs
+rs
ah
ah
ah
@@ -39444,26 +39450,26 @@ ah
ah
ah
ah
+rs
+rs
+rs
ah
ah
ah
ah
-ah
-ah
-ah
-ah
-ah
+rs
+rs
er
IB
er
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
+rs
+sL
+sL
+rs
+rs
+rs
+rs
+rs
ah
ah
ah
@@ -39700,24 +39706,24 @@ ah
ah
ah
ah
+rs
+rs
+rs
+rs
+rs
ah
ah
ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
+rs
+rs
er
IB
er
-ah
-ah
-ah
-ah
-ah
+rs
+sL
+sL
+rs
+rs
ah
ah
ah
@@ -39957,24 +39963,24 @@ ah
ah
ah
ah
-ah
+rs
eZ
fB
er
+rs
ah
ah
ah
-ah
-ah
-ah
+rs
+rs
er
IB
er
-ah
-ah
-ah
-ah
-ah
+rs
+rs
+sL
+sL
+rs
ah
ah
ah
@@ -40213,25 +40219,25 @@ ah
ah
ah
ah
-ah
-ah
+rs
+rs
er
fC
er
+rs
+rs
ah
ah
-ah
-ah
-ah
-ah
+rs
+rs
er
IF
er
-ah
-ah
-ah
-ah
-ah
+rs
+rs
+sL
+sL
+rs
ah
ah
ah
@@ -40470,25 +40476,25 @@ ah
ah
ah
ah
-ah
+rs
er
er
fD
er
er
+rs
ah
-ah
-ah
-ah
+rs
+rs
Be
er
IK
er
er
-ah
-ah
-ah
-ah
+rs
+rs
+rs
+rs
ah
ah
ah
@@ -40743,8 +40749,8 @@ IM
gS
er
eq
-ah
-ah
+rs
+rs
ah
ah
ah
@@ -40983,7 +40989,7 @@ ah
ah
ah
ah
-ah
+rs
eq
eH
fb
@@ -41000,8 +41006,8 @@ IB
fC
Nt
eq
-ah
-ah
+rs
+rs
ah
ah
ah
@@ -41240,7 +41246,7 @@ ah
ah
ah
ah
-ah
+rs
er
eI
fc
@@ -41497,7 +41503,7 @@ ah
ah
ah
ah
-ah
+rs
er
eJ
fd
@@ -41774,8 +41780,8 @@ er
Tk
NK
er
-ah
-ah
+rs
+rs
ah
ah
ah
@@ -42009,7 +42015,7 @@ ah
ah
ah
ah
-ah
+rs
dW
ei
es
@@ -42031,9 +42037,9 @@ Rf
Tn
NP
VC
-ah
-ah
-ah
+rs
+rs
+rs
ah
ah
ah
@@ -42265,8 +42271,8 @@ ah
ah
ah
ah
-ah
-ah
+rs
+rs
dX
ej
et
@@ -42288,8 +42294,8 @@ er
To
UJ
er
-ah
-ah
+rs
+rs
ah
ah
ah
@@ -42522,8 +42528,8 @@ ah
ah
ah
ah
-ah
-ah
+rs
+rs
dX
ej
eu
@@ -42780,7 +42786,7 @@ ah
ah
ah
ah
-ah
+rs
dW
ek
ew
@@ -44069,9 +44075,9 @@ ah
ah
ah
ex
-ah
-ah
-ah
+rs
+rs
+rs
ex
ah
ah
@@ -44324,13 +44330,13 @@ ah
ah
ah
ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
+rs
+rs
+rs
+rs
+rs
+rs
+rs
ah
ah
ah
@@ -44581,13 +44587,13 @@ ah
ah
ah
ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
+rs
+rs
+rs
+rs
+rs
+rs
+rs
ah
ah
ah
@@ -44839,11 +44845,11 @@ ah
ah
ah
ah
-ah
-ah
-ah
-ah
-ah
+rs
+rs
+rs
+rs
+rs
ah
ah
ah
@@ -45097,9 +45103,9 @@ ah
ah
ah
ah
-ah
-ah
-ah
+rs
+rs
+rs
ah
ah
ah
diff --git a/_maps/map_files/Snaxi/IcemoonUnderground_Below.dmm b/_maps/map_files/Snaxi/IcemoonUnderground_Below.dmm
index 42971e4315..79e5080644 100644
--- a/_maps/map_files/Snaxi/IcemoonUnderground_Below.dmm
+++ b/_maps/map_files/Snaxi/IcemoonUnderground_Below.dmm
@@ -5,6 +5,9 @@
"b" = (
/turf/closed/mineral/random/high_chance/snow,
/area/icemoon/underground/unexplored/rivers)
+"c" = (
+/turf/open/floor/plating/asteroid/snow/icemoon,
+/area/icemoon/underground/unexplored/rivers)
"d" = (
/turf/closed/wall,
/area/icemoon/underground/explored)
@@ -19,6 +22,9 @@
/obj/item/gps/mining,
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/underground/explored)
+"G" = (
+/turf/open/floor/plating/asteroid/snow/icemoon,
+/area/mine/maintenance)
"N" = (
/obj/item/flashlight/lantern{
on = 1
@@ -33,6 +39,22 @@
/obj/structure/ladder,
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/underground/explored)
+"X" = (
+/obj/machinery/telecomms/relay/preset/mining,
+/obj/machinery/bluespace_beacon,
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/window/reinforced,
+/obj/machinery/door/window/eastright{
+ dir = 8;
+ req_access_txt = "48"
+ },
+/turf/open/floor/circuit,
+/area/icemoon/underground/explored)
(1,1,1) = {"
a
@@ -39499,9 +39521,9 @@ a
a
a
a
-a
-a
-a
+c
+c
+c
a
a
a
@@ -40011,13 +40033,13 @@ a
a
a
a
-a
+c
e
i
h
h
e
-a
+c
a
a
a
@@ -40268,13 +40290,13 @@ a
a
a
a
-a
+c
h
h
T
h
h
-a
+c
a
a
a
@@ -40525,13 +40547,13 @@ a
a
a
a
-a
+c
e
N
h
-h
+G
e
-a
+c
a
a
a
@@ -40786,7 +40808,7 @@ a
d
O
h
-e
+X
d
a
a
@@ -41041,9 +41063,9 @@ a
a
a
a
-a
-a
-a
+c
+c
+c
a
a
a
diff --git a/_maps/map_files/Snaxi/Snaxi.dmm b/_maps/map_files/Snaxi/Snaxi.dmm
index 954a036f94..21aa4188c3 100644
--- a/_maps/map_files/Snaxi/Snaxi.dmm
+++ b/_maps/map_files/Snaxi/Snaxi.dmm
@@ -254,10 +254,11 @@
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"aar" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/sign/departments/botany,
-/turf/open/floor/plating,
-/area/hydroponics)
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/solar/starboard/fore)
"aas" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/disposalpipe/segment{
@@ -310,6 +311,9 @@
dir = 1
},
/obj/machinery/disposal/bin,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 5
+ },
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"aaw" = (
@@ -516,13 +520,6 @@
},
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/fitness/recreation)
-"aaM" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
-/obj/machinery/atmospherics/components/binary/valve{
- dir = 4
- },
-/turf/open/floor/plating/asteroid/snow/icemoon,
-/area/icemoon/surface/outdoors)
"aaN" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/machinery/quantumpad{
@@ -602,7 +599,8 @@
/obj/structure/sign/departments/restroom{
pixel_x = 32
},
-/turf/open/floor/carpet,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/wood,
/area/crew_quarters/dorms)
"aaV" = (
/obj/structure/sign/directions/evac{
@@ -673,8 +671,8 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/structure/sign/mining{
- pixel_x = 32
+/obj/machinery/light{
+ dir = 4
},
/turf/open/floor/plasteel,
/area/hallway/primary/central)
@@ -942,7 +940,7 @@
/obj/structure/sign/poster/official/fashion{
pixel_y = -32
},
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
/area/crew_quarters/dorms)
"abB" = (
/obj/structure/cable{
@@ -1080,13 +1078,14 @@
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"abL" = (
-/obj/structure/table,
-/obj/item/mmi,
-/obj/item/mmi,
-/obj/item/mmi,
/obj/structure/sign/poster/official/state_laws{
pixel_y = -32
},
+/obj/machinery/camera{
+ c_tag = "Robotics Lab South";
+ dir = 1;
+ network = list("ss13","rd")
+ },
/turf/open/floor/plasteel/white,
/area/science/robotics/lab)
"abM" = (
@@ -1184,14 +1183,8 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"abU" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 5
- },
/turf/open/floor/plating/snowed/smoothed/icemoon,
-/area/icemoon/surface/outdoors)
+/area/solar/starboard/fore)
"abV" = (
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -1358,7 +1351,9 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/supply/visible,
+/obj/machinery/atmospherics/components/binary/valve{
+ dir = 4
+ },
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
"acV" = (
@@ -1568,8 +1563,9 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 9
+ dir = 4
},
+/obj/machinery/light/floor,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
"aeG" = (
@@ -1711,6 +1707,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/visible{
dir = 9
},
+/obj/machinery/light/floor,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
"akB" = (
@@ -1858,7 +1855,6 @@
/obj/structure/table/reinforced,
/obj/machinery/door/window/eastright{
base_state = "left";
- dir = 8;
icon_state = "left";
name = "Chemistry Desk";
req_access_txt = "33"
@@ -1866,6 +1862,10 @@
/obj/machinery/door/firedoor/border_only{
dir = 8
},
+/obj/machinery/door/window/eastright{
+ dir = 8;
+ name = "Chemistry Desk"
+ },
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"anw" = (
@@ -2075,8 +2075,8 @@
/obj/machinery/door/firedoor/border_only{
dir = 1
},
-/obj/machinery/door/airlock/external,
/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/external/glass,
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"arE" = (
@@ -2164,6 +2164,7 @@
/obj/structure/disposalpipe/segment{
dir = 9
},
+/obj/machinery/light/floor,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
"asE" = (
@@ -2505,17 +2506,10 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/door/airlock/highsecurity{
- name = "AI Upload Access";
- req_access_txt = "16"
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/turf/open/floor/plasteel/dark,
+/turf/closed/wall/r_wall,
/area/ai_monitored/turret_protected/ai_upload)
"axc" = (
/obj/structure/table,
@@ -2604,17 +2598,9 @@
/obj/structure/plasticflaps/opaque,
/turf/open/floor/plasteel/dark,
/area/science/lab)
-"axL" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 10
- },
-/turf/open/floor/plating/asteroid/snow/icemoon,
-/area/icemoon/surface/outdoors)
"axN" = (
-/obj/machinery/atmospherics/pipe/simple/supply/visible{
- dir = 10
- },
-/turf/open/floor/plating/asteroid/snow/icemoon,
+/obj/structure/fluff/railing,
+/turf/open/transparent/openspace/icemoon,
/area/icemoon/surface/outdoors)
"ayk" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -2626,7 +2612,14 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/turf/closed/wall/r_wall,
+/obj/machinery/door/airlock/highsecurity{
+ name = "AI Upload Access";
+ req_access_txt = "16"
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai_upload)
"aym" = (
/obj/structure/cable{
@@ -2741,20 +2734,34 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/conveyor_switch/oneway{
- dir = 8;
- id = "robo2"
- },
/obj/machinery/firealarm{
dir = 8;
pixel_x = 24
},
+/obj/structure/table,
+/obj/item/storage/firstaid/regular{
+ empty = 1;
+ name = "First-Aid (empty)"
+ },
+/obj/item/storage/firstaid/regular{
+ empty = 1;
+ name = "First-Aid (empty)"
+ },
+/obj/item/storage/firstaid/regular{
+ empty = 1;
+ name = "First-Aid (empty)"
+ },
+/obj/item/healthanalyzer,
+/obj/item/healthanalyzer,
+/obj/item/healthanalyzer,
/turf/open/floor/plasteel/white,
/area/science/robotics/lab)
"ayC" = (
-/obj/machinery/mecha_part_fabricator,
-/turf/open/floor/plasteel/dark,
-/area/science/robotics/lab)
+/obj/structure/fluff/railing/corner{
+ dir = 8
+ },
+/turf/open/transparent/openspace/icemoon,
+/area/icemoon/surface/outdoors)
"ayD" = (
/obj/structure/cable{
icon_state = "0-4"
@@ -2805,6 +2812,7 @@
/obj/structure/disposalpipe/segment{
dir = 9
},
+/obj/machinery/light/floor,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/maintenance/department/electrical)
"azq" = (
@@ -2890,20 +2898,11 @@
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"azH" = (
-/obj/machinery/conveyor{
- dir = 8;
- id = "robo2"
+/obj/structure/fluff/railing{
+ dir = 4
},
-/obj/item/stack/sheet/metal/fifty,
-/obj/item/stack/sheet/metal/fifty,
-/obj/item/stack/sheet/metal/fifty,
-/obj/item/stack/sheet/glass{
- amount = 20;
- pixel_x = -3;
- pixel_y = 6
- },
-/turf/open/floor/plasteel/dark,
-/area/science/robotics/lab)
+/turf/open/transparent/openspace/icemoon,
+/area/icemoon/surface/outdoors)
"aAe" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/structure/disposalpipe/segment{
@@ -3136,24 +3135,11 @@
/turf/open/floor/plasteel/white,
/area/science/robotics/lab)
"aCr" = (
-/obj/structure/table,
-/obj/item/storage/firstaid/regular{
- empty = 1;
- name = "First-Aid (empty)"
+/obj/structure/fluff/railing{
+ dir = 8
},
-/obj/item/storage/firstaid/regular{
- empty = 1;
- name = "First-Aid (empty)"
- },
-/obj/item/storage/firstaid/regular{
- empty = 1;
- name = "First-Aid (empty)"
- },
-/obj/item/healthanalyzer,
-/obj/item/healthanalyzer,
-/obj/item/healthanalyzer,
-/turf/open/floor/plasteel/white,
-/area/science/robotics/lab)
+/turf/open/transparent/openspace/icemoon,
+/area/icemoon/surface/outdoors)
"aCV" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -3199,8 +3185,7 @@
/area/hallway/primary/port)
"aDc" = (
/obj/effect/landmark/start/scientist,
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plasteel/white,
+/turf/open/floor/circuit,
/area/science/lab)
"aDd" = (
/obj/structure/cable{
@@ -3226,10 +3211,6 @@
/obj/machinery/vending/clothing,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
-"aDf" = (
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plasteel/white,
-/area/science/lab)
"aDg" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
@@ -3380,8 +3361,10 @@
/turf/open/floor/plasteel,
/area/security/checkpoint/medical)
"aEE" = (
-/obj/machinery/rnd/destructive_analyzer,
-/turf/open/floor/circuit,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white,
/area/science/lab)
"aEF" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
@@ -3390,25 +3373,24 @@
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
"aEG" = (
-/turf/open/floor/circuit,
-/area/science/lab)
-"aEH" = (
-/obj/machinery/computer/rdconsole/core{
- dir = 1
+/obj/structure/fluff/railing{
+ dir = 10
},
+/turf/open/transparent/openspace/icemoon,
+/area/icemoon/surface/outdoors)
+"aEH" = (
/obj/machinery/light,
/turf/open/floor/circuit,
/area/science/lab)
"aEI" = (
-/obj/machinery/rnd/production/protolathe/department/science,
+/obj/machinery/rnd/destructive_analyzer,
/turf/open/floor/circuit,
/area/science/lab)
"aEJ" = (
/turf/closed/wall/r_wall,
/area/hallway/secondary/entry)
"aEK" = (
-/obj/machinery/rnd/production/circuit_imprinter/department/science,
-/obj/item/reagent_containers/glass/beaker/sulphuric,
+/obj/machinery/rnd/production/protolathe/department/science,
/turf/open/floor/circuit,
/area/science/lab)
"aEL" = (
@@ -3606,35 +3588,11 @@
/turf/open/floor/circuit,
/area/science/robotics/mechbay)
"aHK" = (
-/obj/structure/rack,
-/obj/item/storage/toolbox/mechanical{
- pixel_x = -2;
- pixel_y = -1
+/obj/structure/fluff/railing{
+ dir = 6
},
-/obj/item/storage/toolbox/electrical{
- pixel_x = 1;
- pixel_y = 6
- },
-/obj/item/clothing/head/welding{
- pixel_x = -3;
- pixel_y = 5
- },
-/obj/item/clothing/head/welding{
- pixel_x = -3;
- pixel_y = 5
- },
-/obj/item/clothing/glasses/welding,
-/obj/item/clothing/glasses/welding,
-/obj/item/multitool{
- pixel_x = 3
- },
-/obj/item/multitool{
- pixel_x = 3
- },
-/obj/item/storage/belt/utility,
-/obj/item/storage/belt/utility,
-/turf/open/floor/plasteel/white,
-/area/science/robotics/lab)
+/turf/open/transparent/openspace/icemoon,
+/area/icemoon/surface/outdoors)
"aHU" = (
/obj/machinery/rnd/production/techfab/department/service,
/turf/open/floor/plating,
@@ -3749,11 +3707,12 @@
/turf/open/floor/plasteel/dark,
/area/hallway/secondary/entry)
"aKa" = (
-/obj/machinery/atmospherics/components/binary/valve/digital{
- dir = 4
+/obj/structure/cable{
+ icon_state = "0-2"
},
-/turf/closed/wall/r_wall,
-/area/storage/atmos)
+/obj/machinery/power/tracker,
+/turf/open/floor/plating/asteroid/snow/ice/icemoon/solarpanel,
+/area/solar/port/fore)
"aKf" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/disposalpipe/segment{
@@ -4062,14 +4021,14 @@
/turf/open/floor/wood,
/area/security/courtroom)
"aNL" = (
-/obj/machinery/door/airlock/external,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/machinery/door/firedoor/border_only{
dir = 1;
name = "north facing firelock"
},
/obj/structure/fans/tiny,
-/turf/open/floor/carpet,
+/obj/machinery/door/airlock/external/glass,
+/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"aNS" = (
/obj/machinery/turnstile{
@@ -4136,18 +4095,12 @@
/obj/structure/cable{
icon_state = "0-4"
},
-/obj/machinery/power/apc{
- areastring = "/area/storage/atmos";
- dir = 8;
- name = "Atmospherics APC";
- pixel_x = -24
- },
/obj/structure/extinguisher_cabinet{
pixel_y = -30
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
-/area/storage/atmos)
+/area/maintenance/department/electrical)
"aOq" = (
/obj/structure/cable{
icon_state = "2-4"
@@ -4159,7 +4112,7 @@
dir = 8
},
/turf/open/floor/plating,
-/area/storage/atmos)
+/area/maintenance/department/electrical)
"aOr" = (
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
@@ -4203,9 +4156,11 @@
/turf/open/floor/plating,
/area/security/checkpoint/medical)
"aPC" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/storage/atmos)
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/solar/port/fore)
"aPD" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
@@ -4213,10 +4168,17 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
-/area/storage/atmos)
+/area/maintenance/department/electrical)
"aPE" = (
-/turf/closed/wall/r_wall,
-/area/storage/atmos)
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/power/solar{
+ id = "auxsolareast";
+ name = "Port Auxiliary Solar Array"
+ },
+/turf/open/floor/plating/asteroid/snow/ice/icemoon/solarpanel,
+/area/solar/port/fore)
"aPY" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -4286,7 +4248,7 @@
icon_state = "2-4"
},
/turf/open/floor/plating/snowed/smoothed/icemoon,
-/area/icemoon/surface/outdoors)
+/area/solar/starboard/fore)
"aQT" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -4352,6 +4314,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 9
},
+/obj/machinery/light/floor,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
"aSI" = (
@@ -4700,6 +4663,13 @@
},
/turf/open/floor/plating,
/area/quartermaster/storage)
+"bfo" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"bfB" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -4755,6 +4725,12 @@
/obj/machinery/vending/coffee,
/turf/open/floor/plasteel/dark,
/area/maintenance/department/bridge)
+"bjR" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
"bjU" = (
/obj/machinery/airalarm{
dir = 8;
@@ -4804,13 +4780,6 @@
/obj/machinery/holopad,
/turf/open/floor/plasteel/dark,
/area/maintenance/department/bridge)
-"blD" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
"blI" = (
/obj/machinery/hydroponics/soil,
/obj/item/seeds/ambrosia,
@@ -4977,6 +4946,12 @@
},
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
+"bqb" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"bqx" = (
/obj/structure/table/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -5185,9 +5160,6 @@
/area/icemoon/surface/outdoors)
"buF" = (
/obj/machinery/light,
-/obj/structure/window/plasma/reinforced{
- dir = 4
- },
/obj/structure/table,
/obj/item/clothing/gloves/color/yellow,
/obj/item/clothing/gloves/color/yellow,
@@ -5200,6 +5172,9 @@
dir = 8
},
/obj/item/pipe_dispenser,
+/obj/structure/window/reinforced{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"buI" = (
@@ -6106,9 +6081,6 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/airalarm{
- pixel_y = 28
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -6218,9 +6190,6 @@
/obj/effect/turf_decal/tile/brown{
dir = 4
},
-/obj/machinery/light{
- dir = 4
- },
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bCM" = (
@@ -6414,6 +6383,17 @@
/obj/machinery/vending/wardrobe/science_wardrobe,
/turf/open/floor/plasteel/white,
/area/science/misc_lab)
+"bEp" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/grille,
+/obj/structure/cable,
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plating/asteroid/snow/icemoon,
+/area/icemoon/surface/outdoors)
"bEJ" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/effect/turf_decal/tile/purple{
@@ -6921,7 +6901,7 @@
/obj/structure/window/reinforced,
/obj/structure/table/reinforced,
/obj/machinery/button/door{
- id = "xenobio2";
+ id = "xenobiospec";
name = "Containment Blast Doors";
pixel_y = 4;
req_access_txt = "55"
@@ -6982,7 +6962,7 @@
req_access_txt = "55"
},
/obj/machinery/door/poddoor/preopen{
- id = "xenobio2";
+ id = "xenobiospec";
name = "containment blast door"
},
/turf/open/floor/engine,
@@ -7138,35 +7118,9 @@
/obj/machinery/disposal/bin,
/turf/open/floor/plasteel/cult,
/area/lawoffice)
-"bJQ" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
-/obj/machinery/door/airlock/external{
- name = "Arrivals Airlock"
- },
-/obj/structure/fans/tiny,
-/turf/open/floor/plating,
-/area/hallway/secondary/exit/departure_lounge)
"bKl" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
/obj/effect/landmark/event_spawn,
-/turf/open/floor/plasteel,
+/turf/open/transparent/glass/reinforced,
/area/crew_quarters/fitness)
"bKo" = (
/obj/machinery/door/airlock/public/glass{
@@ -7245,7 +7199,7 @@
icon_state = "0-4"
},
/turf/open/floor/plating/asteroid/snow/ice/icemoon/solarpanel,
-/area/icemoon/surface/outdoors)
+/area/solar/port/aft)
"bLI" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
@@ -7477,6 +7431,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/recharge_station,
/turf/open/floor/plasteel,
/area/maintenance/department/electrical)
"bOp" = (
@@ -7621,16 +7576,16 @@
dir = 8;
name = "west facing firelock"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/obj/machinery/door/poddoor/preopen{
- id = "xenobio2";
+ id = "xenobiospec";
name = "containment blast door"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/open/floor/engine,
/area/science/xenobiology)
"bPW" = (
@@ -8578,23 +8533,14 @@
"chp" = (
/turf/open/floor/plating,
/area/maintenance/aft)
-"chN" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
"chZ" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/maintenance/solars/port/fore)
+"cih" = (
+/obj/structure/cable,
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/solar/port/aft)
"cio" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
@@ -8822,7 +8768,7 @@
icon_state = "0-4"
},
/turf/open/floor/plating/snowed/smoothed/icemoon,
-/area/icemoon/surface/outdoors)
+/area/solar/starboard/fore)
"cly" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
/turf/open/floor/plating/snowed/smoothed/icemoon,
@@ -9154,6 +9100,12 @@
},
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/fitness/recreation)
+"cvN" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 6
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
"cwm" = (
/obj/machinery/vending/boozeomat,
/obj/machinery/firealarm{
@@ -9506,15 +9458,6 @@
},
/turf/open/floor/plating,
/area/bridge)
-"cDO" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
"cDS" = (
/obj/structure/bodycontainer/morgue{
dir = 8
@@ -9542,6 +9485,12 @@
/obj/structure/reflector/single,
/turf/open/floor/plating,
/area/engine/storage)
+"cEs" = (
+/obj/machinery/atmospherics/pipe/simple/supply/visible,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/light/floor,
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/icemoon/surface/outdoors)
"cFm" = (
/obj/structure/reagent_dispensers/peppertank{
pixel_x = -30
@@ -9698,7 +9647,7 @@
},
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
-/area/storage/atmos)
+/area/maintenance/department/electrical)
"cKQ" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 4
@@ -9723,7 +9672,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/plasteel,
+/turf/open/floor/wood,
/area/crew_quarters/fitness)
"cLC" = (
/obj/effect/turf_decal/tile/brown{
@@ -9770,7 +9719,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
/area/crew_quarters/dorms)
"cNE" = (
/obj/structure/cable{
@@ -10043,6 +9992,13 @@
"cTO" = (
/turf/closed/wall/r_wall,
/area/quartermaster/miningoffice)
+"cTV" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
"cUd" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -10062,6 +10018,40 @@
},
/turf/open/floor/plating,
/area/maintenance/solars/starboard/aft)
+"cUs" = (
+/obj/effect/landmark/start/ai,
+/obj/item/radio/intercom{
+ freerange = 1;
+ name = "Common Channel";
+ pixel_x = 25;
+ pixel_y = -4
+ },
+/obj/item/radio/intercom{
+ freerange = 1;
+ frequency = 1447;
+ name = "Private Channel";
+ pixel_x = 25;
+ pixel_y = -13
+ },
+/obj/item/radio/intercom{
+ freerange = 1;
+ listening = 0;
+ name = "Custom Channel";
+ pixel_x = 25;
+ pixel_y = 7
+ },
+/obj/machinery/button/door{
+ id = "AI Chamber entrance shutters";
+ name = "AI Chamber entrance shutters control";
+ pixel_x = -7;
+ pixel_y = -24;
+ req_access_txt = "16"
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/circuit,
+/area/ai_monitored/turret_protected/ai)
"cUC" = (
/obj/structure/chair,
/obj/effect/landmark/start/geneticist,
@@ -10090,6 +10080,12 @@
},
/turf/open/floor/pod/dark,
/area/maintenance/starboard)
+"cVa" = (
+/obj/structure/fluff/railing{
+ dir = 9
+ },
+/turf/open/transparent/openspace/icemoon,
+/area/engine/atmospherics_engine)
"cVu" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/tile/blue{
@@ -10143,6 +10139,10 @@
},
/turf/open/floor/plasteel,
/area/quartermaster/storage)
+"cWI" = (
+/obj/structure/cable,
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/solar/starboard/aft)
"cWO" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 4
@@ -10167,11 +10167,9 @@
/turf/open/floor/plasteel/dark,
/area/security/prison)
"cXI" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/closed/wall/r_wall,
-/area/ai_monitored/turret_protected/ai)
+/obj/structure/cable,
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/solar/port/fore)
"cXO" = (
/obj/structure/cable,
/obj/effect/landmark/start/ai/secondary,
@@ -10495,21 +10493,23 @@
name = "Port Solar Array"
},
/turf/open/floor/plating/asteroid/snow/ice/icemoon/solarpanel,
-/area/icemoon/surface/outdoors)
+/area/solar/port/aft)
"dfy" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/structure/cable{
icon_state = "1-4"
},
/obj/structure/cable{
icon_state = "2-4"
},
+/obj/effect/landmark/event_spawn,
+/obj/machinery/flasher{
+ id = "AI";
+ pixel_x = -26;
+ pixel_y = 3
+ },
/obj/machinery/ai_slipper{
uses = 10
},
-/obj/effect/landmark/event_spawn,
/turf/open/floor/circuit/off,
/area/ai_monitored/turret_protected/ai)
"dfV" = (
@@ -10815,8 +10815,8 @@
dir = 4
},
/obj/machinery/door/airlock/atmos{
- name = "Atmospherics";
- req_access_txt = "24"
+ name = "Antimatter Engine";
+ req_access_txt = "10"
},
/obj/machinery/door/firedoor/border_only{
dir = 8;
@@ -10884,10 +10884,11 @@
/obj/structure/cable{
icon_state = "2-4"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 6
+/obj/structure/cable{
+ icon_state = "2-8"
},
-/turf/open/floor/carpet,
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
+/turf/open/floor/wood,
/area/crew_quarters/dorms)
"duI" = (
/obj/structure/cable{
@@ -10932,6 +10933,7 @@
/obj/structure/disposalpipe/segment{
dir = 6
},
+/obj/machinery/light/floor,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
"dvs" = (
@@ -10944,7 +10946,7 @@
/obj/machinery/door/firedoor/border_only{
name = "south facing firelock"
},
-/turf/open/floor/carpet,
+/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"dvw" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -11051,12 +11053,6 @@
},
/turf/open/floor/pod/dark,
/area/maintenance/starboard)
-"dAi" = (
-/obj/structure/sign/warning/pods{
- pixel_x = -32
- },
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
"dAs" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -11156,36 +11152,11 @@
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"dDC" = (
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral{
+/obj/structure/fluff/railing{
dir = 1
},
-/obj/structure/closet/crate/engineering{
- name = "Antimatter Engine Crate"
- },
-/obj/machinery/power/am_control_unit,
-/obj/item/am_shielding_container,
-/obj/item/am_shielding_container,
-/obj/item/am_shielding_container,
-/obj/item/am_shielding_container,
-/obj/item/am_shielding_container,
-/obj/item/am_shielding_container,
-/obj/item/am_shielding_container,
-/obj/item/am_shielding_container,
-/obj/item/am_shielding_container,
-/obj/item/am_shielding_container,
-/obj/item/am_shielding_container,
-/obj/item/am_shielding_container,
-/obj/item/am_containment,
-/obj/item/am_containment,
-/turf/open/floor/plasteel/dark,
-/area/engine/secure_construction)
+/turf/open/transparent/openspace/icemoon,
+/area/icemoon/surface/outdoors)
"dDK" = (
/obj/machinery/atmospherics/pipe/simple/supply/visible{
dir = 6
@@ -11263,9 +11234,11 @@
/turf/closed/wall,
/area/quartermaster/qm)
"dFJ" = (
-/obj/effect/turf_decal/stripes/corner,
-/turf/open/floor/plasteel/white,
-/area/science/lab)
+/obj/structure/fluff/railing{
+ dir = 5
+ },
+/turf/open/transparent/openspace/icemoon,
+/area/icemoon/surface/outdoors)
"dGb" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -11352,7 +11325,7 @@
/obj/machinery/door/firedoor/border_only{
name = "south facing firelock"
},
-/turf/open/floor/carpet,
+/turf/open/floor/carpet/blue,
/area/crew_quarters/dorms)
"dJc" = (
/obj/structure/cable{
@@ -11384,7 +11357,7 @@
/obj/structure/disposalpipe/segment{
dir = 6
},
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
/area/crew_quarters/dorms)
"dKw" = (
/obj/structure/cable{
@@ -11435,6 +11408,11 @@
"dMj" = (
/turf/closed/wall/r_wall,
/area/ai_monitored/nuke_storage)
+"dMo" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/light/floor,
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/icemoon/surface/outdoors)
"dMI" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -12100,6 +12078,7 @@
dir = 1;
sortType = 26
},
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"egM" = (
@@ -12216,15 +12195,6 @@
},
/turf/open/floor/plasteel/dark,
/area/security/brig)
-"ejw" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
"ekw" = (
/obj/structure/chair{
dir = 1
@@ -12285,6 +12255,18 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel/dark,
/area/hallway/secondary/exit/departure_lounge)
+"eoH" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
"eoL" = (
/obj/structure/chair{
dir = 4
@@ -12352,9 +12334,6 @@
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"ery" = (
-/obj/machinery/light{
- dir = 8
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -12369,10 +12348,6 @@
/obj/effect/turf_decal/tile/blue{
dir = 1
},
-/obj/item/radio/intercom{
- name = "Station Intercom (General)";
- pixel_x = -28
- },
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai_upload_foyer)
"erG" = (
@@ -12585,6 +12560,12 @@
},
/turf/open/floor/plasteel/white,
/area/science/mixing)
+"eyc" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/closed/wall,
+/area/crew_quarters/dorms)
"eyP" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
@@ -12688,6 +12669,13 @@
},
/turf/open/floor/plating,
/area/maintenance/solars/port/aft)
+"eCS" = (
+/obj/machinery/door/airlock{
+ id_tag = "Dorm5";
+ name = "Room Four"
+ },
+/turf/open/floor/carpet/purple,
+/area/crew_quarters/dorms)
"eDr" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -12868,7 +12856,7 @@
/area/hallway/primary/central)
"eHK" = (
/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/yellow/visible{
+/obj/machinery/atmospherics/pipe/layer_manifold{
dir = 4
},
/turf/open/floor/plating,
@@ -12980,25 +12968,6 @@
},
/turf/open/floor/plasteel,
/area/maintenance/aft)
-"eLl" = (
-/obj/structure/window{
- dir = 1
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/structure/window{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
"eLm" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -13172,10 +13141,6 @@
},
/turf/open/floor/wood,
/area/crew_quarters/bar)
-"eOO" = (
-/obj/structure/weightmachine/weightlifter,
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
"eOZ" = (
/obj/machinery/atmospherics/components/binary/pump/on,
/turf/open/floor/plasteel/dark,
@@ -13415,6 +13380,20 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall/mineral/wood,
/area/maintenance/bar)
+"eXy" = (
+/obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/plasteel/white,
+/area/science/lab)
+"eXO" = (
+/obj/structure/table,
+/obj/item/mmi,
+/obj/item/mmi,
+/obj/item/mmi,
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/science/robotics/lab)
"eYe" = (
/obj/machinery/conveyor{
dir = 4;
@@ -13487,7 +13466,7 @@
icon_state = "1-4"
},
/turf/open/floor/plating/snowed/smoothed/icemoon,
-/area/icemoon/surface/outdoors)
+/area/solar/starboard/aft)
"faR" = (
/obj/structure/window/reinforced{
dir = 8
@@ -13495,7 +13474,7 @@
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
/obj/effect/landmark/blobstart,
/turf/open/floor/plating,
-/area/storage/atmos)
+/area/maintenance/department/electrical)
"faV" = (
/obj/machinery/light{
dir = 4
@@ -13817,6 +13796,13 @@
/obj/machinery/space_heater,
/turf/open/floor/plating,
/area/icemoon/surface/outdoors)
+"fkA" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"fkC" = (
/obj/machinery/atmospherics/pipe/simple/green/visible,
/turf/closed/wall/r_wall,
@@ -13912,9 +13898,14 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory)
"fne" = (
-/obj/effect/landmark/start/roboticist,
-/turf/open/floor/plasteel/dark,
-/area/science/robotics/lab)
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/solar/port/fore)
"fni" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/carbon_output{
dir = 8
@@ -13955,6 +13946,11 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/engine/engineering)
+"fol" = (
+/obj/machinery/rnd/production/circuit_imprinter/department/science,
+/obj/item/reagent_containers/glass/beaker/sulphuric,
+/turf/open/floor/circuit,
+/area/science/lab)
"foy" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -13984,17 +13980,6 @@
/turf/open/floor/plating,
/area/maintenance/disposal)
"fpS" = (
-/obj/structure/table,
-/obj/item/hemostat,
-/obj/item/retractor,
-/obj/item/scalpel{
- pixel_y = 12
- },
-/obj/item/circular_saw,
-/obj/item/cautery{
- pixel_x = 4
- },
-/obj/item/surgical_drapes,
/obj/machinery/airalarm{
pixel_y = 23
},
@@ -14002,7 +13987,14 @@
c_tag = "Robotics Lab";
network = list("ss13","rd")
},
-/turf/open/floor/plasteel/white,
+/obj/machinery/mecha_part_fabricator,
+/obj/item/stack/sheet/glass{
+ amount = 20;
+ pixel_x = -3;
+ pixel_y = 6
+ },
+/obj/item/stack/sheet/metal/fifty,
+/turf/open/floor/plasteel/dark,
/area/science/robotics/lab)
"fqj" = (
/obj/machinery/field/generator,
@@ -14086,7 +14078,7 @@
icon_state = "1-8"
},
/turf/open/floor/plating/snowed/smoothed/icemoon,
-/area/icemoon/surface/outdoors)
+/area/solar/port/aft)
"fsA" = (
/obj/structure/bodycontainer/morgue,
/obj/effect/turf_decal/tile/blue{
@@ -14113,11 +14105,8 @@
/turf/open/floor/plasteel/dark/telecomms,
/area/tcommsat/server)
"ftH" = (
-/obj/machinery/mineral/ore_redemption{
- input_dir = 2;
- output_dir = 1
- },
-/turf/open/floor/plating,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/space/basic,
/area/quartermaster/miningdock)
"ftM" = (
/obj/structure/cable{
@@ -14187,11 +14176,6 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"fvz" = (
-/obj/structure/table/optable{
- name = "Robotics Operating Table"
- },
-/obj/item/tank/internals/anesthetic,
-/obj/item/clothing/mask/breath,
/obj/structure/extinguisher_cabinet{
pixel_y = 30
},
@@ -14353,6 +14337,9 @@
c_tag = "Bathrooms";
dir = 1
},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 8
+ },
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/dorms)
"fBG" = (
@@ -14374,9 +14361,6 @@
/turf/open/floor/engine,
/area/engine/atmospherics_engine)
"fCQ" = (
-/obj/structure/toilet/secret/low_loot{
- pixel_y = 14
- },
/obj/machinery/button/door{
id = "Bath2";
name = "Door Bolt Control";
@@ -14389,6 +14373,7 @@
dir = 8
},
/obj/effect/landmark/blobstart,
+/obj/machinery/recharge_station,
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/dorms)
"fDi" = (
@@ -14414,6 +14399,13 @@
"fDJ" = (
/turf/open/floor/plasteel/white,
/area/medical/medbay/zone3)
+"fEz" = (
+/obj/machinery/computer/operating,
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/science/robotics/lab)
"fET" = (
/obj/effect/turf_decal/tile/neutral,
/obj/machinery/camera{
@@ -14512,7 +14504,18 @@
dir = 4
},
/turf/open/floor/plating,
-/area/storage/atmos)
+/area/maintenance/department/electrical)
+"fIk" = (
+/obj/machinery/button/door{
+ id = "holoprivacy";
+ name = "Holodeck Privacy";
+ pixel_x = 24;
+ pixel_y = 7
+ },
+/turf/open/floor/engine{
+ name = "Holodeck Projector Floor"
+ },
+/area/holodeck/rec_center)
"fIu" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -14731,11 +14734,11 @@
pixel_y = -28
},
/turf/open/floor/plating,
-/area/storage/atmos)
+/area/maintenance/department/electrical)
"fNh" = (
/obj/structure/cable,
/turf/open/floor/plating/snowed/smoothed/icemoon,
-/area/icemoon/surface/outdoors)
+/area/solar/starboard/fore)
"fNC" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -14867,6 +14870,9 @@
dir = 8;
name = "west facing firelock"
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/crew_quarters/dorms)
"fPN" = (
@@ -14953,6 +14959,13 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
+"fSb" = (
+/obj/machinery/airalarm{
+ dir = 4;
+ pixel_x = -22
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"fSw" = (
/obj/structure/cable{
icon_state = "2-4"
@@ -14996,8 +15009,14 @@
/obj/machinery/light{
dir = 4
},
-/turf/open/floor/carpet,
+/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
+"fUc" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/solar/port/aft)
"fUm" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -15042,7 +15061,7 @@
icon_state = "2-4"
},
/turf/open/floor/plating/snowed/smoothed/icemoon,
-/area/icemoon/surface/outdoors)
+/area/solar/starboard/fore)
"fVT" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/turf/open/floor/engine,
@@ -15271,6 +15290,12 @@
/obj/item/storage/fancy/donut_box,
/turf/open/floor/plasteel,
/area/security/checkpoint/supply)
+"gdH" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 8
+ },
+/turf/open/floor/plasteel/freezer,
+/area/crew_quarters/dorms)
"gdL" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
@@ -15439,6 +15464,12 @@
},
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/engine/engineering)
+"gjZ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 9
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness)
"gkl" = (
/obj/machinery/jukebox,
/turf/open/floor/wood,
@@ -15502,28 +15533,6 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
-"gls" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/machinery/door/window/westright{
- name = "Red Corner"
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
"gmf" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
@@ -15697,9 +15706,6 @@
/turf/closed/wall,
/area/security/courtroom)
"grZ" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
/obj/structure/table,
/obj/item/aiModule/core/full/custom,
/obj/item/aiModule/core/freeformcore,
@@ -15711,6 +15717,9 @@
dir = 1;
network = list("aiupload")
},
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai_upload)
"gsr" = (
@@ -15812,12 +15821,11 @@
/turf/open/floor/plasteel/dark,
/area/bridge)
"guI" = (
-/obj/machinery/light/floor,
-/obj/structure/disposalpipe/segment{
- dir = 5
+/obj/structure/cable{
+ icon_state = "0-8"
},
/turf/open/floor/plating/snowed/smoothed/icemoon,
-/area/icemoon/surface/outdoors)
+/area/solar/port/fore)
"guR" = (
/obj/structure/table/glass,
/obj/effect/turf_decal/tile/yellow{
@@ -16061,7 +16069,7 @@
dir = 1
},
/turf/open/floor/plasteel,
-/area/storage/atmos)
+/area/maintenance/department/electrical)
"gCG" = (
/obj/structure/closet/firecloset,
/turf/open/floor/plating,
@@ -16076,15 +16084,10 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"gCO" = (
-/obj/machinery/light,
-/obj/machinery/door/airlock/public/glass{
- name = "Holodeck Door"
- },
-/obj/structure/fans/tiny,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/turf/open/floor/plasteel/white,
+/turf/open/floor/wood,
/area/crew_quarters/dorms)
"gCS" = (
/obj/structure/bodycontainer/morgue,
@@ -16238,6 +16241,12 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/port)
+"gIW" = (
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/solar/starboard/aft)
"gJi" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible,
/obj/machinery/atmospherics/pipe/simple/green/visible{
@@ -16484,7 +16493,7 @@
},
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel,
-/area/storage/atmos)
+/area/maintenance/department/electrical)
"gPE" = (
/obj/machinery/portable_atmospherics/pump,
/obj/machinery/firealarm{
@@ -16660,7 +16669,7 @@
icon_state = "2-8"
},
/turf/open/floor/plating/snowed/smoothed/icemoon,
-/area/icemoon/surface/outdoors)
+/area/solar/starboard/fore)
"gTH" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -16690,11 +16699,18 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/light/floor,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
"gUc" = (
-/obj/machinery/light,
-/turf/open/floor/plasteel/white,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/camera{
+ c_tag = "Dorms Central";
+ dir = 1
+ },
+/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"gUw" = (
/obj/structure/plasticflaps,
@@ -16771,7 +16787,8 @@
/obj/structure/cable{
icon_state = "2-8"
},
-/turf/open/floor/plasteel/white,
+/obj/effect/landmark/start/roboticist,
+/turf/open/floor/plasteel/dark,
/area/science/robotics/lab)
"gXE" = (
/obj/structure/table,
@@ -17106,13 +17123,16 @@
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"hiO" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 6
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"hjv" = (
@@ -17156,6 +17176,14 @@
},
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/surface/outdoors)
+"hlQ" = (
+/obj/item/radio/intercom{
+ name = "Station Intercom (General)";
+ pixel_x = 30
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"hlT" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -17166,9 +17194,6 @@
/obj/structure/cable{
icon_state = "2-8"
},
-/obj/structure/cable{
- icon_state = "1-2"
- },
/turf/open/floor/circuit/off,
/area/ai_monitored/turret_protected/ai)
"hmM" = (
@@ -17193,6 +17218,15 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/port)
+"hnN" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/light/floor,
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/icemoon/surface/outdoors)
"hnO" = (
/obj/machinery/atmospherics/components/unary/cryo_cell,
/turf/open/floor/plasteel/white,
@@ -17217,20 +17251,10 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"hop" = (
-/obj/structure/window{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"hoq" = (
@@ -17340,6 +17364,7 @@
/obj/machinery/light{
dir = 1
},
+/obj/machinery/vending/cigarette,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"hrN" = (
@@ -17359,15 +17384,14 @@
/turf/open/floor/plasteel,
/area/quartermaster/miningdock)
"hrS" = (
-/obj/effect/turf_decal/tile/neutral,
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/solar/port/fore)
"hse" = (
/obj/structure/cable{
- icon_state = "1-4"
+ icon_state = "0-4"
},
-/turf/open/floor/circuit/off,
-/area/ai_monitored/turret_protected/ai)
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/solar/port/fore)
"hsl" = (
/turf/open/floor/plating,
/area/maintenance/starboard)
@@ -17417,12 +17441,6 @@
},
/turf/open/floor/wood,
/area/bridge/meeting_room)
-"hsQ" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
"hta" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -17469,11 +17487,14 @@
/turf/open/floor/engine/co2,
/area/engine/atmos)
"huF" = (
-/obj/machinery/mineral/stacking_unit_console{
- machinedir = 4
+/obj/structure/cable{
+ icon_state = "1-8"
},
-/turf/closed/wall,
-/area/maintenance/disposal)
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/solar/port/fore)
"huQ" = (
/obj/machinery/power/terminal{
dir = 1
@@ -17505,6 +17526,14 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/central)
+"hvG" = (
+/obj/machinery/light,
+/obj/machinery/airalarm{
+ dir = 1;
+ pixel_y = -22
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"hwg" = (
/obj/machinery/computer/teleporter{
dir = 8
@@ -17565,7 +17594,7 @@
},
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
-/area/storage/atmos)
+/area/maintenance/department/electrical)
"hxP" = (
/obj/machinery/door/airlock/medical/glass{
id_tag = "MedbayFoyer";
@@ -17587,6 +17616,18 @@
/obj/structure/closet/secure_closet/personal/cabinet,
/turf/open/floor/carpet,
/area/quartermaster/miningoffice)
+"hyx" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/airalarm{
+ pixel_y = 28
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/miningdock)
"hyz" = (
/obj/machinery/vending/autodrobe,
/turf/open/floor/plasteel,
@@ -17678,7 +17719,7 @@
dir = 1;
name = "north facing firelock"
},
-/turf/open/floor/carpet,
+/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"hBb" = (
/obj/machinery/camera{
@@ -17708,6 +17749,10 @@
/obj/machinery/vending/medical,
/turf/open/floor/plasteel/white,
/area/medical/virology)
+"hBM" = (
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel/white,
+/area/science/lab)
"hBQ" = (
/obj/structure/cable{
icon_state = "2-4"
@@ -17718,6 +17763,16 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel,
/area/hallway/primary/port)
+"hCx" = (
+/obj/machinery/door/airlock/public/glass{
+ name = "Dormitory"
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 8;
+ name = "west facing firelock"
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
"hCD" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -17827,7 +17882,7 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/storage/atmos)
+/area/maintenance/department/electrical)
"hFG" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -17853,7 +17908,7 @@
icon_state = "0-8"
},
/turf/open/floor/plating/snowed/smoothed/icemoon,
-/area/icemoon/surface/outdoors)
+/area/solar/starboard/fore)
"hGU" = (
/obj/structure/closet/secure_closet/personal/cabinet{
pixel_x = -8
@@ -17894,6 +17949,12 @@
},
/turf/open/floor/plasteel,
/area/engine/atmospherics_engine)
+"hHV" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/freezer,
+/area/crew_quarters/dorms)
"hHW" = (
/obj/effect/turf_decal/tile/yellow{
dir = 1
@@ -17999,7 +18060,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
/area/crew_quarters/dorms)
"hKt" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -18125,7 +18186,7 @@
/area/engine/secure_construction)
"hNT" = (
/obj/effect/landmark/event_spawn,
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
/area/crew_quarters/dorms)
"hNZ" = (
/obj/effect/turf_decal/tile/yellow{
@@ -18152,7 +18213,7 @@
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
-/area/storage/atmos)
+/area/maintenance/department/electrical)
"hOw" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/tile/neutral{
@@ -18401,6 +18462,10 @@
},
/turf/open/floor/plasteel,
/area/quartermaster/storage)
+"hUg" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"hUo" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
@@ -18552,6 +18617,10 @@
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
+"hWp" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"hWW" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
@@ -18864,28 +18933,6 @@
/obj/machinery/space_heater,
/turf/open/floor/plasteel,
/area/engine/atmos)
-"igK" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/machinery/door/window/eastleft{
- name = "Blue Corner"
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
"igO" = (
/obj/machinery/vending/boozeomat,
/turf/open/floor/wood{
@@ -18914,17 +18961,6 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/flasher{
- id = "AI";
- pixel_x = -26;
- pixel_y = 3
- },
-/obj/machinery/turretid{
- icon_state = "control_stun";
- name = "AI Chamber turret control";
- pixel_x = -25;
- pixel_y = -3
- },
/turf/open/floor/circuit/off,
/area/ai_monitored/turret_protected/ai)
"ihE" = (
@@ -18935,6 +18971,7 @@
dir = 10
},
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/obj/machinery/portable_atmospherics/canister,
/turf/open/floor/plasteel,
/area/science/mixing)
"ihJ" = (
@@ -18968,6 +19005,9 @@
/obj/machinery/power/smes,
/turf/open/floor/plating,
/area/maintenance/department/electrical)
+"ihY" = (
+/turf/open/floor/plasteel/dark,
+/area/science/robotics/lab)
"iiM" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -19303,6 +19343,12 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
+"iru" = (
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/circuit/off,
+/area/ai_monitored/turret_protected/ai)
"irN" = (
/obj/machinery/requests_console{
department = "AI";
@@ -19361,7 +19407,7 @@
},
/obj/machinery/light,
/turf/open/floor/plating,
-/area/storage/atmos)
+/area/maintenance/department/electrical)
"itw" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -19435,7 +19481,7 @@
dir = 1;
name = "north facing firelock"
},
-/turf/open/floor/carpet,
+/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"iuP" = (
/obj/machinery/door/airlock/external{
@@ -19444,15 +19490,6 @@
},
/turf/open/floor/engine,
/area/engine/atmospherics_engine)
-"ivM" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/obj/machinery/door/airlock/external{
- name = "Escape Airlock"
- },
-/turf/open/floor/plating,
-/area/hallway/secondary/exit/departure_lounge)
"ivQ" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -19486,6 +19523,13 @@
},
/turf/open/floor/plasteel,
/area/quartermaster/storage)
+"iwH" = (
+/obj/structure/extinguisher_cabinet{
+ pixel_x = 27
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"ixf" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -19499,6 +19543,12 @@
/obj/item/hand_tele,
/turf/open/floor/plasteel/dark,
/area/teleporter)
+"ixO" = (
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/solar/port/aft)
"ixZ" = (
/obj/structure/chair/office/dark,
/mob/living/simple_animal/pet/cat/Runtime{
@@ -19789,6 +19839,13 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
+/obj/item/radio/intercom{
+ name = "Station Intercom (General)";
+ pixel_x = -28
+ },
+/obj/machinery/light{
+ dir = 8
+ },
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai_upload_foyer)
"iFl" = (
@@ -19974,7 +20031,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
/area/crew_quarters/dorms)
"iJK" = (
/obj/structure/table/reinforced,
@@ -20016,6 +20073,13 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
+"iMk" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plating,
+/area/ai_monitored/turret_protected/aisat/service)
"iML" = (
/obj/machinery/light,
/obj/machinery/requests_console{
@@ -20028,14 +20092,15 @@
/turf/open/floor/carpet,
/area/crew_quarters/heads/hop)
"iMX" = (
-/obj/structure/cable,
-/obj/machinery/power/terminal,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/machinery/porta_turret/ai{
+ dir = 4
+ },
/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai_upload)
"iNi" = (
-/obj/structure/window/plasma/reinforced{
- dir = 8
- },
/obj/machinery/computer/rdconsole/production{
dir = 4
},
@@ -20045,6 +20110,9 @@
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
+/obj/structure/window/reinforced{
+ dir = 8
+ },
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"iNE" = (
@@ -20060,22 +20128,6 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
-"iNK" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue,
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
"iNV" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -20100,12 +20152,6 @@
/obj/structure/extinguisher_cabinet{
pixel_x = -27
},
-/obj/structure/window/plasma/reinforced{
- dir = 8
- },
-/obj/structure/window/plasma/reinforced{
- dir = 1
- },
/obj/machinery/rnd/production/protolathe/department/engineering,
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -20117,6 +20163,12 @@
c_tag = "Engineering Storage";
dir = 4
},
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/structure/window/reinforced{
+ dir = 8
+ },
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"iOG" = (
@@ -20161,6 +20213,13 @@
/obj/machinery/light,
/turf/open/floor/plasteel,
/area/hallway/primary/port)
+"iQu" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"iQv" = (
/obj/machinery/door/airlock/public/glass{
name = "Courtroom";
@@ -20202,12 +20261,12 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"iRF" = (
-/obj/machinery/door/airlock/external,
/obj/machinery/door/firedoor/border_only{
dir = 1;
name = "north facing firelock"
},
/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/external/glass,
/turf/open/floor/plating,
/area/hallway/primary/aft)
"iRO" = (
@@ -20244,9 +20303,13 @@
/turf/open/floor/plasteel/cult,
/area/lawoffice)
"iSB" = (
-/obj/machinery/light/floor,
-/turf/open/floor/plating/asteroid/snow/icemoon,
-/area/icemoon/surface/outdoors)
+/obj/structure/cable,
+/obj/machinery/power/solar{
+ id = "auxsolareast";
+ name = "Port Auxiliary Solar Array"
+ },
+/turf/open/floor/plating/asteroid/snow/ice/icemoon/solarpanel,
+/area/solar/port/fore)
"iTP" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/carpet,
@@ -20402,7 +20465,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
/area/crew_quarters/dorms)
"iZu" = (
/obj/machinery/firealarm{
@@ -20707,7 +20770,7 @@
/area/quartermaster/storage)
"jjB" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
/area/crew_quarters/dorms)
"jjC" = (
/obj/structure/closet/crate,
@@ -20774,7 +20837,7 @@
},
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
-/area/storage/atmos)
+/area/maintenance/department/electrical)
"jmU" = (
/obj/effect/turf_decal/tile/brown{
dir = 1
@@ -20896,10 +20959,11 @@
/turf/open/floor/plasteel/dark,
/area/hallway/primary/fore)
"jso" = (
-/obj/machinery/light/small{
- dir = 8
+/obj/machinery/power/smes{
+ charge = 5e+006
},
-/turf/open/floor/circuit/off,
+/obj/structure/cable,
+/turf/open/floor/circuit,
/area/ai_monitored/turret_protected/ai)
"jsu" = (
/obj/structure/cable{
@@ -20950,11 +21014,11 @@
/turf/open/floor/plasteel/dark,
/area/hallway/primary/fore)
"jvV" = (
-/obj/machinery/mineral/stacking_unit_console{
- machinedir = 8
+/obj/structure/cable{
+ icon_state = "0-2"
},
-/turf/closed/wall,
-/area/maintenance/disposal)
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/solar/port/fore)
"jwc" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -21025,7 +21089,7 @@
name = "Starboard Solar Array"
},
/turf/open/floor/plating/asteroid/snow/ice/icemoon/solarpanel,
-/area/icemoon/surface/outdoors)
+/area/solar/starboard/aft)
"jxS" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/obj/structure/cable{
@@ -21120,22 +21184,6 @@
},
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
-"jAT" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/landmark/start/assistant,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
"jBk" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -21254,6 +21302,12 @@
/obj/effect/landmark/start/paramedic,
/turf/open/floor/plasteel/white,
/area/medical/paramedic)
+"jEm" = (
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/solar/starboard/aft)
"jER" = (
/obj/machinery/vending/kink,
/turf/open/floor/plating,
@@ -21567,7 +21621,7 @@
},
/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/plasteel,
-/area/storage/atmos)
+/area/maintenance/department/electrical)
"jOB" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -21602,6 +21656,12 @@
},
/turf/open/floor/plating,
/area/engine/atmospherics_engine)
+"jPf" = (
+/obj/machinery/computer/rdconsole/core{
+ dir = 8
+ },
+/turf/open/floor/circuit,
+/area/science/lab)
"jPh" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
@@ -21822,6 +21882,9 @@
"jWr" = (
/turf/closed/wall/r_wall,
/area/storage/tech)
+"jWw" = (
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/solar/starboard/aft)
"jWx" = (
/obj/structure/table/glass,
/obj/item/stack/sheet/mineral/plasma,
@@ -21880,7 +21943,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
/area/crew_quarters/dorms)
"jYS" = (
/obj/structure/chair{
@@ -21939,6 +22002,13 @@
/obj/machinery/smartfridge,
/turf/open/floor/plasteel,
/area/hydroponics)
+"kbE" = (
+/obj/structure/chair/comfy/brown{
+ color = "#596479";
+ dir = 8
+ },
+/turf/open/transparent/glass/reinforced,
+/area/crew_quarters/fitness)
"kbR" = (
/obj/structure/table,
/obj/item/storage/firstaid/regular{
@@ -22025,15 +22095,18 @@
},
/turf/open/floor/plasteel,
/area/storage/auxiliary)
+"kdy" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/freezer,
+/area/crew_quarters/dorms)
"kdA" = (
/obj/structure/table/glass,
/obj/machinery/firealarm{
dir = 4;
pixel_x = -24
},
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
/turf/open/floor/plasteel/white,
/area/science/lab)
"kdM" = (
@@ -22122,24 +22195,11 @@
/turf/open/floor/carpet,
/area/chapel/office)
"kge" = (
-/obj/structure/window{
- dir = 8
- },
-/obj/structure/window{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red{
+/obj/structure/chair/comfy/brown{
+ color = "#596479";
dir = 4
},
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/plasteel,
+/turf/open/transparent/glass/reinforced,
/area/crew_quarters/fitness)
"kgx" = (
/obj/structure/table,
@@ -22243,6 +22303,14 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
+"kjx" = (
+/obj/machinery/door/window/eastright{
+ dir = 8;
+ name = "Robotics Surgery";
+ req_access_txt = "29"
+ },
+/turf/open/floor/plasteel/dark,
+/area/science/robotics/lab)
"kkn" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -22410,7 +22478,7 @@
icon_state = "2-8"
},
/turf/open/floor/plating/snowed/smoothed/icemoon,
-/area/icemoon/surface/outdoors)
+/area/solar/starboard/fore)
"kol" = (
/obj/machinery/light{
dir = 1
@@ -22932,6 +23000,13 @@
},
/turf/open/floor/wood,
/area/crew_quarters/bar)
+"kHJ" = (
+/obj/structure/grille,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plating/asteroid/snow/icemoon,
+/area/icemoon/surface/outdoors)
"kHP" = (
/obj/machinery/atmospherics/pipe/manifold/yellow/visible{
dir = 4
@@ -22961,6 +23036,12 @@
},
/turf/open/floor/plating,
/area/maintenance/solars/port/fore)
+"kIV" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"kJk" = (
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 9
@@ -23061,7 +23142,6 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/door/airlock/external,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
@@ -23069,6 +23149,7 @@
dir = 4
},
/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/external/glass,
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"kMy" = (
@@ -23151,9 +23232,6 @@
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"kPu" = (
-/obj/structure/window/plasma/reinforced{
- dir = 4
- },
/obj/structure/table,
/obj/item/stack/sheet/metal/fifty,
/obj/item/stack/sheet/metal/fifty,
@@ -23164,6 +23242,9 @@
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
+/obj/structure/window/reinforced{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"kPA" = (
@@ -23225,9 +23306,6 @@
},
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/maintenance/aft/secondary)
-"kRk" = (
-/turf/open/floor/plasteel/white,
-/area/crew_quarters/dorms)
"kRz" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -23361,6 +23439,13 @@
"kVO" = (
/turf/closed/wall,
/area/hallway/primary/aft)
+"kWz" = (
+/obj/machinery/door/airlock{
+ id_tag = "Dorm6";
+ name = "Room Five"
+ },
+/turf/open/floor/carpet/purple,
+/area/crew_quarters/dorms)
"kWC" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -23371,6 +23456,17 @@
/obj/machinery/door/airlock/maintenance,
/turf/open/floor/plating,
/area/maintenance/aft/secondary)
+"kXL" = (
+/obj/machinery/door/airlock/public/glass{
+ name = "Snow Airlock"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1;
+ name = "north facing firelock"
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
"kXY" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -23484,7 +23580,7 @@
name = "Port Auxiliary Solar Array"
},
/turf/open/floor/plating/asteroid/snow/ice/icemoon/solarpanel,
-/area/icemoon/surface/outdoors)
+/area/solar/starboard/fore)
"lbv" = (
/obj/machinery/atmospherics/components/binary/pump,
/obj/machinery/door/firedoor/border_only{
@@ -23493,6 +23589,19 @@
},
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
+"lcv" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/light/floor,
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/icemoon/surface/outdoors)
"ldt" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -23591,15 +23700,15 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/door/airlock/public/glass{
- name = "Hydroponics";
- req_access_txt = "35"
- },
/obj/machinery/door/firedoor/border_only{
dir = 1;
name = "north facing firelock"
},
/obj/structure/disposalpipe/segment,
+/obj/machinery/door/airlock{
+ name = "Hydroponics";
+ req_access_txt = "35"
+ },
/turf/open/floor/plasteel,
/area/hydroponics)
"lfD" = (
@@ -23619,6 +23728,12 @@
/obj/structure/closet/cardboard,
/turf/open/floor/plating,
/area/maintenance/starboard)
+"lgg" = (
+/obj/structure/fluff/railing{
+ dir = 5
+ },
+/turf/open/transparent/openspace/icemoon,
+/area/engine/atmospherics_engine)
"lgn" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -23671,14 +23786,12 @@
/turf/open/floor/plasteel,
/area/maintenance/aft)
"lhr" = (
-/obj/structure/cable{
- icon_state = "0-8"
+/obj/machinery/mineral/stacking_unit_console{
+ machinedir = 1;
+ pixel_x = -30
},
-/obj/machinery/power/smes{
- charge = 5e+006
- },
-/turf/open/floor/circuit,
-/area/ai_monitored/turret_protected/ai_upload)
+/turf/open/floor/plasteel,
+/area/maintenance/disposal)
"lhB" = (
/obj/machinery/camera{
c_tag = "Northwestern Hall 7";
@@ -23708,29 +23821,27 @@
/obj/structure/cable{
icon_state = "2-8"
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/obj/effect/landmark/start/assistant,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 10
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"liL" = (
-/obj/structure/cable{
- icon_state = "0-2"
- },
/obj/machinery/ai_slipper{
uses = 10
},
-/obj/machinery/power/apc/highcap/five_k{
- areastring = "/area/ai_monitored/turret_protected/ai";
+/obj/machinery/door/window{
+ base_state = "rightsecure";
dir = 4;
- name = "AI Chamber APC";
- pixel_x = 24
+ icon_state = "rightsecure";
+ layer = 4.1;
+ name = "Secondary AI Core Access";
+ obj_integrity = 300;
+ pixel_x = 4;
+ req_access_txt = "16"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
},
/turf/open/floor/circuit/off,
/area/ai_monitored/turret_protected/ai)
@@ -23755,11 +23866,11 @@
/turf/open/floor/pod/dark,
/area/medical/paramedic)
"lki" = (
-/obj/machinery/door/airlock/external,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/external/glass,
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"lkP" = (
@@ -23990,7 +24101,7 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/storage/atmos)
+/area/maintenance/department/electrical)
"lqW" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
@@ -24542,7 +24653,12 @@
dir = 4
},
/obj/effect/turf_decal/tile/neutral,
-/obj/structure/weightmachine/stacklifter,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 9
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"lJi" = (
@@ -24569,12 +24685,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/icemoon/surface/outdoors)
-"lJN" = (
-/obj/machinery/light{
- dir = 1
- },
-/turf/open/floor/plasteel/white,
-/area/crew_quarters/dorms)
"lKT" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -24589,12 +24699,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/wood,
/area/crew_quarters/theatre)
-"lLv" = (
-/obj/structure/chair/comfy/beige{
- dir = 8
- },
-/turf/open/floor/carpet,
-/area/crew_quarters/dorms)
"lLD" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -24670,6 +24774,19 @@
},
/turf/open/floor/carpet/orange,
/area/engine/secure_construction)
+"lOa" = (
+/obj/machinery/door/airlock/public/glass{
+ name = "Dormitory"
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 8;
+ name = "west facing firelock"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
"lOs" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
@@ -24714,27 +24831,35 @@
/obj/machinery/atmospherics/pipe/simple/orange/visible,
/turf/open/floor/plasteel,
/area/engine/atmospherics_engine)
-"lQp" = (
+"lQd" = (
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "4-8"
},
-/obj/machinery/porta_turret/ai{
- dir = 4
+/obj/structure/cable{
+ icon_state = "1-8"
},
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/turret_protected/ai)
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/solar/starboard/aft)
+"lQp" = (
+/obj/machinery/atmospherics/components/binary/pump{
+ dir = 1;
+ name = "waste relief valve"
+ },
+/turf/open/floor/plasteel,
+/area/engine/atmos)
"lQs" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/wood,
/area/hallway/secondary/exit/departure_lounge)
"lQJ" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 4
+/obj/structure/fluff/railing{
+ dir = 9
},
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
+/turf/open/transparent/openspace/icemoon,
+/area/icemoon/surface/outdoors)
"lRx" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
@@ -25105,7 +25230,9 @@
dir = 4
},
/obj/effect/turf_decal/tile/green,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark/side{
+ dir = 5
+ },
/area/hydroponics)
"mbM" = (
/obj/effect/turf_decal/tile/blue{
@@ -25214,6 +25341,13 @@
},
/turf/open/floor/plasteel/white,
/area/crew_quarters/heads/cmo)
+"mfU" = (
+/obj/machinery/door/airlock/public/glass{
+ name = "Holodeck Door"
+ },
+/obj/machinery/door/firedoor,
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"mgo" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/firedoor/border_only{
@@ -25389,7 +25523,7 @@
icon_state = "4-8"
},
/turf/open/floor/plating/snowed/smoothed/icemoon,
-/area/icemoon/surface/outdoors)
+/area/solar/port/fore)
"mmO" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -25473,11 +25607,11 @@
/turf/open/floor/plating,
/area/medical/virology)
"mps" = (
-/obj/machinery/atmospherics/components/binary/valve{
- dir = 4
+/obj/structure/chair/comfy/beige{
+ dir = 8
},
-/turf/open/floor/plating/asteroid/snow/icemoon,
-/area/icemoon/surface/outdoors)
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
"mqb" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 8
@@ -25497,6 +25631,15 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
+"mqd" = (
+/obj/item/paper/fluff{
+ info = "Crystal has been moved to a lockbox in secure storage until further notice.";
+ name = "Note from an engineer";
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/turf/open/floor/engine,
+/area/engine/supermatter)
"mqm" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -25589,7 +25732,7 @@
/turf/open/floor/plating,
/area/maintenance/aft/secondary)
"mtP" = (
-/turf/open/floor/carpet,
+/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"mtY" = (
/obj/structure/cable{
@@ -25844,17 +25987,28 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/quartermaster/miningdock)
+"mEH" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"mEI" = (
/obj/structure/table/reinforced,
/obj/machinery/door/window/eastright{
base_state = "left";
- dir = 2;
+ dir = 1;
icon_state = "left";
name = "Chemistry Desk";
req_access_txt = "33"
},
/obj/machinery/door/firedoor/border_only,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/door/window/eastright{
+ dir = 2;
+ name = "Chemistry Desk"
+ },
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"mFg" = (
@@ -25915,6 +26069,16 @@
/obj/machinery/space_heater,
/turf/open/floor/plating,
/area/icemoon/surface/outdoors)
+"mHm" = (
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"mHT" = (
/obj/structure/closet/l3closet/scientist,
/obj/item/extinguisher,
@@ -26525,7 +26689,7 @@
},
/obj/structure/bed,
/obj/effect/spawner/lootdrop/bedsheet,
-/turf/open/floor/carpet,
+/turf/open/floor/carpet/blue,
/area/crew_quarters/dorms)
"mWD" = (
/obj/structure/cable{
@@ -26616,6 +26780,10 @@
/obj/machinery/door/firedoor/border_only{
dir = 1
},
+/obj/machinery/door/window/eastright{
+ dir = 1;
+ name = "Chemistry Desk"
+ },
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"mZk" = (
@@ -26633,7 +26801,11 @@
name = "Station Intercom (General)";
pixel_x = 30
},
-/turf/open/floor/carpet,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/wood,
/area/crew_quarters/dorms)
"nbr" = (
/obj/structure/cable{
@@ -26973,13 +27145,13 @@
/turf/open/floor/plating,
/area/security/checkpoint/medical)
"nlF" = (
-/obj/machinery/door/airlock/public/glass{
- name = "Holodeck Door"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/turf/open/floor/plasteel/white,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"nlM" = (
/obj/machinery/light{
@@ -26992,19 +27164,6 @@
/obj/machinery/rnd/production/techfab/department/cargo,
/turf/open/floor/plasteel,
/area/quartermaster/miningdock)
-"nmL" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/obj/effect/landmark/start/assistant,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/crew_quarters/fitness)
"nmM" = (
/obj/effect/turf_decal/tile/yellow{
dir = 1
@@ -27145,7 +27304,6 @@
/area/storage/auxiliary)
"nrY" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/door/airlock/external,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
@@ -27153,7 +27311,8 @@
name = "south facing firelock"
},
/obj/structure/fans/tiny,
-/turf/open/floor/carpet,
+/obj/machinery/door/airlock/external/glass,
+/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"nsf" = (
/obj/machinery/door/firedoor,
@@ -27242,6 +27401,12 @@
dir = 4;
network = list("aicore")
},
+/obj/machinery/light/small{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
/turf/open/floor/circuit/off,
/area/ai_monitored/turret_protected/ai)
"ntX" = (
@@ -27256,7 +27421,7 @@
},
/obj/machinery/power/tracker,
/turf/open/floor/plating/asteroid/snow/ice/icemoon/solarpanel,
-/area/icemoon/surface/outdoors)
+/area/solar/starboard/fore)
"nuJ" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -27360,7 +27525,7 @@
icon_state = "0-2"
},
/turf/open/floor/plating/snowed/smoothed/icemoon,
-/area/icemoon/surface/outdoors)
+/area/solar/starboard/fore)
"nyT" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall/r_wall,
@@ -27448,7 +27613,7 @@
pixel_x = -24;
specialfunctions = 4
},
-/turf/open/floor/carpet,
+/turf/open/floor/carpet/blue,
/area/crew_quarters/dorms)
"nBk" = (
/obj/structure/cable{
@@ -27570,16 +27735,26 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"nDd" = (
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/structure/closet/crate/engineering{
+ name = "Antimatter Engine Crate"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/visible,
-/obj/machinery/light/floor,
-/turf/open/floor/plating/snowed/smoothed/icemoon,
-/area/icemoon/surface/outdoors)
+/obj/machinery/power/am_control_unit,
+/obj/item/am_shielding_container,
+/obj/item/am_shielding_container,
+/obj/item/am_shielding_container,
+/obj/item/am_shielding_container,
+/obj/item/am_shielding_container,
+/obj/item/am_shielding_container,
+/obj/item/am_shielding_container,
+/obj/item/am_shielding_container,
+/obj/item/am_shielding_container,
+/obj/item/am_shielding_container,
+/obj/item/am_shielding_container,
+/obj/item/am_shielding_container,
+/obj/item/am_containment,
+/obj/item/am_containment,
+/turf/open/floor/carpet/orange,
+/area/engine/secure_construction)
"nDl" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -27595,8 +27770,21 @@
icon_state = "0-8"
},
/obj/structure/grille,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/surface/outdoors)
+"nDN" = (
+/obj/machinery/atmospherics/pipe/simple/supply/visible{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/light/floor,
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/icemoon/surface/outdoors)
"nEa" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -27638,6 +27826,16 @@
},
/turf/open/floor/carpet,
/area/hallway/primary/port)
+"nEH" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"nEI" = (
/obj/structure/dresser,
/obj/machinery/camera{
@@ -27790,6 +27988,13 @@
/obj/machinery/atmospherics/pipe/simple/orange/visible,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
+"nJB" = (
+/obj/machinery/light,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
"nJI" = (
/obj/structure/table/reinforced,
/obj/machinery/door/window/southleft{
@@ -27919,10 +28124,15 @@
/area/hallway/primary/port)
"nOY" = (
/obj/machinery/camera{
- c_tag = "Dorms West";
+ c_tag = "Dorms Northeast";
dir = 8
},
-/turf/open/floor/carpet,
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = 24
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/wood,
/area/crew_quarters/dorms)
"nPd" = (
/obj/structure/cable{
@@ -28019,6 +28229,13 @@
/obj/machinery/atmospherics/pipe/simple/general/visible,
/turf/closed/wall/r_wall,
/area/science/mixing)
+"nRA" = (
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/structure/chair/comfy/beige,
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
"nRS" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -28182,6 +28399,12 @@
},
/turf/open/floor/plasteel/dark,
/area/security/main)
+"nYd" = (
+/obj/machinery/atmospherics/components/binary/valve{
+ dir = 4
+ },
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/icemoon/surface/outdoors)
"nYv" = (
/obj/structure/chair{
dir = 8
@@ -28637,7 +28860,7 @@
dir = 4;
name = "east facing firelock"
},
-/turf/open/floor/plasteel,
+/turf/open/floor/wood,
/area/crew_quarters/fitness)
"ojs" = (
/obj/structure/cable{
@@ -28822,6 +29045,18 @@
},
/turf/open/floor/engine/n2,
/area/engine/atmos)
+"onO" = (
+/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/ai_monitored/turret_protected/ai";
+ dir = 4;
+ name = "AI Chamber APC";
+ pixel_x = 24
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/circuit/off,
+/area/ai_monitored/turret_protected/ai)
"onY" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/green/visible{
@@ -28858,45 +29093,8 @@
/turf/open/floor/plasteel,
/area/engine/break_room)
"ooR" = (
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/effect/landmark/start/ai,
-/obj/item/radio/intercom{
- freerange = 1;
- frequency = 1447;
- name = "Private Channel";
- pixel_x = -25;
- pixel_y = -10
- },
-/obj/item/radio/intercom{
- freerange = 1;
- listening = 0;
- name = "Custom Channel";
- pixel_y = 27
- },
-/obj/item/radio/intercom{
- freerange = 1;
- name = "Common Channel";
- pixel_x = -25
- },
-/obj/machinery/button/door{
- id = "AI Chamber entrance shutters";
- name = "AI Chamber entrance shutters control";
- pixel_x = 8;
- pixel_y = 23;
- req_access_txt = "16"
- },
-/obj/machinery/door/window{
- base_state = "rightsecure";
- dir = 4;
- icon_state = "rightsecure";
- name = "Primary AI Core Access";
- obj_integrity = 300;
- req_access_txt = "16"
- },
-/turf/open/floor/circuit,
-/area/ai_monitored/turret_protected/ai)
+/turf/open/floor/plating/asteroid/snow/icemoon,
+/area/icemoon/surface/outdoors/unexplored/rivers/no_monsters)
"opq" = (
/obj/machinery/computer/rdservercontrol{
dir = 1
@@ -28915,11 +29113,8 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
-/obj/machinery/door/airlock/external{
- name = "External Access";
- req_access_txt = "13"
- },
/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/external/glass,
/turf/open/floor/plasteel,
/area/maintenance/aft)
"opY" = (
@@ -28993,6 +29188,10 @@
},
/turf/open/floor/plasteel,
/area/security/checkpoint/medical)
+"ord" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
"orN" = (
/obj/structure/cable{
icon_state = "2-4"
@@ -29251,10 +29450,7 @@
/area/engine/engineering)
"oBj" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/machinery/door/airlock/external{
- name = "External Access";
- req_access_txt = "13"
- },
+/obj/machinery/door/airlock/external/glass,
/turf/open/floor/plasteel,
/area/maintenance/aft)
"oBl" = (
@@ -29279,7 +29475,7 @@
c_tag = "Dorms South";
dir = 4
},
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
/area/crew_quarters/dorms)
"oBF" = (
/obj/structure/cable{
@@ -29399,6 +29595,12 @@
},
/turf/open/floor/wood,
/area/hallway/primary/central)
+"oGZ" = (
+/obj/structure/fluff/railing{
+ dir = 6
+ },
+/turf/open/transparent/openspace/icemoon,
+/area/engine/atmospherics_engine)
"oHl" = (
/obj/structure/closet/crate/secure/engineering{
name = "TEG crate"
@@ -29599,15 +29801,13 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai_upload_foyer)
"oME" = (
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/machinery/firealarm{
+ dir = 4;
+ pixel_x = -24
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 4
- },
-/obj/machinery/light/floor,
-/turf/open/floor/plating/snowed/smoothed/icemoon,
-/area/icemoon/surface/outdoors)
+/obj/machinery/vending/snack/random,
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"oNv" = (
/obj/structure/table/wood,
/turf/open/floor/wood,
@@ -29677,17 +29877,27 @@
/obj/effect/landmark/start/head_of_personnel,
/turf/open/floor/carpet,
/area/crew_quarters/heads/hop)
+"oPk" = (
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/solar/starboard/aft)
"oPP" = (
/obj/structure/table/reinforced,
/obj/machinery/door/window/eastright{
base_state = "left";
- dir = 2;
+ dir = 1;
icon_state = "left";
name = "Chemistry Desk";
req_access_txt = "33"
},
/obj/machinery/door/firedoor/border_only,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/door/window/eastright{
+ dir = 2;
+ name = "Chemistry Desk"
+ },
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"oPS" = (
@@ -29796,6 +30006,12 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/engine/storage)
+"oUT" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
"oUV" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -29992,17 +30208,7 @@
/turf/open/floor/plasteel,
/area/storage/primary)
"pbf" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
/turf/open/floor/plasteel,
@@ -30083,13 +30289,11 @@
/turf/open/floor/carpet,
/area/hallway/secondary/exit/departure_lounge)
"pce" = (
-/obj/machinery/door/airlock/external{
- name = "Auxiliary Airlock"
- },
/obj/machinery/door/firedoor/border_only{
name = "south facing firelock"
},
/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/external/glass,
/turf/open/floor/plating,
/area/hallway/secondary/exit/departure_lounge)
"pcl" = (
@@ -30231,23 +30435,11 @@
dir = 4
},
/obj/machinery/disposal/bin,
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
/area/crew_quarters/dorms)
"pgk" = (
-/obj/structure/window{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/turf/open/floor/plasteel,
+/obj/structure/table,
+/turf/open/transparent/glass/reinforced,
/area/crew_quarters/fitness)
"pgp" = (
/turf/closed/wall,
@@ -30417,7 +30609,7 @@
icon_state = "2-8"
},
/turf/open/floor/plating/snowed/smoothed/icemoon,
-/area/icemoon/surface/outdoors)
+/area/solar/port/aft)
"pkJ" = (
/turf/open/floor/wood{
icon_state = "wood-broken6"
@@ -30551,6 +30743,13 @@
"pqj" = (
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
+"pqm" = (
+/obj/machinery/camera{
+ c_tag = "Dorms Northwest";
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"pqs" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4
@@ -30690,7 +30889,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
/area/crew_quarters/dorms)
"ptv" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer1,
@@ -30703,6 +30902,16 @@
},
/turf/open/floor/engine,
/area/engine/atmospherics_engine)
+"ptH" = (
+/obj/machinery/computer/holodeck{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"ptU" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
@@ -30716,7 +30925,7 @@
dir = 4
},
/obj/machinery/door/poddoor/preopen{
- id = "xenobio2";
+ id = "xenobiospec";
name = "containment blast door"
},
/turf/open/floor/engine,
@@ -30885,6 +31094,15 @@
},
/turf/open/floor/circuit/telecomms/mainframe,
/area/tcommsat/server)
+"pvP" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/solar/starboard/aft)
"pvV" = (
/obj/machinery/airalarm{
pixel_y = 26
@@ -30921,6 +31139,9 @@
/area/engine/storage)
"pwE" = (
/obj/effect/landmark/start/cyborg,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat/service)
"pwL" = (
@@ -31076,14 +31297,12 @@
/turf/open/floor/plasteel/freezer,
/area/security/prison)
"pze" = (
-/obj/machinery/door/airlock/external{
- name = "Auxiliary Airlock"
- },
/obj/machinery/door/firedoor/border_only{
dir = 1;
name = "north facing firelock"
},
/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/external/glass,
/turf/open/floor/plating,
/area/quartermaster/miningdock)
"pzk" = (
@@ -31174,6 +31393,11 @@
},
/turf/open/floor/wood,
/area/crew_quarters/heads/captain)
+"pDg" = (
+/obj/structure/table,
+/obj/item/paicard,
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
"pDh" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
@@ -31344,8 +31568,12 @@
/turf/open/floor/plasteel,
/area/storage/primary)
"pIf" = (
-/turf/open/floor/plasteel/dark,
-/area/science/robotics/lab)
+/obj/machinery/vending/cigarette,
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
+"pIs" = (
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/solar/port/aft)
"pIz" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
@@ -31374,6 +31602,18 @@
},
/turf/open/floor/plasteel/dark,
/area/maintenance/department/bridge)
+"pJm" = (
+/obj/structure/table/optable{
+ name = "Robotics Operating Table"
+ },
+/obj/item/tank/internals/anesthetic,
+/obj/item/clothing/mask/breath,
+/obj/item/radio/intercom{
+ name = "Station Intercom (General)";
+ pixel_y = 29
+ },
+/turf/open/floor/plasteel/dark,
+/area/science/robotics/lab)
"pJS" = (
/turf/closed/wall,
/area/quartermaster/storage)
@@ -31649,6 +31889,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10
},
+/obj/machinery/light/floor,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
"pQg" = (
@@ -31804,7 +32045,6 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/machinery/door/airlock/external,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
@@ -31812,7 +32052,8 @@
name = "south facing firelock"
},
/obj/structure/fans/tiny,
-/turf/open/floor/carpet,
+/obj/machinery/door/airlock/external/glass,
+/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"pXl" = (
/obj/machinery/computer/cloning{
@@ -32020,7 +32261,7 @@
icon_state = "4-8"
},
/turf/open/floor/plating/snowed/smoothed/icemoon,
-/area/icemoon/surface/outdoors)
+/area/solar/port/fore)
"qfT" = (
/obj/machinery/holopad,
/turf/open/floor/carpet,
@@ -32101,6 +32342,10 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
+"qim" = (
+/obj/machinery/light,
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"qip" = (
/obj/structure/disposalpipe/trunk{
dir = 8
@@ -32145,6 +32390,18 @@
},
/turf/open/floor/plasteel,
/area/storage/primary)
+"qjF" = (
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/solar/starboard/aft)
"qkg" = (
/obj/effect/turf_decal/tile/green{
dir = 4
@@ -32236,23 +32493,7 @@
/turf/closed/wall,
/area/quartermaster/miningdock)
"qnx" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue,
-/turf/open/floor/plasteel,
+/turf/open/transparent/glass/reinforced,
/area/crew_quarters/fitness)
"qnC" = (
/obj/structure/cable,
@@ -32336,7 +32577,7 @@
},
/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/plasma,
/turf/open/floor/plating,
-/area/storage/atmos)
+/area/maintenance/department/electrical)
"qqo" = (
/obj/machinery/light{
dir = 4
@@ -32702,7 +32943,7 @@
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
-/area/storage/atmos)
+/area/maintenance/department/electrical)
"qAI" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -32729,6 +32970,13 @@
},
/turf/open/floor/carpet,
/area/hallway/primary/central)
+"qBl" = (
+/obj/machinery/mineral/ore_redemption{
+ input_dir = 4;
+ output_dir = 8
+ },
+/turf/open/floor/plating,
+/area/quartermaster/miningdock)
"qBu" = (
/obj/machinery/atmospherics/components/binary/pump,
/turf/open/floor/plasteel,
@@ -32865,7 +33113,7 @@
name = "Station Intercom (General)";
pixel_y = 29
},
-/turf/open/floor/carpet,
+/turf/open/floor/carpet/blue,
/area/crew_quarters/dorms)
"qFZ" = (
/obj/structure/closet/emcloset,
@@ -32946,12 +33194,19 @@
/area/hallway/primary/fore)
"qHC" = (
/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/yellow/visible,
+/obj/machinery/atmospherics/pipe/layer_manifold,
/turf/open/floor/plating,
/area/engine/atmos)
"qHL" = (
-/obj/structure/chair/comfy/beige{
- dir = 1
+/obj/machinery/door/airlock/public/glass{
+ name = "Dormitory"
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4;
+ name = "east facing firelock"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
},
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
@@ -32986,13 +33241,10 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/structure/chair/stool{
- pixel_y = 8
- },
/obj/machinery/camera{
- c_tag = "Dorms Central"
+ c_tag = "Dorms East"
},
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
/area/crew_quarters/dorms)
"qIR" = (
/obj/machinery/button/massdriver{
@@ -33021,6 +33273,18 @@
/obj/effect/turf_decal/tile/green,
/turf/open/floor/plasteel/white,
/area/medical/virology)
+"qIW" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/solar/starboard/aft)
"qJs" = (
/obj/structure/chair,
/obj/effect/turf_decal/stripes/line{
@@ -33074,9 +33338,6 @@
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"qKA" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -33084,6 +33345,9 @@
dir = 8
},
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 10
+ },
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"qKP" = (
@@ -33182,6 +33446,14 @@
},
/turf/open/floor/plasteel/freezer,
/area/medical/surgery)
+"qOJ" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/visible,
+/obj/machinery/light/floor,
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/icemoon/surface/outdoors)
"qOL" = (
/obj/effect/landmark/event_spawn,
/turf/open/floor/carpet,
@@ -33335,6 +33607,12 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/port)
+"qSF" = (
+/obj/structure/chair/comfy/beige{
+ dir = 1
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
"qSJ" = (
/obj/machinery/airalarm{
pixel_y = 28
@@ -33525,6 +33803,12 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
+"qZb" = (
+/obj/structure/fluff/railing{
+ dir = 10
+ },
+/turf/open/transparent/openspace/icemoon,
+/area/engine/atmospherics_engine)
"qZO" = (
/obj/machinery/atmospherics/pipe/simple/supply/visible{
dir = 4
@@ -33564,14 +33848,20 @@
/turf/closed/wall/r_wall,
/area/maintenance/starboard)
"raM" = (
-/obj/machinery/door/airlock/external,
-/obj/machinery/door/firedoor/border_only{
- dir = 8;
- name = "west facing firelock"
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "holoprivacy";
+ name = "Holodeck Shutters"
},
-/obj/structure/fans/tiny,
/turf/open/floor/plating,
/area/crew_quarters/dorms)
+"rbb" = (
+/obj/machinery/space_heater,
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
"rbg" = (
/obj/structure/disposalpipe/sorting/mail/flip{
dir = 8;
@@ -34093,7 +34383,7 @@
name = "Starboard Solar Array"
},
/turf/open/floor/plating/asteroid/snow/ice/icemoon/solarpanel,
-/area/icemoon/surface/outdoors)
+/area/solar/starboard/aft)
"roS" = (
/obj/machinery/computer/card/minor/cmo{
dir = 4
@@ -34325,9 +34615,9 @@
/turf/open/floor/engine,
/area/engine/engineering)
"ruo" = (
-/obj/machinery/atmospherics/pipe/simple/supply/visible,
-/turf/open/floor/plating/asteroid/snow/icemoon,
-/area/icemoon/surface/outdoors)
+/obj/machinery/vending/cola/random,
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"ruD" = (
/obj/machinery/airalarm{
dir = 1;
@@ -34410,7 +34700,7 @@
name = "Port Solar Array"
},
/turf/open/floor/plating/asteroid/snow/ice/icemoon/solarpanel,
-/area/icemoon/surface/outdoors)
+/area/solar/port/aft)
"rxJ" = (
/obj/item/stack/cable_coil/random,
/turf/open/floor/plating/asteroid/snow/icemoon,
@@ -34545,7 +34835,6 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/machinery/portable_atmospherics/canister,
/turf/open/floor/plasteel,
/area/science/mixing)
"rDE" = (
@@ -34568,6 +34857,18 @@
},
/turf/open/floor/plating,
/area/maintenance/department/electrical)
+"rEF" = (
+/obj/structure/bed,
+/obj/effect/spawner/lootdrop/bedsheet,
+/obj/machinery/button/door{
+ id = "Dorm6";
+ name = "Dorm Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_x = 25;
+ specialfunctions = 4
+ },
+/turf/open/floor/carpet/purple,
+/area/crew_quarters/dorms)
"rFk" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/freezer,
@@ -34703,6 +35004,12 @@
},
/turf/open/floor/circuit/off,
/area/ai_monitored/turret_protected/ai)
+"rKC" = (
+/obj/machinery/camera{
+ c_tag = "Dorms West"
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
"rLb" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -34802,28 +35109,16 @@
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"rPU" = (
-/obj/machinery/conveyor{
- dir = 4;
- id = "robo1"
+/obj/machinery/light{
+ dir = 8
},
-/obj/item/stack/sheet/metal/fifty,
-/obj/item/stack/sheet/metal/fifty,
-/obj/item/stack/sheet/metal/fifty,
-/obj/item/stack/sheet/glass{
- amount = 20;
- pixel_x = -3;
- pixel_y = 6
- },
-/turf/open/floor/plasteel/dark,
-/area/science/robotics/lab)
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"rQs" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/hallway/primary/fore)
"rQu" = (
-/obj/structure/cable{
- icon_state = "1-8"
- },
/obj/machinery/firealarm{
dir = 8;
pixel_x = 24
@@ -34863,9 +35158,27 @@
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"rRk" = (
-/obj/structure/chair/comfy/beige,
+/obj/machinery/door/airlock/public/glass{
+ name = "Dormitory"
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4;
+ name = "east facing firelock"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
+"rRQ" = (
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/science/lab)
"rRV" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
@@ -34934,6 +35247,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
+/obj/machinery/light/floor,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
"rTW" = (
@@ -35050,9 +35364,7 @@
/turf/open/floor/wood,
/area/crew_quarters/bar)
"rYc" = (
-/obj/machinery/computer/arcade/battle{
- dir = 8
- },
+/obj/machinery/vending/cigarette,
/turf/open/floor/wood,
/area/crew_quarters/bar)
"rYi" = (
@@ -35098,6 +35410,13 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/port)
+"sae" = (
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = 24
+ },
+/turf/open/floor/plasteel/dark,
+/area/science/robotics/lab)
"sat" = (
/obj/machinery/light,
/turf/open/floor/plasteel/white,
@@ -35182,6 +35501,12 @@
/turf/open/floor/plasteel,
/area/maintenance/aft)
"scF" = (
+/obj/machinery/turretid{
+ icon_state = "control_stun";
+ name = "AI Chamber turret control";
+ pixel_x = 24;
+ pixel_y = -3
+ },
/obj/structure/cable{
icon_state = "1-2"
},
@@ -35672,6 +35997,16 @@
},
/turf/open/floor/engine/n2o,
/area/engine/atmos)
+"stP" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/grille,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating/asteroid/snow/icemoon,
+/area/icemoon/surface/outdoors)
"stW" = (
/obj/structure/table/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -35686,7 +36021,7 @@
"sub" = (
/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/co2,
/turf/open/floor/plating,
-/area/storage/atmos)
+/area/maintenance/department/electrical)
"sup" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -35749,14 +36084,8 @@
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
"swQ" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/turf/open/floor/plating/asteroid/snow/icemoon,
-/area/icemoon/surface/outdoors)
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"sxa" = (
/obj/machinery/requests_console{
department = "Medbay";
@@ -35961,20 +36290,16 @@
/turf/closed/wall/r_wall,
/area/crew_quarters/heads/captain)
"sFw" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1
- },
/obj/machinery/light,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/blue{
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"sGC" = (
@@ -36057,7 +36382,7 @@
/turf/open/floor/engine,
/area/engine/engineering)
"sIT" = (
-/obj/structure/reagent_dispensers/fueltank,
+/obj/machinery/recharge_station,
/turf/open/floor/pod/dark,
/area/medical/paramedic)
"sJs" = (
@@ -36089,9 +36414,6 @@
/turf/open/floor/plasteel/dark,
/area/hallway/secondary/entry)
"sKN" = (
-/obj/structure/window/plasma/reinforced{
- dir = 8
- },
/obj/machinery/rnd/production/circuit_imprinter,
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -36099,6 +36421,9 @@
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
+/obj/structure/window/reinforced{
+ dir = 8
+ },
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"sLg" = (
@@ -36150,6 +36475,12 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
+"sLF" = (
+/obj/structure/sign/mining{
+ pixel_x = 32
+ },
+/turf/open/floor/plasteel,
+/area/quartermaster/miningdock)
"sLN" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/turf/open/floor/plasteel,
@@ -36214,6 +36545,32 @@
name = "Robotics Lab APC";
pixel_x = 25
},
+/obj/structure/table,
+/obj/item/storage/toolbox/mechanical{
+ pixel_x = -2;
+ pixel_y = -1
+ },
+/obj/item/storage/toolbox/electrical{
+ pixel_x = 1;
+ pixel_y = 6
+ },
+/obj/item/clothing/head/welding{
+ pixel_x = -3;
+ pixel_y = 5
+ },
+/obj/item/clothing/head/welding{
+ pixel_x = -3;
+ pixel_y = 5
+ },
+/obj/item/clothing/glasses/welding,
+/obj/item/clothing/glasses/welding,
+/obj/item/multitool{
+ pixel_x = 3
+ },
+/obj/item/multitool{
+ pixel_x = 3
+ },
+/obj/item/storage/belt/utility,
/turf/open/floor/plasteel/white,
/area/science/robotics/lab)
"sOi" = (
@@ -36308,6 +36665,15 @@
},
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/surface/outdoors)
+"sQk" = (
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/solar/starboard/aft)
"sRh" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
@@ -36394,8 +36760,24 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"sTq" = (
+/obj/structure/fluff/railing{
+ dir = 1
+ },
/turf/open/transparent/openspace/icemoon,
/area/engine/atmospherics_engine)
+"sTt" = (
+/obj/structure/table,
+/obj/item/paper_bin{
+ pixel_x = -6;
+ pixel_y = 4
+ },
+/obj/item/pen/fourcolor,
+/obj/item/paper_bin/bundlenatural{
+ pixel_x = 6;
+ pixel_y = 4
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
"sTz" = (
/obj/effect/turf_decal/bot_white,
/obj/structure/window/reinforced{
@@ -36882,22 +37264,9 @@
/turf/open/floor/plasteel/dark,
/area/hallway/primary/fore)
"tgd" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/structure/window{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"tht" = (
@@ -37179,7 +37548,7 @@
icon_state = "1-8"
},
/turf/open/floor/plating/snowed/smoothed/icemoon,
-/area/icemoon/surface/outdoors)
+/area/solar/port/aft)
"tod" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -37286,6 +37655,7 @@
/obj/structure/disposalpipe/segment{
dir = 6
},
+/obj/machinery/light/floor,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
"tqp" = (
@@ -37355,7 +37725,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
/area/crew_quarters/dorms)
"ttl" = (
/obj/structure/cable{
@@ -37553,6 +37923,18 @@
},
/turf/open/floor/plasteel,
/area/quartermaster/miningoffice)
+"tzb" = (
+/obj/machinery/light/small{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/power/terminal{
+ dir = 1
+ },
+/turf/open/floor/circuit/off,
+/area/ai_monitored/turret_protected/ai)
"tzB" = (
/obj/machinery/atmospherics/pipe/simple{
dir = 6
@@ -37747,6 +38129,12 @@
/obj/machinery/atmospherics/components/binary/pump/on,
/turf/open/floor/plasteel,
/area/engine/atmos)
+"tEC" = (
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/solar/port/aft)
"tEQ" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -37774,11 +38162,12 @@
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
"tFu" = (
-/obj/structure/cable{
- icon_state = "2-4"
+/obj/item/radio/intercom{
+ name = "Station Intercom (General)";
+ pixel_x = 30
},
-/turf/open/floor/plasteel/dark,
-/area/ai_monitored/turret_protected/ai)
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"tFN" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 4
@@ -37814,11 +38203,9 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/door/airlock/external{
- name = "Escape Airlock"
- },
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/external/glass,
/turf/open/floor/carpet,
/area/hallway/primary/port)
"tHr" = (
@@ -37892,9 +38279,12 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai_upload_foyer)
"tJi" = (
-/obj/machinery/vending/wardrobe/robo_wardrobe,
-/turf/open/floor/plasteel/white,
-/area/science/robotics/lab)
+/obj/structure/closet/secure_closet/personal/cabinet,
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/open/floor/carpet/purple,
+/area/crew_quarters/dorms)
"tJA" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -37964,6 +38354,16 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/quartermaster/miningoffice)
+"tLb" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/visible{
+ dir = 4
+ },
+/obj/machinery/light/floor,
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/icemoon/surface/outdoors)
"tLA" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -38107,17 +38507,14 @@
/turf/open/floor/plasteel/freezer,
/area/medical/surgery)
"tOz" = (
-/obj/machinery/light{
- dir = 1
+/obj/machinery/firealarm{
+ dir = 4;
+ pixel_x = -24
},
-/obj/machinery/door/airlock/public/glass{
- name = "Holodeck Door"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 6
},
-/obj/structure/fans/tiny,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
-/turf/open/floor/plasteel/white,
+/turf/open/floor/wood,
/area/crew_quarters/dorms)
"tOE" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -38138,10 +38535,12 @@
name = "Fitness Room APC";
pixel_y = -24
},
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"tPB" = (
@@ -38229,18 +38628,11 @@
/turf/open/floor/plasteel/dark,
/area/maintenance/department/bridge)
"tRC" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/structure/window{
- dir = 8
+/obj/structure/cable{
+ icon_state = "4-8"
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
@@ -38268,11 +38660,13 @@
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"tSd" = (
-/obj/structure/cable{
- icon_state = "2-8"
+/obj/item/radio/intercom{
+ dir = 4;
+ name = "Station Intercom (General)";
+ pixel_y = 29
},
-/turf/closed/wall/r_wall,
-/area/ai_monitored/turret_protected/ai)
+/turf/open/floor/carpet/purple,
+/area/crew_quarters/dorms)
"tSB" = (
/obj/machinery/atmospherics/pipe/simple{
dir = 4
@@ -38348,6 +38742,12 @@
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
+"tUq" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"tUF" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -38407,6 +38807,17 @@
},
/turf/open/floor/plasteel,
/area/science/robotics/mechbay)
+"tWs" = (
+/obj/machinery/door/airlock/external/glass,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/border_only{
+ name = "south facing firelock"
+ },
+/obj/structure/fans/tiny,
+/turf/open/floor/plasteel,
+/area/crew_quarters/dorms)
"tXn" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -38429,7 +38840,7 @@
pixel_x = -24;
specialfunctions = 4
},
-/turf/open/floor/carpet,
+/turf/open/floor/carpet/blue,
/area/crew_quarters/dorms)
"tYT" = (
/obj/structure/cable{
@@ -38718,7 +39129,7 @@
/area/engine/atmos)
"ugk" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
/area/crew_quarters/dorms)
"uha" = (
/obj/structure/cable{
@@ -38801,7 +39212,7 @@
/obj/machinery/door/firedoor/border_only{
name = "south facing firelock"
},
-/turf/open/floor/carpet,
+/turf/open/floor/carpet/blue,
/area/crew_quarters/dorms)
"ukJ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -38812,6 +39223,10 @@
},
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/kitchen)
+"ule" = (
+/obj/structure/sign/departments/botany,
+/turf/closed/wall,
+/area/hydroponics)
"ulh" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
@@ -38860,14 +39275,14 @@
/turf/open/floor/plating,
/area/crew_quarters/heads/hop)
"umC" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"umD" = (
@@ -38890,7 +39305,7 @@
dir = 4
},
/obj/structure/closet/wardrobe/white,
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
/area/crew_quarters/dorms)
"unA" = (
/obj/effect/spawner/structure/window/reinforced,
@@ -39029,7 +39444,7 @@
/obj/structure/cable,
/obj/machinery/power/smes,
/turf/open/floor/plating,
-/area/storage/atmos)
+/area/maintenance/department/electrical)
"utS" = (
/obj/structure/table,
/obj/item/clothing/suit/apron/surgical,
@@ -39044,11 +39459,18 @@
},
/turf/open/floor/plasteel/freezer,
/area/medical/surgery)
+"utY" = (
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"uup" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
-/area/storage/atmos)
+/area/maintenance/department/electrical)
"uut" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5
@@ -39103,13 +39525,9 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
/obj/effect/landmark/start/assistant,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 5
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
@@ -39192,6 +39610,12 @@
},
/turf/open/floor/plating,
/area/maintenance/solars/starboard/aft)
+"uyV" = (
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/solar/port/aft)
"uyW" = (
/obj/structure/cable{
icon_state = "0-4"
@@ -39382,13 +39806,13 @@
name = "Dormitory APC";
pixel_y = 24
},
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
/area/crew_quarters/dorms)
"uFq" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
-/obj/machinery/door/airlock/external{
+/obj/machinery/door/airlock/external/glass{
name = "Arrivals Airlock"
},
/turf/open/floor/plating,
@@ -39564,12 +39988,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/obj/structure/window/plasma/reinforced{
- dir = 4
- },
-/obj/structure/window/plasma/reinforced{
- dir = 1
- },
/obj/structure/table,
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/sheet/glass/fifty,
@@ -39580,6 +39998,12 @@
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/structure/window/reinforced{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"uKy" = (
@@ -39767,12 +40191,14 @@
/obj/structure/cable,
/obj/machinery/power/tracker,
/turf/open/floor/plating/asteroid/snow/ice/icemoon/solarpanel,
-/area/icemoon/surface/outdoors)
+/area/solar/starboard/aft)
"uRg" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/closet/bombcloset,
-/turf/open/floor/plasteel/white,
-/area/science/mixing)
+/obj/machinery/door/airlock{
+ id_tag = "Dorm7";
+ name = "Room Six"
+ },
+/turf/open/floor/carpet/purple,
+/area/crew_quarters/dorms)
"uRi" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -39841,8 +40267,14 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"uUi" = (
-/obj/machinery/computer/operating,
-/turf/open/floor/plasteel/white,
+/obj/machinery/mecha_part_fabricator,
+/obj/item/stack/sheet/glass{
+ amount = 20;
+ pixel_x = -3;
+ pixel_y = 6
+ },
+/obj/item/stack/sheet/metal/fifty,
+/turf/open/floor/plasteel/dark,
/area/science/robotics/lab)
"uUk" = (
/obj/structure/disposalpipe/segment{
@@ -39935,6 +40367,7 @@
"uWn" = (
/obj/structure/table,
/obj/item/toy/cards/deck,
+/obj/item/storage/crayons,
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/fitness/recreation)
"uWo" = (
@@ -39966,6 +40399,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/light/floor,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
"uWW" = (
@@ -40244,11 +40678,9 @@
/turf/open/floor/circuit,
/area/science/robotics/mechbay)
"vdW" = (
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/turf/closed/wall/r_wall,
-/area/ai_monitored/turret_protected/ai_upload)
+/obj/structure/table/wood,
+/turf/open/floor/carpet/purple,
+/area/crew_quarters/dorms)
"vem" = (
/obj/structure/table/wood,
/obj/machinery/keycard_auth{
@@ -40266,7 +40698,7 @@
codes_txt = "patrol;next_patrol=CHW";
location = "Dorm"
},
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
/area/crew_quarters/dorms)
"veF" = (
/obj/structure/table/wood,
@@ -40405,7 +40837,7 @@
/obj/machinery/light{
dir = 1
},
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
/area/crew_quarters/dorms)
"vhf" = (
/obj/effect/spawner/structure/window/reinforced,
@@ -40483,6 +40915,11 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
+"vko" = (
+/obj/machinery/atmospherics/pipe/simple/supply/visible,
+/obj/machinery/light/floor,
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/icemoon/surface/outdoors)
"vkw" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -40606,13 +41043,10 @@
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"vow" = (
-/obj/machinery/door/airlock/public/glass{
- name = "Holodeck Door"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/turf/open/floor/plasteel/white,
+/turf/open/floor/wood,
/area/crew_quarters/dorms)
"voD" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -40701,7 +41135,7 @@
pixel_x = -24;
specialfunctions = 4
},
-/turf/open/floor/carpet,
+/turf/open/floor/carpet/blue,
/area/crew_quarters/dorms)
"vqZ" = (
/obj/structure/window/plasma/reinforced{
@@ -40734,7 +41168,7 @@
"vrg" = (
/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/n2o,
/turf/open/floor/plating,
-/area/storage/atmos)
+/area/maintenance/department/electrical)
"vrx" = (
/turf/closed/wall/r_wall,
/area/crew_quarters/dorms)
@@ -40810,7 +41244,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
/area/crew_quarters/dorms)
"vuk" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
@@ -41013,11 +41447,17 @@
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
"vzS" = (
-/obj/machinery/atmospherics/pipe/simple/supply/visible{
- dir = 5
+/obj/structure/bed,
+/obj/effect/spawner/lootdrop/bedsheet,
+/obj/machinery/button/door{
+ id = "Dorm7";
+ name = "Dorm Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_x = 25;
+ specialfunctions = 4
},
-/turf/open/floor/plating/snowed/smoothed/icemoon,
-/area/icemoon/surface/outdoors)
+/turf/open/floor/carpet/purple,
+/area/crew_quarters/dorms)
"vAh" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -41191,12 +41631,12 @@
icon_state = "4-8"
},
/turf/open/floor/plating/snowed/smoothed/icemoon,
-/area/icemoon/surface/outdoors)
+/area/solar/starboard/aft)
"vDI" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 6
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+ dir = 1
},
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
/area/crew_quarters/dorms)
"vEd" = (
/obj/effect/landmark/event_spawn,
@@ -41206,7 +41646,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 4
},
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
/area/crew_quarters/dorms)
"vEi" = (
/obj/structure/cable{
@@ -41293,6 +41733,7 @@
c_tag = "Northwest Paramedic Post";
network = list("ss13","medbay")
},
+/obj/item/wrench/medical,
/turf/open/floor/plasteel/white,
/area/medical/paramedic)
"vFe" = (
@@ -41304,6 +41745,18 @@
"vFM" = (
/turf/open/floor/plasteel,
/area/quartermaster/sorting)
+"vFT" = (
+/obj/structure/bed,
+/obj/effect/spawner/lootdrop/bedsheet,
+/obj/machinery/button/door{
+ id = "Dorm5";
+ name = "Dorm Bolt Control";
+ normaldoorcontrol = 1;
+ pixel_x = 25;
+ specialfunctions = 4
+ },
+/turf/open/floor/carpet/purple,
+/area/crew_quarters/dorms)
"vGi" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -41317,6 +41770,8 @@
/area/medical/virology)
"vGn" = (
/obj/machinery/light,
+/obj/vehicle/ridden/atv/snowmobile,
+/obj/item/key,
/turf/open/floor/pod/dark,
/area/medical/paramedic)
"vHU" = (
@@ -41428,17 +41883,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/structure/table,
-/obj/item/paper_bin{
- pixel_x = -6;
- pixel_y = 4
- },
-/obj/item/pen/fourcolor,
-/obj/item/paper_bin/bundlenatural{
- pixel_x = 6;
- pixel_y = 4
- },
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
/area/crew_quarters/dorms)
"vKO" = (
/obj/effect/spawner/structure/window/reinforced,
@@ -41455,16 +41900,15 @@
/turf/open/floor/plating,
/area/bridge)
"vKP" = (
-/obj/structure/weightmachine/stacklifter,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
/obj/machinery/computer/security/telescreen/entertainment{
pixel_y = -32
},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"vKT" = (
@@ -41475,7 +41919,7 @@
dir = 1
},
/turf/open/floor/plating,
-/area/storage/atmos)
+/area/maintenance/department/electrical)
"vLa" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -41599,6 +42043,10 @@
pixel_x = 3;
pixel_y = 3
},
+/obj/item/reagent_containers/glass/beaker/cryoxadone{
+ pixel_x = 5;
+ pixel_y = 9
+ },
/turf/open/floor/plasteel/white,
/area/medical/paramedic)
"vNY" = (
@@ -41667,15 +42115,15 @@
dir = 8
},
/area/chapel/main)
-"vQk" = (
-/obj/machinery/computer/holodeck{
- dir = 4
- },
-/turf/open/floor/plasteel/white,
-/area/crew_quarters/dorms)
"vQo" = (
/turf/closed/wall/r_wall,
/area/engine/supermatter)
+"vQz" = (
+/obj/structure/extinguisher_cabinet{
+ pixel_x = -27
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/dorms)
"vQW" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
@@ -41716,13 +42164,11 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
/obj/structure/disposalpipe/sorting/mail/flip{
dir = 4;
sortType = 26
},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"vSg" = (
@@ -41873,6 +42319,22 @@
},
/turf/open/floor/plating,
/area/maintenance/department/electrical)
+"vVJ" = (
+/obj/machinery/door/airlock/public/glass{
+ name = "Dormitory"
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 8;
+ name = "west facing firelock"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
"vVN" = (
/obj/effect/turf_decal/bot,
/obj/structure/window/reinforced{
@@ -41885,7 +42347,7 @@
/area/crew_quarters/fitness)
"vVZ" = (
/obj/structure/closet/secure_closet/personal/cabinet,
-/turf/open/floor/carpet,
+/turf/open/floor/carpet/blue,
/area/crew_quarters/dorms)
"vWg" = (
/obj/effect/turf_decal/delivery,
@@ -42230,11 +42692,11 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"weS" = (
-/obj/machinery/door/airlock/external,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/external/glass,
/turf/open/floor/plating,
/area/hallway/primary/aft)
"wfN" = (
@@ -42260,7 +42722,7 @@
/obj/machinery/door/firedoor/border_only{
name = "south facing firelock"
},
-/turf/open/floor/carpet,
+/turf/open/floor/carpet/blue,
/area/crew_quarters/dorms)
"wgu" = (
/obj/machinery/atmospherics/pipe/simple/supply/visible{
@@ -42279,6 +42741,20 @@
/obj/structure/chair/stool/bar,
/turf/open/floor/wood,
/area/crew_quarters/bar)
+"wgM" = (
+/obj/structure/sink{
+ dir = 8;
+ pixel_x = -12;
+ pixel_y = 2
+ },
+/obj/structure/mirror{
+ pixel_x = -28
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/freezer,
+/area/crew_quarters/dorms)
"wha" = (
/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/n2o{
dir = 1
@@ -42731,7 +43207,7 @@
name = "Port Auxiliary Solar Array"
},
/turf/open/floor/plating/asteroid/snow/ice/icemoon/solarpanel,
-/area/icemoon/surface/outdoors)
+/area/solar/starboard/fore)
"wuQ" = (
/obj/structure/table,
/obj/machinery/plantgenes{
@@ -42923,7 +43399,7 @@
req_access_txt = "12;24"
},
/turf/open/floor/plasteel,
-/area/storage/atmos)
+/area/maintenance/department/electrical)
"wEm" = (
/obj/structure/barricade/wooden{
max_integrity = 10;
@@ -43172,6 +43648,12 @@
/obj/machinery/chem_master/condimaster,
/turf/open/floor/plasteel,
/area/hydroponics)
+"wMH" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plating/snowed/smoothed/icemoon,
+/area/solar/starboard/aft)
"wMJ" = (
/obj/structure/closet/secure_closet/bar{
req_access_txt = "25"
@@ -43227,7 +43709,8 @@
icon_state = "4-8"
},
/obj/effect/landmark/event_spawn,
-/turf/open/floor/plasteel/white,
+/obj/effect/landmark/start/roboticist,
+/turf/open/floor/plasteel/dark,
/area/science/robotics/lab)
"wPT" = (
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
@@ -43329,11 +43812,9 @@
/turf/open/floor/plasteel/dark,
/area/security/prison)
"wSc" = (
-/obj/machinery/door/airlock/external{
- name = "Escape Airlock"
- },
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/external/glass,
/turf/open/floor/carpet,
/area/hallway/primary/port)
"wSy" = (
@@ -43560,6 +44041,7 @@
/obj/machinery/light{
dir = 1
},
+/obj/machinery/vending/cigarette,
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"xaS" = (
@@ -43611,22 +44093,10 @@
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"xcL" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/structure/window{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"xcY" = (
@@ -43656,6 +44126,14 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
+"xdr" = (
+/obj/item/storage/backpack/duffelbag/med/surgery,
+/obj/structure/table,
+/obj/structure/extinguisher_cabinet{
+ pixel_y = 30
+ },
+/turf/open/floor/plasteel/dark,
+/area/science/robotics/lab)
"xdD" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
dir = 4
@@ -43664,9 +44142,6 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"xeI" = (
-/obj/machinery/conveyor_switch/oneway{
- id = "robo1"
- },
/obj/structure/disposalpipe/segment{
dir = 9
},
@@ -43678,8 +44153,13 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"xfs" = (
-/obj/structure/table,
-/obj/item/paicard,
+/obj/machinery/door/airlock/public/glass{
+ name = "Dormitory"
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4;
+ name = "east facing firelock"
+ },
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"xfD" = (
@@ -43817,10 +44297,10 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
-/obj/machinery/door/airlock/external{
- name = "Escape Airlock"
- },
/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/external/glass{
+ name = "Arrivals Airlock"
+ },
/turf/open/floor/plating,
/area/hallway/secondary/exit/departure_lounge)
"xka" = (
@@ -43883,6 +44363,7 @@
/obj/machinery/light{
dir = 4
},
+/obj/machinery/vending/wardrobe/robo_wardrobe,
/turf/open/floor/plasteel/white,
/area/science/robotics/lab)
"xmr" = (
@@ -44090,7 +44571,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/turf/open/floor/plasteel/white,
+/turf/open/floor/plasteel/dark,
/area/science/robotics/lab)
"xtV" = (
/obj/structure/cable{
@@ -44102,6 +44583,7 @@
/obj/structure/disposalpipe/segment{
dir = 9
},
+/obj/machinery/light/floor,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
"xui" = (
@@ -44240,11 +44722,8 @@
/turf/open/floor/engine/plasma,
/area/engine/atmos)
"xAv" = (
-/obj/machinery/atmospherics/pipe/simple/supply/visible{
- dir = 6
- },
-/turf/open/floor/plating/asteroid/snow/icemoon,
-/area/icemoon/surface/outdoors)
+/turf/open/floor/carpet,
+/area/crew_quarters/dorms)
"xBi" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -44855,6 +45334,7 @@
/obj/structure/disposalpipe/trunk{
dir = 4
},
+/obj/machinery/disposal/bin,
/turf/open/floor/wood,
/area/crew_quarters/bar)
"xUD" = (
@@ -44917,6 +45397,10 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/port)
+"xWI" = (
+/obj/machinery/vending/cigarette,
+/turf/open/floor/plasteel,
+/area/hallway/primary/port)
"xXS" = (
/obj/machinery/rnd/server,
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
@@ -45154,7 +45638,7 @@
icon_state = "2-8"
},
/turf/open/floor/plating/snowed/smoothed/icemoon,
-/area/icemoon/surface/outdoors)
+/area/solar/port/aft)
"ygB" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -45216,6 +45700,9 @@
icon_state = "1-8"
},
/obj/effect/landmark/start/cyborg,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat/service)
"yiZ" = (
@@ -51536,17 +52023,17 @@ qrR
qrR
bTC
avT
-lbu
-aQK
-wuC
+aPE
+fne
+iSB
avT
-lbu
-aQK
-wuC
+aPE
+fne
+iSB
avT
-lbu
-aQK
-wuC
+aPE
+fne
+iSB
avT
wuf
yhx
@@ -51793,17 +52280,17 @@ qrR
qrR
bTC
avT
-lbu
+aPE
qfJ
-wuC
+iSB
avT
-lbu
+aPE
qfJ
-wuC
+iSB
avT
-lbu
+aPE
qfJ
-wuC
+iSB
avT
avT
avT
@@ -51851,7 +52338,7 @@ ydp
ydp
buI
hnP
-swQ
+phs
ghq
ghq
ghq
@@ -52050,17 +52537,17 @@ qrR
qrR
bTC
avT
-lbu
+aPE
qfJ
-wuC
+iSB
avT
-lbu
+aPE
qfJ
-wuC
+iSB
avT
-lbu
+aPE
qfJ
-wuC
+iSB
avT
avT
avT
@@ -52108,14 +52595,14 @@ ydp
ydp
buI
buJ
-cXI
+ghq
ghq
hfZ
shR
ntV
jso
-shR
-shR
+tzb
+iru
hfZ
ghq
ghq
@@ -52307,17 +52794,17 @@ avT
avT
avT
avT
-lbu
+aPE
qfJ
-wuC
+iSB
avT
-lbu
+aPE
qfJ
-wuC
+iSB
avT
-lbu
+aPE
qfJ
-wuC
+iSB
avT
avT
yhx
@@ -52365,14 +52852,14 @@ ydp
bTC
buI
buJ
-cXI
+ghq
ghq
shR
shR
-shR
+onO
liL
scF
-hse
+lfD
shR
ghq
ghq
@@ -52564,17 +53051,17 @@ wuf
wuf
avT
avT
-lbu
+aPE
qfJ
-wuC
+iSB
avT
-lbu
+aPE
qfJ
-wuC
+iSB
avT
-lbu
+aPE
qfJ
-wuC
+iSB
avT
wBg
avT
@@ -52583,12 +53070,12 @@ vrd
vrd
vrd
vrd
+nbC
+nbC
+nbC
+nbC
yhx
-yhx
-yhx
-yhx
-yhx
-yhx
+nbC
yhx
yhx
yhx
@@ -52622,12 +53109,12 @@ ydp
buI
fJZ
phs
-cXI
+ghq
ghq
shR
shR
cpe
-cpe
+cUs
cpe
xIJ
shR
@@ -52822,15 +53309,15 @@ avT
avT
avT
avT
-hGK
+guI
avT
avT
avT
-hGK
+guI
avT
avT
avT
-hGK
+guI
avT
aNg
chZ
@@ -52845,12 +53332,12 @@ avT
avT
avT
avT
+nbC
+nbC
+nbC
+nbC
yhx
-yhx
-yhx
-yhx
-yhx
-yhx
+nbC
ydp
ydp
ydp
@@ -52879,7 +53366,7 @@ ydp
buI
lGy
ghq
-cXI
+ghq
aJC
shR
qVf
@@ -53075,21 +53562,21 @@ yhx
yhx
wuf
avT
-nuu
-sXy
-sXy
-fNh
-xUL
-nyq
-sXy
-fNh
-xUL
-nyq
-sXy
-fNh
-xUL
-nyq
-sXy
+aKa
+aPC
+aPC
+cXI
+hrS
+jvV
+aPC
+cXI
+hrS
+jvV
+aPC
+cXI
+hrS
+jvV
+aPC
eWw
tnL
iaq
@@ -53136,12 +53623,12 @@ avT
buI
gJx
ghq
-cXI
+ghq
irN
irr
xIJ
cpe
-ooR
+ghq
cpe
xIJ
irr
@@ -53336,15 +53823,15 @@ avT
avT
avT
avT
-clq
+hse
avT
avT
avT
-clq
+hse
avT
avT
avT
-clq
+hse
avT
aNg
chZ
@@ -53393,9 +53880,9 @@ avT
buI
phs
ghq
-cXI
+ghq
+irr
irr
-tFu
hmC
rBA
dfy
@@ -53592,17 +54079,17 @@ fBG
wuf
avT
avT
-lbu
+aPE
mmM
-wuC
+iSB
avT
-lbu
+aPE
mmM
-wuC
+iSB
avT
-lbu
+aPE
mmM
-wuC
+iSB
avT
ajl
avT
@@ -53611,10 +54098,10 @@ vrd
vrd
vrd
vrd
-yhx
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
+nbC
bBh
avT
avT
@@ -53641,7 +54128,7 @@ avT
avT
avT
avT
-bmX
+avT
avT
avT
avT
@@ -53650,8 +54137,8 @@ ayq
ghq
ghq
ghq
-tSd
-lQp
+ghq
+vmr
rQu
rKd
gHG
@@ -53849,17 +54336,17 @@ qrR
qrR
avT
avT
-lbu
+aPE
mmM
-wuC
+iSB
avT
-lbu
+aPE
mmM
-wuC
+iSB
avT
-lbu
+aPE
mmM
-wuC
+iSB
avT
avT
avT
@@ -53871,7 +54358,7 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
rUq
sXy
sXy
@@ -54106,17 +54593,17 @@ qrR
qrR
wuf
avT
-lbu
+aPE
mmM
-wuC
+iSB
avT
-lbu
+aPE
mmM
-wuC
+iSB
avT
-lbu
+aPE
mmM
-wuC
+iSB
avT
avT
avT
@@ -54128,13 +54615,13 @@ yhx
yhx
yhx
yhx
+nbC
+nbC
+nbC
+nbC
yhx
-yhx
-yhx
-yhx
-yhx
-yhx
-yhx
+nbC
+nbC
avT
avT
avT
@@ -54150,7 +54637,7 @@ ydp
avT
avT
avT
-avT
+bmX
apJ
apJ
apJ
@@ -54174,7 +54661,7 @@ cwT
aAC
mGl
grZ
-vdW
+cIh
ghq
bUB
bJf
@@ -54363,17 +54850,17 @@ qrR
qrR
wuf
avT
-lbu
+aPE
mmM
-wuC
+iSB
avT
-lbu
+aPE
mmM
-wuC
+iSB
avT
-lbu
+aPE
mmM
-wuC
+iSB
avT
avT
avT
@@ -54391,7 +54878,7 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
@@ -54431,7 +54918,7 @@ hva
vZH
lac
iMX
-lhr
+cIh
ghq
bUB
bJf
@@ -54481,7 +54968,7 @@ wuf
avT
avT
avT
-bBh
+fUc
avT
avT
avT
@@ -54620,17 +55107,17 @@ qrR
qrR
wuf
avT
-lbu
-gTh
-wuC
+aPE
+huF
+iSB
avT
-lbu
-gTh
-wuC
+aPE
+huF
+iSB
avT
-lbu
-gTh
-wuC
+aPE
+huF
+iSB
avT
wuf
avT
@@ -54648,8 +55135,8 @@ yhx
yhx
yhx
yhx
-yhx
-yhx
+nbC
+nbC
ydp
ydp
ydp
@@ -54738,7 +55225,7 @@ avT
avT
avT
avT
-bBh
+fUc
avT
avT
avT
@@ -54995,7 +55482,7 @@ rxI
rxI
rxI
avT
-hGK
+tEC
avT
rxI
rxI
@@ -55204,7 +55691,7 @@ nOG
vEm
fet
avT
-avT
+stP
avT
ydp
ydp
@@ -55251,9 +55738,9 @@ pjD
pjD
pjD
pjD
-fNh
-xUL
-nyq
+cih
+pIs
+ixO
fsh
fsh
fsh
@@ -55459,9 +55946,9 @@ azz
aAF
yiT
pwE
-fet
-avT
-avT
+iMk
+wMr
+bEp
bmX
avT
avT
@@ -55509,7 +55996,7 @@ dfx
dfx
dfx
avT
-clq
+uyV
avT
dfx
dfx
@@ -55718,7 +56205,7 @@ uKG
vEm
fet
avT
-avT
+kHJ
avT
avT
avT
@@ -55766,7 +56253,7 @@ avT
avT
avT
avT
-bBh
+fUc
avT
avT
avT
@@ -56023,7 +56510,7 @@ rxI
rxI
rxI
avT
-hGK
+tEC
avT
rxI
rxI
@@ -56279,9 +56766,9 @@ pjD
pjD
pjD
pjD
-fNh
-xUL
-nyq
+cih
+pIs
+ixO
fsh
fsh
fsh
@@ -56537,7 +57024,7 @@ dfx
dfx
dfx
avT
-clq
+uyV
avT
dfx
dfx
@@ -56794,7 +57281,7 @@ avT
avT
avT
avT
-bBh
+fUc
avT
avT
avT
@@ -57051,7 +57538,7 @@ rxI
rxI
rxI
avT
-hGK
+tEC
avT
rxI
rxI
@@ -57307,9 +57794,9 @@ pjD
pjD
pjD
pjD
-fNh
-xUL
-nyq
+cih
+pIs
+ixO
fsh
fsh
fsh
@@ -57565,7 +58052,7 @@ dfx
dfx
dfx
avT
-clq
+uyV
avT
dfx
dfx
@@ -57822,7 +58309,7 @@ avT
avT
avT
avT
-bBh
+fUc
avT
avT
avT
@@ -58005,7 +58492,7 @@ ydp
ydp
avT
bBh
-bmX
+avT
avT
gLH
ohf
@@ -58079,7 +58566,7 @@ avT
avT
avT
qlH
-bBh
+fUc
qlH
avT
avT
@@ -58284,8 +58771,8 @@ aFI
iek
wRz
erO
-aBK
-dFJ
+tmx
+tmx
kdA
aFI
avT
@@ -58542,8 +59029,8 @@ cwH
lam
erO
aBK
-aDf
-aEG
+aBK
+aBK
aFI
avT
avT
@@ -58798,8 +59285,8 @@ lWb
dfa
obB
aAe
-aBK
-aDf
+eXy
+aEE
aEE
bxM
avT
@@ -59055,8 +59542,8 @@ aFI
ays
mQK
auT
-aBK
-aDf
+hBM
+fol
aEI
bxM
avT
@@ -59312,7 +59799,7 @@ aFI
uJF
lam
jcS
-aBK
+hBM
aDc
aEH
bxM
@@ -59569,8 +60056,8 @@ nEi
jRU
uzT
gWn
-aBK
-aDf
+hBM
+jPf
aEK
bxM
avT
@@ -59826,7 +60313,7 @@ eGO
ayt
nuJ
aAw
-aBK
+rRQ
aEJ
aEJ
aIP
@@ -60133,11 +60620,11 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
xUL
bBh
xUL
-yhx
+nbC
yhx
yhx
yhx
@@ -60390,11 +60877,11 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
xUL
bBh
xUL
-yhx
+nbC
yhx
yhx
yhx
@@ -60646,12 +61133,12 @@ yhx
yhx
yhx
yhx
-yhx
-yhx
+nbC
+nbC
xUL
bBh
xUL
-yhx
+nbC
yhx
yhx
yhx
@@ -60903,12 +61390,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
xUL
bBh
xUL
-yhx
+nbC
yhx
yhx
yhx
@@ -61157,15 +61644,15 @@ yhx
yhx
yhx
yhx
-yhx
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
+nbC
euS
sXy
jAq
-yhx
-yhx
+nbC
+nbC
yhx
yhx
yhx
@@ -61415,13 +61902,13 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
bBh
xUL
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -61664,21 +62151,21 @@ yhx
yhx
yhx
yhx
+nbC
+nbC
+nbC
+nbC
+nbC
+nbC
+nbC
yhx
-yhx
-yhx
-yhx
-yhx
-yhx
-yhx
-yhx
-yhx
+nbC
avT
avT
bBh
xUL
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -61918,10 +62405,10 @@ yhx
yhx
yhx
yhx
-yhx
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
+nbC
avT
xUL
xUL
@@ -61929,13 +62416,13 @@ xUL
xUL
avT
avT
-yhx
+nbC
xUL
xUL
bBh
xUL
-yhx
-yhx
+nbC
+nbC
yhx
yhx
yhx
@@ -62169,11 +62656,11 @@ yhx
yhx
yhx
yhx
-yhx
-yhx
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
+nbC
+nbC
yhx
avT
avT
@@ -62191,7 +62678,7 @@ sXy
sXy
jAq
xUL
-yhx
+nbC
yhx
yhx
yhx
@@ -62407,9 +62894,9 @@ odR
dPx
sPA
sKh
+dMo
irt
-irt
-guI
+srB
avT
avT
avT
@@ -62423,10 +62910,10 @@ ydp
ydp
ydp
yhx
-yhx
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
+nbC
avT
avT
avT
@@ -62439,16 +62926,16 @@ xUL
xUL
xUL
avT
-yhx
+nbC
xUL
xUL
xUL
xUL
xUL
avT
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
yhx
yhx
yhx
@@ -62664,7 +63151,7 @@ aLk
aNo
aOo
sKh
-irt
+dMo
srB
bzc
avT
@@ -62680,7 +63167,7 @@ ydp
ydp
ydp
yhx
-yhx
+nbC
avT
avT
avT
@@ -62694,16 +63181,16 @@ xUL
xUL
avT
avT
-yhx
-yhx
-yhx
-yhx
-yhx
-yhx
-yhx
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
+nbC
+nbC
+nbC
+nbC
+nbC
+nbC
+nbC
yhx
yhx
yhx
@@ -62915,12 +63402,12 @@ aDb
qWM
hIH
nuS
-aPE
+qsD
wDR
fHF
-aPC
-aPE
-aPE
+aVv
+qsD
+qsD
hmM
bzc
bzc
@@ -62947,11 +63434,11 @@ xUL
xUL
xUL
avT
-yhx
-yhx
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
+nbC
+nbC
yhx
yhx
yhx
@@ -63172,12 +63659,12 @@ bxk
bxk
hIH
iFl
-aPC
+aVv
gCC
qAF
hOc
aOp
-aPE
+qsD
hmM
bzc
bzc
@@ -63200,11 +63687,11 @@ avT
euS
jAq
xUL
-yhx
-yhx
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
+nbC
+nbC
yhx
yhx
yhx
@@ -63429,12 +63916,12 @@ hTk
vHU
qTO
aHD
-aPC
+aVv
jOy
lqt
gPb
hFv
-aPC
+aVv
hmM
bzc
bzc
@@ -63456,8 +63943,8 @@ avT
euS
jAq
xUL
-yhx
-yhx
+nbC
+nbC
yhx
yhx
yhx
@@ -63686,7 +64173,7 @@ srU
aFO
aFY
aHD
-aPC
+aVv
hxx
vKT
faR
@@ -63712,8 +64199,8 @@ avT
euS
jAq
xUL
-yhx
-yhx
+nbC
+nbC
yhx
yhx
yhx
@@ -63943,7 +64430,7 @@ aDm
hLZ
aFY
aHD
-aPC
+aVv
cKK
sub
vrg
@@ -63968,8 +64455,8 @@ avT
euS
jAq
xUL
-yhx
-yhx
+nbC
+nbC
yhx
yhx
yhx
@@ -64150,9 +64637,9 @@ ydp
ydp
ydp
ydp
-ydp
-ydp
-avT
+bum
+bum
+bum
avT
mpj
gNb
@@ -64200,15 +64687,15 @@ aDp
eZi
aFU
aHD
-aPE
+qsD
jmf
fLW
utp
itp
-aPE
+qsD
aQV
vcG
-wgu
+lzB
avT
avT
ydp
@@ -64224,8 +64711,8 @@ avT
euS
jAq
xUL
-yhx
-yhx
+nbC
+nbC
yhx
yhx
yhx
@@ -64408,8 +64895,8 @@ ydp
ydp
ydp
ydp
-ydp
-avT
+bum
+bum
avT
mpj
eSJ
@@ -64457,12 +64944,12 @@ aDe
rJk
aFT
jOj
-aPE
-aKa
-aPE
-aPE
-aPE
-aPE
+qsD
+mSN
+qsD
+qsD
+qsD
+qsD
aQV
vcG
lzB
@@ -64481,7 +64968,7 @@ euS
jAq
xUL
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -64665,7 +65152,7 @@ ydp
ydp
ydp
ydp
-ydp
+bum
ydp
avT
mpj
@@ -64731,14 +65218,14 @@ ydp
ydp
ydp
ydp
-avT
+bmX
avT
avT
bBh
xUL
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
yhx
yhx
yhx
@@ -64980,7 +65467,7 @@ xUL
xUL
vcG
lzB
-bmX
+avT
avT
ydp
ydp
@@ -64993,8 +65480,8 @@ avT
avT
bBh
xUL
-yhx
-yhx
+nbC
+nbC
yhx
yhx
yhx
@@ -65188,7 +65675,7 @@ avT
avT
avT
xUL
-vBe
+xUL
mbm
iJl
iJl
@@ -65224,7 +65711,7 @@ xeI
rqW
rqW
aGD
-tJi
+rqW
myh
qLm
qTG
@@ -65250,7 +65737,7 @@ avT
avT
bBh
xUL
-yhx
+nbC
yhx
yhx
yhx
@@ -65477,9 +65964,9 @@ rQJ
fwn
awb
rqW
-ayC
-rPU
-fne
+rqW
+rqW
+rqW
rqW
rqW
fOA
@@ -65507,7 +65994,7 @@ avT
avT
bBh
xUL
-yhx
+nbC
yhx
yhx
yhx
@@ -65699,7 +66186,7 @@ ydp
ydp
avT
avT
-bmX
+avT
avT
xUL
ace
@@ -65733,12 +66220,12 @@ iPX
rQJ
fpS
wPD
+ihY
+rqW
+rqW
+rqW
rqW
-pIf
-pIf
-pIf
rqW
-aHK
myh
uJx
ikk
@@ -65764,7 +66251,7 @@ avT
avT
bBh
xUL
-yhx
+nbC
yhx
yhx
yhx
@@ -65991,11 +66478,11 @@ rQJ
fvz
awb
rqW
-ayC
-azH
-fne
rqW
-aCr
+rqW
+rqW
+rqW
+rqW
myh
lHH
oYn
@@ -66006,7 +66493,7 @@ wUr
avT
avT
avT
-vcG
+lcv
wgu
avT
avT
@@ -66021,7 +66508,7 @@ avT
avT
bBh
xUL
-yhx
+nbC
yhx
yhx
yhx
@@ -66216,7 +66703,7 @@ avT
avT
avT
avT
-bGt
+ace
avT
avT
avT
@@ -66473,7 +66960,7 @@ ydp
avT
avT
avT
-ace
+bGt
avT
avT
avT
@@ -66508,8 +66995,8 @@ myh
rQJ
rQJ
rQJ
-myh
-myh
+eXO
+kjx
rQJ
wUr
wUr
@@ -66765,9 +67252,9 @@ xxi
ayD
cGz
sqg
-avT
-ydp
-ydp
+xdr
+ihY
+rQJ
ydp
ydp
ydp
@@ -67021,10 +67508,10 @@ oaS
eqP
tcj
viF
-ayG
-avT
-avT
-ydp
+sqg
+pJm
+ihY
+rQJ
ydp
ydp
ydp
@@ -67279,9 +67766,9 @@ iat
pEF
nez
sqg
-avT
-avT
-avT
+fEz
+sae
+rQJ
ydp
ydp
ydp
@@ -67536,9 +68023,9 @@ axr
ayE
nez
sqg
-ydp
-ydp
-avT
+rQJ
+rQJ
+rQJ
ydp
ydp
ydp
@@ -67805,7 +68292,7 @@ ydp
avT
avT
avT
-vcG
+lcv
wgu
avT
avT
@@ -68040,7 +68527,7 @@ ujE
grz
arP
xWq
-wje
+xWI
nrd
wje
sqg
@@ -68790,7 +69277,7 @@ ace
avT
avT
avT
-bmX
+avT
avT
avT
avT
@@ -69056,7 +69543,7 @@ avT
avT
avT
vBe
-xnm
+tLb
xUL
rhX
lXR
@@ -69314,12 +69801,12 @@ avT
avT
xUL
xnm
-xUL
+vBe
eTu
kHd
ljT
kHd
-gVo
+kHd
rhX
xUL
xUL
@@ -69571,7 +70058,7 @@ avT
avT
xUL
xnm
-xUL
+vBe
eTu
kHd
apK
@@ -69604,7 +70091,7 @@ ydp
ydp
avT
avT
-vcG
+lcv
wgu
avT
avT
@@ -69827,7 +70314,7 @@ avT
avT
avT
vBe
-xnm
+tLb
xUL
rhX
rhX
@@ -70586,18 +71073,18 @@ avT
avT
avT
ace
-xUL
vBe
xUL
-xUL
-xUL
-xUL
vBe
xUL
xUL
xUL
vBe
xUL
+xUL
+xUL
+xUL
+vBe
xnm
avT
avT
@@ -70624,9 +71111,9 @@ ydp
ydp
ydp
ydp
-avT
-avT
-avT
+ydp
+ydp
+ydp
avT
avT
avT
@@ -70845,11 +71332,11 @@ avT
pQd
kLh
kQr
+qOJ
lZn
lZn
lZn
-lZn
-lZn
+qOJ
lZn
lZn
lZn
@@ -70879,12 +71366,12 @@ ydp
ydp
ydp
avT
-avT
-avT
-avT
-avT
-avT
-avT
+ydp
+ydp
+ydp
+ydp
+ydp
+ydp
avT
avT
avT
@@ -71136,23 +71623,23 @@ ydp
ydp
avT
avT
+ydp
+ydp
+ydp
+ydp
+ydp
+ydp
avT
avT
avT
-avT
-avT
-avT
-avT
-avT
-avT
-avT
+xUL
vcG
lzB
avT
avT
avT
avT
-bmX
+avT
ydp
ydp
ydp
@@ -71358,7 +71845,7 @@ avT
avT
avT
xZL
-qZO
+xBk
avT
avT
avT
@@ -71389,21 +71876,21 @@ ydp
ydp
ydp
ydp
+ydp
avT
avT
+bmX
+ydp
+ydp
+ydp
+ydp
+ydp
+ydp
+avT
avT
avT
xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-avT
-avT
-vcG
+lcv
wgu
xUL
xUL
@@ -71448,7 +71935,7 @@ nxv
kYF
bVM
avT
-bmX
+avT
ydp
ydp
ydp
@@ -71627,7 +72114,7 @@ avT
avT
avT
avT
-bmX
+avT
avT
avT
ydp
@@ -71649,17 +72136,17 @@ ydp
avT
avT
avT
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
+ydp
+ydp
+ydp
+ydp
+ydp
+ydp
avT
+avT
+avT
+avT
+xUL
vcG
lzB
xUL
@@ -71871,8 +72358,8 @@ ydp
avT
avT
avT
-xZL
-xBk
+aez
+qZO
avT
avT
avT
@@ -71905,18 +72392,18 @@ ydp
avT
avT
avT
+avT
+ydp
+ydp
+ydp
+ydp
+ydp
+ydp
+ydp
+avT
+avT
+avT
xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-avT
vcG
lzB
avT
@@ -72162,17 +72649,17 @@ ydp
avT
avT
avT
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
+avT
+avT
+ydp
+ydp
+ydp
+ydp
+ydp
+avT
+avT
+avT
+avT
xUL
vcG
lzB
@@ -72417,20 +72904,20 @@ ydp
ydp
ydp
avT
-bmX
+avT
+avT
+avT
+avT
+avT
+ydp
+ydp
+ydp
+avT
+avT
+avT
+avT
avT
xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-avT
vcG
lzB
avT
@@ -72676,18 +73163,18 @@ ydp
avT
avT
avT
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
avT
+avT
+avT
+avT
+ydp
+avT
+avT
+avT
+avT
+avT
+avT
+xUL
vcG
lzB
avT
@@ -72705,7 +73192,7 @@ avT
avT
avT
avT
-avT
+bmX
wql
wql
vEG
@@ -72933,18 +73420,18 @@ ydp
avT
avT
avT
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
avT
+avT
+avT
+avT
+avT
+avT
+avT
+avT
+avT
+avT
+avT
+xUL
vcG
lzB
avT
@@ -73190,19 +73677,19 @@ ydp
ydp
avT
avT
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
avT
-vcG
+avT
+avT
+avT
+avT
+avT
+avT
+ydp
+ydp
+avT
+avT
+xUL
+lcv
wgu
avT
avT
@@ -73215,7 +73702,7 @@ ydp
ydp
ydp
ydp
-bmX
+avT
avT
wql
wql
@@ -73427,7 +73914,8 @@ avT
avT
avT
avT
-avT
+bmX
+ydp
ydp
ydp
ydp
@@ -73447,18 +73935,17 @@ ydp
ydp
avT
avT
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
avT
+avT
+avT
+avT
+avT
+avT
+ydp
+ydp
+ydp
+avT
+xUL
vcG
lzB
avT
@@ -73505,7 +73992,7 @@ bUD
bVM
avT
avT
-bmX
+avT
avT
avT
avT
@@ -73702,20 +74189,20 @@ ydp
ydp
ydp
ydp
+ydp
+ydp
+avT
+avT
+avT
+avT
+avT
+avT
+avT
+ydp
+ydp
avT
avT
xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-avT
vcG
lzB
avT
@@ -73927,7 +74414,7 @@ avT
avT
avT
avT
-xZL
+aez
qZO
avT
avT
@@ -73959,20 +74446,20 @@ ydp
ydp
ydp
ydp
+ydp
+ydp
+avT
+avT
+avT
+ydp
+ydp
+avT
+avT
+avT
+avT
avT
avT
xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-avT
vcG
lzB
xUL
@@ -74216,20 +74703,20 @@ ydp
ydp
ydp
ydp
+ydp
+avT
+avT
+avT
+avT
+ydp
+ydp
+ydp
+avT
+avT
+avT
avT
avT
xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-avT
vcG
lzB
xUL
@@ -74475,20 +74962,20 @@ ydp
ydp
avT
avT
+ydp
+ydp
+avT
+avT
+avT
+avT
+avT
+avT
+avT
+avT
+avT
xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-vcG
-lzB
+lcv
+nDN
xUL
xUL
xUL
@@ -74731,19 +75218,19 @@ ydp
ydp
avT
avT
+ydp
+ydp
+ydp
+avT
+avT
+avT
+avT
+avT
+avT
+avT
+avT
avT
xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-avT
vcG
lzB
xUL
@@ -74798,7 +75285,7 @@ cer
avT
avT
avT
-bmX
+avT
avT
avT
avT
@@ -74990,19 +75477,19 @@ avT
avT
avT
avT
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
avT
+avT
+avT
+avT
+avT
+avT
+avT
+avT
+avT
+avT
+xUL
vcG
-wgu
+lzB
xUL
xUL
xUL
@@ -75247,17 +75734,17 @@ avT
avT
avT
avT
-avT
xUL
xUL
xUL
-avT
-avT
xUL
xUL
xUL
-avT
-avT
+xUL
+xUL
+xUL
+xUL
+xUL
vcG
lzB
avT
@@ -75510,7 +75997,7 @@ nGx
nGx
nGx
nGx
-nGx
+hnN
nGx
nGx
nGx
@@ -75524,8 +76011,8 @@ avT
avT
bok
unA
-bJQ
-bJQ
+xjZ
+xjZ
unA
avT
avT
@@ -75760,7 +76247,7 @@ avT
avT
avT
avT
-tFr
+vcG
dvc
sLv
sLv
@@ -75983,7 +76470,7 @@ avT
avT
avT
avT
-xZL
+aez
qZO
avT
avT
@@ -76031,7 +76518,7 @@ avT
avT
avT
avT
-bmX
+avT
avT
avT
bok
@@ -76092,7 +76579,7 @@ ruD
clR
avT
avT
-bmX
+avT
avT
avT
avT
@@ -76532,7 +77019,7 @@ gky
vmM
jOo
azc
-lzB
+nDN
avT
avT
avT
@@ -76557,7 +77044,7 @@ wcB
unA
avT
avT
-bmX
+avT
avT
bwt
cTD
@@ -76806,7 +77293,7 @@ ncg
aXh
jHC
bok
-ivM
+uFq
bok
unA
uFq
@@ -77261,12 +77748,12 @@ ydp
ydp
ydp
ydp
-avT
-avT
-avT
-avT
-avT
-avT
+pgp
+iHM
+iHM
+iHM
+iHM
+iHM
avT
xZL
xBk
@@ -77518,15 +78005,15 @@ ydp
ydp
ydp
ydp
+pgp
+sTt
+nRA
+pDg
+qSF
+iHM
avT
-avT
-avT
-bHt
-nZE
-nZE
-nZE
aez
-xBk
+qZO
avT
avT
ydp
@@ -77559,7 +78046,7 @@ kxI
dPM
xNs
wwx
-nDd
+aAh
aDQ
avT
avT
@@ -77775,15 +78262,15 @@ ydp
ydp
ydp
avT
-avT
-avT
-avT
+pgp
+xAv
+xAv
mps
xAv
-ruo
-ruo
+iHM
+avT
acQ
-aUb
+xBk
avT
avT
avT
@@ -78019,28 +78506,28 @@ yhx
yhx
yhx
yhx
-ydp
-ydp
-ydp
-ydp
-ydp
-ydp
+nbC
+nbC
+nbC
+pgp
+pgp
+pgp
+pgp
+pgp
+pgp
+pgp
+pgp
+pgp
+pgp
+pgp
+rKC
+bjR
+xAv
+xAv
+pgp
avT
-avT
-avT
-avT
-avT
-avT
-avT
-avT
-avT
-avT
-axL
-aaM
-nZE
-nZE
-abU
-vBe
+xZL
+nYd
avT
avT
avT
@@ -78276,28 +78763,28 @@ yhx
yhx
yhx
yhx
-ydp
-ydp
-ydp
-ydp
-ydp
-ydp
+nbC
+nbC
avT
-avT
-avT
-avT
-avT
-avT
-iHM
+pgp
+tJi
+vdW
+pgp
+tJi
+vdW
+pgp
+tJi
+vdW
+pgp
tOz
-iHM
+tUq
gCO
-iHM
-axN
-ruo
-ruo
-aAh
-vzS
+hvG
+pgp
+pgp
+pgp
+xZL
+xBk
avT
ydp
ydp
@@ -78533,27 +79020,27 @@ yhx
yhx
yhx
yhx
-ydp
-ydp
-ydp
-ydp
-ydp
-ydp
avT
avT
avT
-avT
-avT
-avT
-iHM
-kRk
-iHM
-kRk
-iHM
-avT
-avT
-avT
-xZL
+pgp
+tSd
+vzS
+pgp
+tSd
+rEF
+pgp
+tSd
+vFT
+pgp
+vow
+swQ
+gCO
+swQ
+kXL
+mtP
+tWs
+aez
xBk
avT
ydp
@@ -78589,13 +79076,13 @@ spa
dIj
pIH
bpT
+dMo
irt
irt
+dMo
irt
irt
-irt
-irt
-irt
+dMo
gZS
uyK
aRt
@@ -78790,27 +79277,27 @@ yhx
yhx
yhx
yhx
-ydp
-ydp
-ydp
-ydp
-ydp
-ydp
avT
-avT
-iHM
-iHM
-iHM
-iHM
-iHM
+pgp
+pgp
+pgp
+uRg
+pgp
+pgp
+kWz
+pgp
+pgp
+eCS
+pgp
+pgp
vow
-iHM
-vow
-iHM
-iHM
-iHM
-iHM
-xZL
+swQ
+gCO
+swQ
+kXL
+mtP
+tWs
+aez
xBk
avT
ydp
@@ -79046,26 +79533,26 @@ yhx
yhx
yhx
yhx
-yhx
-ydp
-ydp
-ydp
-ydp
-ydp
-ydp
-avT
+ooR
avT
iHM
-kHD
-kHD
-kHD
-kHD
-kHD
-kHD
-kHD
-kHD
-kHD
-kHD
+oME
+rPU
+swQ
+fSb
+pqm
+swQ
+swQ
+rPU
+swQ
+swQ
+vQz
+vow
+swQ
+gCO
+swQ
+iHM
+rbb
iHM
xZL
xBk
@@ -79101,8 +79588,8 @@ cPI
hPe
vAs
ktw
-xZL
-lzB
+aez
+nDN
avT
avT
avT
@@ -79303,26 +79790,26 @@ ydp
ydp
ydp
ydp
-ydp
-ydp
-ydp
-ydp
-ydp
-ydp
-ydp
avT
avT
iHM
-kHD
-kHD
-kHD
-kHD
-kHD
-kHD
-kHD
-kHD
-kHD
-kHD
+pIf
+swQ
+swQ
+swQ
+swQ
+jjB
+ugk
+ugk
+ugk
+ugk
+ugk
+fkA
+ugk
+hUg
+qim
+iHM
+iHM
iHM
xZL
xBk
@@ -79344,7 +79831,7 @@ ydp
ydp
ydp
avT
-bmX
+avT
avT
avT
avT
@@ -79358,7 +79845,7 @@ spa
vir
fkr
ktw
-oME
+xZL
lzB
avT
avT
@@ -79560,27 +80047,27 @@ ydp
ydp
ydp
ydp
-ydp
-ydp
-ydp
-ydp
-ydp
-ydp
-avT
avT
avT
iHM
-kHD
-kHD
-kHD
-kHD
-kHD
-kHD
-kHD
-kHD
-kHD
-kHD
+ruo
+tFu
+swQ
+swQ
+hWp
+ptH
+iQu
+iQu
+iQu
+iQu
+mHm
+bfo
+swQ
+gCO
iHM
+lJC
+avT
+avT
xZL
xBk
avT
@@ -79818,29 +80305,29 @@ ydp
ydp
ydp
ydp
-ydp
-ydp
-ydp
-ydp
-avT
-avT
-avT
avT
+pgp
+pgp
+pgp
+raM
+raM
+raM
+raM
+mfU
+raM
+raM
+raM
+pgp
+vVJ
+hCx
+lOa
iHM
-kHD
-kHD
-kHD
-kHD
-kHD
-kHD
-kHD
-kHD
-kHD
-kHD
-iHM
-xZL
-xBk
-vBe
+avT
+avT
+avT
+aez
+qZO
+xUL
ydp
ydp
ydp
@@ -79955,7 +80442,7 @@ jQj
avT
avT
avT
-bmX
+avT
avT
avT
avT
@@ -80076,25 +80563,25 @@ ydp
ydp
ydp
ydp
-ydp
-ydp
-ydp
+pgp
+kHD
+kHD
+kHD
+kHD
+kHD
+kHD
+kHD
+kHD
+kHD
+kHD
+raM
+eoH
+xAv
+nJB
+iHM
+avT
+avT
avT
-xUL
-cav
-xUL
-iHM
-kHD
-kHD
-kHD
-kHD
-kHD
-kHD
-kHD
-kHD
-kHD
-kHD
-iHM
xZL
xBk
xUL
@@ -80123,7 +80610,7 @@ sLv
sLv
sLv
sLv
-sLv
+cEs
sLv
sLv
sLv
@@ -80333,25 +80820,25 @@ ydp
ydp
ydp
ydp
-ydp
-ydp
+raM
+kHD
+kHD
+kHD
+kHD
+kHD
+kHD
+kHD
+kHD
+kHD
+kHD
+raM
+nlF
+xAv
+oUT
+iHM
+avT
avT
avT
-xUL
-xUL
-xUL
-iHM
-iHM
-iHM
-iHM
-iHM
-nlF
-iHM
-nlF
-iHM
-iHM
-iHM
-iHM
xZL
xBk
avT
@@ -80590,20 +81077,20 @@ ydp
ydp
ydp
ydp
-ydp
-ydp
-avT
-avT
-xUL
-xUL
-xUL
-avT
-avT
-avT
-avT
-iHM
-lJN
-vQk
+raM
+kHD
+kHD
+kHD
+kHD
+kHD
+kHD
+kHD
+kHD
+kHD
+kHD
+raM
+nlF
+xAv
gUc
iHM
avT
@@ -80847,21 +81334,21 @@ ydp
ydp
ydp
ydp
-ydp
-ydp
-avT
-pgp
-xUL
-xUL
-xUL
-pgp
-avT
-avT
-avT
-iHM
-kRk
-kRk
-kRk
+raM
+kHD
+kHD
+kHD
+kHD
+kHD
+kHD
+kHD
+kHD
+kHD
+kHD
+raM
+nlF
+xAv
+oUT
iHM
avT
avT
@@ -81104,28 +81591,28 @@ ydp
ydp
ydp
ydp
-ydp
-avT
-avT
pgp
-xUL
-bSC
-xUL
-pgp
-avT
-avT
-avT
-iHM
-vow
-iHM
-vow
+kHD
+kHD
+kHD
+fIk
+kHD
+kHD
+kHD
+kHD
+kHD
+kHD
+raM
+eoH
+xAv
+nJB
iHM
avT
avT
avT
-xZL
-xBk
-iSB
+aez
+qZO
+avT
wdv
xUL
xUL
@@ -81361,18 +81848,18 @@ ydp
ydp
ydp
ydp
-avT
-avT
-iHM
-iHM
+pgp
+pgp
pgp
raM
-iHM
pgp
-iHM
-iHM
-iHM
-iHM
+raM
+raM
+mfU
+raM
+raM
+raM
+pgp
rRk
xfs
qHL
@@ -81501,7 +81988,7 @@ avT
avT
avT
avT
-avT
+bmX
ydp
ydp
ydp
@@ -81623,20 +82110,20 @@ xUL
aNL
mtP
dvs
-mtP
-mtP
-dAi
-mtP
-mtP
-mtP
-mtP
-mtP
-lLv
-mtP
+jjB
+kIV
+ugk
+ugk
+ugk
+ugk
+utY
+mEH
+ugk
+hUg
oBD
iHM
-lJC
-lJC
+iHM
+iHM
xZL
xBk
avT
@@ -81659,7 +82146,7 @@ avT
avT
avT
tFr
-lzB
+nDN
avT
avT
avT
@@ -81880,30 +82367,30 @@ xUL
aNL
fTM
dvs
-mtP
+swQ
naE
-mtP
+bqb
aaU
nOY
-mtP
-naE
+iwH
+hlQ
duB
tsK
-tsK
+nEH
tsK
iuC
-tsK
+cTV
pXb
aSE
xBk
xUL
xUL
xUL
+xUL
+xUL
vBe
xUL
xUL
-xUL
-xUL
vBe
xUL
xUL
@@ -81913,7 +82400,7 @@ xUL
vBe
xUL
xUL
-xUL
+vBe
xUL
vcG
lzB
@@ -81973,7 +82460,7 @@ anA
wbT
rTs
hTL
-uRg
+hTL
jab
jFy
qJV
@@ -82138,39 +82625,39 @@ iHM
pgp
pgp
pgp
-pgp
+eyc
fPM
pgp
pgp
pgp
pgp
vhb
-mtP
+swQ
vDI
ugk
hAx
-ugk
+ord
nrY
-vsM
+vko
aUb
xUL
xUL
xUL
xUL
xUL
+vBe
+xUL
+xUL
+vBe
xUL
xUL
xUL
xUL
xUL
+vBe
xUL
xUL
-xUL
-xUL
-xUL
-xUL
-xUL
-xUL
+vBe
xUL
vcG
lzB
@@ -82390,19 +82877,19 @@ xUL
ydp
ydp
ydp
-bmX
+avT
avT
pgp
aab
dZV
-dZV
-gLk
+wgM
+kdy
pgp
qFH
nBd
wfS
iJs
-mtP
+swQ
sgL
qxk
pgp
@@ -82416,7 +82903,7 @@ xUL
xUL
xUL
avT
-bmX
+avT
avT
avT
avT
@@ -82476,7 +82963,7 @@ vAs
vAs
krT
pze
-bEi
+sLF
bEi
lbp
bAs
@@ -82652,25 +83139,25 @@ avT
pgp
aac
gLk
-gLk
-gLk
+hHV
+kdy
pgp
vVZ
mWy
pgp
iJs
-mtP
+swQ
inA
qMn
pgp
-wdv
-wdv
+pgp
+pgp
+xUL
+xUL
+xUL
+xUL
+vBe
vBe
-xUL
-xUL
-xUL
-xUL
-xUL
xUL
avT
avT
@@ -82738,7 +83225,7 @@ bFT
bCO
gRE
thV
-bCO
+qBl
bEa
kxj
aaw
@@ -82909,7 +83396,7 @@ avT
pgp
aab
aad
-gLk
+gdH
fBs
pgp
pgp
@@ -83455,10 +83942,10 @@ ydp
ydp
avT
avT
-bmX
+avT
avT
tFr
-lzB
+nDN
avT
avT
ydp
@@ -84176,7 +84663,7 @@ ydp
ydp
ydp
ydp
-avT
+bmX
avT
ydp
ydp
@@ -84691,7 +85178,7 @@ ydp
ydp
avT
avT
-bmX
+avT
avT
avT
avT
@@ -84793,7 +85280,7 @@ hJE
cmC
aIt
bCO
-bBN
+hyx
vTF
tRe
eVp
@@ -85078,7 +85565,7 @@ bPn
avT
avT
avT
-bmX
+avT
avT
avT
avT
@@ -85257,7 +85744,7 @@ ydp
avT
avT
tFr
-lzB
+nDN
avT
avT
avT
@@ -85430,23 +85917,23 @@ yhx
wuf
avT
nuu
-sXy
-sXy
+aar
+aar
fNh
-xUL
+abU
nyq
-sXy
+aar
fNh
-xUL
+abU
nyq
-sXy
+aar
fNh
-xUL
+abU
nyq
-sXy
-sXy
-sXy
-sXy
+aar
+aar
+aar
+aar
sDD
eNK
jwc
@@ -86288,7 +86775,7 @@ vcG
lzB
avT
avT
-bmX
+avT
avT
ydp
ydp
@@ -86510,7 +86997,7 @@ mGp
rgm
wAx
wAx
-wAx
+ule
uEz
uEz
wzf
@@ -87024,11 +87511,11 @@ mKv
sAh
sAh
acb
-aar
+urI
+uEz
+uEz
uEz
uEz
-hrS
-lQJ
lia
uvB
tOY
@@ -87056,7 +87543,7 @@ xUL
xUL
avT
tFr
-lzB
+nDN
avT
avT
ydp
@@ -87101,7 +87588,7 @@ avT
avT
avT
avT
-bmX
+avT
avT
avT
avT
@@ -87283,10 +87770,10 @@ sAh
acb
urI
qkO
-uEz
-blD
+qnx
kge
-gls
+kge
+qnx
tgd
tRC
pJS
@@ -87380,7 +87867,7 @@ avT
avT
avT
avT
-bmX
+avT
avT
avT
ydp
@@ -87540,12 +88027,12 @@ qss
qss
ylW
uoV
-uEz
-blD
+qnx
+pgk
pgk
bKl
-iNK
-chN
+tgd
+tRC
pJS
sWD
bNF
@@ -87797,9 +88284,9 @@ sAh
acb
urI
uoV
-uEz
-blD
-pgk
+qnx
+kbE
+kbE
qnx
pbf
sFw
@@ -87882,7 +88369,7 @@ sXy
ikA
avT
avT
-bmX
+avT
avT
avT
avT
@@ -88054,10 +88541,10 @@ sAh
acb
urI
uoV
-uEz
-blD
-eLl
-igK
+qnx
+kge
+kge
+qnx
xcL
hop
pJS
@@ -88285,14 +88772,14 @@ ydp
ydp
ydp
ydp
-bmX
+avT
avT
avT
bBh
avT
aKf
irQ
-huF
+cfp
cfp
gxY
cfp
@@ -88311,11 +88798,11 @@ qss
oXl
pPz
uoV
-uEz
-hsQ
-cDO
-jAT
-nmL
+qnx
+pgk
+pgk
+qnx
+tgd
vKP
pJS
hNg
@@ -88403,7 +88890,7 @@ ydp
ydp
ydp
ydp
-avT
+bmX
avT
ydp
ydp
@@ -88550,7 +89037,7 @@ avT
aKf
irQ
jLG
-piu
+lhr
piu
xac
gNI
@@ -88568,12 +89055,12 @@ wAx
wAx
wAx
hru
-uEz
-uEz
-uEz
-ejw
-rTv
-eOO
+qnx
+kbE
+kbE
+qnx
+tgd
+tRC
pJS
hNg
bNF
@@ -88800,7 +89287,7 @@ ydp
ydp
ydp
avT
-avT
+bmX
ydp
bBh
avT
@@ -88828,9 +89315,9 @@ pbg
uEz
uEz
uEz
-ejw
-rTv
-eOO
+cvN
+gjZ
+tRC
pJS
jiY
bNF
@@ -88855,7 +89342,7 @@ xUL
xiw
avT
tFr
-lzB
+nDN
avT
avT
avT
@@ -88943,7 +89430,7 @@ ydp
ydp
ydp
avT
-bmX
+avT
avT
ydp
ydp
@@ -90605,7 +91092,7 @@ bBh
avT
aKf
gLO
-jvV
+cfp
evO
cfp
kBe
@@ -90654,7 +91141,7 @@ avT
avT
avT
tFr
-lzB
+nDN
avT
avT
avT
@@ -91420,7 +91907,7 @@ uMF
jsl
gFM
cuY
-nGx
+hnN
nGx
nGx
nGx
@@ -91677,11 +92164,11 @@ dks
nEl
ust
sHJ
+cEs
sLv
sLv
sLv
sLv
-ybT
asr
avT
avT
@@ -91987,12 +92474,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
bBh
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -92193,7 +92680,7 @@ lGB
jJu
avT
avT
-bmX
+avT
avT
avT
avT
@@ -92244,12 +92731,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
bBh
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -92397,8 +92884,8 @@ bqN
avT
xUL
xUL
-bmX
avT
+bmX
bxL
bxL
bxL
@@ -92406,7 +92893,7 @@ xUL
bxL
dri
dri
-dDC
+uot
nQp
kVx
eLQ
@@ -92501,12 +92988,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
bBh
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -92639,7 +93126,7 @@ avT
avT
bzc
xUL
-avT
+bmX
avT
ydp
ydp
@@ -92658,7 +93145,7 @@ avT
avT
bxL
bxL
-bum
+axN
xUL
xUL
dri
@@ -92756,14 +93243,14 @@ yhx
yhx
yhx
yhx
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
avT
avT
bBh
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -92893,7 +93380,7 @@ ydp
ydp
ydp
avT
-avT
+bum
bzh
xUL
avT
@@ -92915,7 +93402,7 @@ avT
bxL
bxL
bum
-bum
+axN
xUL
xUL
rww
@@ -92923,7 +93410,7 @@ rww
rww
ttQ
lNU
-bZI
+nDd
bZI
nNV
dBP
@@ -93013,14 +93500,14 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
avT
bBh
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -93150,9 +93637,9 @@ ydp
ydp
ydp
avT
-avT
-avT
-bmX
+bum
+bum
+bum
avT
avT
ydp
@@ -93172,7 +93659,7 @@ bxL
bxL
bum
bum
-bum
+axN
xUL
xUL
jrq
@@ -93270,14 +93757,14 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
euS
sXy
sXy
jAq
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -93407,10 +93894,10 @@ ydp
ydp
ydp
ydp
-avT
-avT
-avT
-avT
+bum
+bum
+bum
+bum
ydp
ydp
ydp
@@ -93429,7 +93916,7 @@ bKI
bum
bum
bum
-bum
+axN
xUL
xUL
rww
@@ -93527,14 +94014,14 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
avT
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -93665,7 +94152,7 @@ ydp
ydp
avT
avT
-avT
+bum
avT
avT
ydp
@@ -93686,7 +94173,7 @@ bKI
bum
bum
bum
-bum
+axN
xUL
xUL
dri
@@ -93784,14 +94271,14 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
avT
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
yhx
yhx
yhx
@@ -93943,7 +94430,7 @@ bKI
bum
bum
bum
-bum
+axN
xUL
xUL
wmB
@@ -94041,12 +94528,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -94197,10 +94684,10 @@ bKI
bCC
bCC
bKI
-bum
-bum
-bum
-bum
+azH
+azH
+azH
+aHK
xUL
xUL
fen
@@ -94243,7 +94730,7 @@ qzz
uqa
iIQ
avT
-bmX
+avT
avT
avT
ydp
@@ -94298,12 +94785,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -94555,7 +95042,7 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
@@ -94707,7 +95194,7 @@ bqN
bqN
bqN
bxL
-bum
+axN
xUL
xUL
xUL
@@ -94812,12 +95299,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -94964,8 +95451,8 @@ bqN
bqN
bxL
bxL
-bum
-bum
+ayC
+aEG
xUL
xUL
bKI
@@ -95069,12 +95556,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -95222,7 +95709,7 @@ bqN
bqN
bxL
bum
-bum
+axN
xUL
xUL
bKI
@@ -95326,12 +95813,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -95479,7 +95966,7 @@ bqN
bxL
bxL
bum
-bum
+axN
xUL
xUL
bKI
@@ -95583,12 +96070,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -95735,8 +96222,8 @@ bqN
bqN
bxL
bxL
-bum
-bum
+azH
+aHK
xUL
xUL
bKI
@@ -95838,14 +96325,14 @@ yhx
yhx
yhx
yhx
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -96003,7 +96490,7 @@ bKI
bKI
bMT
fgj
-nOk
+lQp
lfG
sdr
gyE
@@ -96095,14 +96582,14 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -96357,9 +96844,9 @@ avT
avT
avT
bBh
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
yhx
yhx
yhx
@@ -96506,9 +96993,9 @@ bqN
bqN
bxL
bxL
-bum
-bum
-bum
+aCr
+aCr
+aEG
xUL
bOb
bKI
@@ -96609,7 +97096,7 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
@@ -96765,7 +97252,7 @@ bqN
bxL
bum
bum
-bum
+axN
xUL
bOb
bKI
@@ -96866,12 +97353,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
-yhx
+nbC
yhx
yhx
yhx
@@ -97022,7 +97509,7 @@ bqN
bxL
bum
bum
-bum
+axN
xUL
bOb
bKI
@@ -97071,7 +97558,7 @@ wFO
mZp
avT
avT
-bmX
+avT
avT
avT
avT
@@ -97123,12 +97610,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
-yhx
+nbC
yhx
yhx
yhx
@@ -97279,7 +97766,7 @@ bqN
bxL
bum
bum
-bum
+axN
xUL
bOb
bKI
@@ -97380,12 +97867,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
-yhx
+nbC
yhx
yhx
yhx
@@ -97536,13 +98023,13 @@ bqN
bxL
bum
bum
-bum
+axN
xUL
bOb
-xUL
-xUL
-xUL
-xUL
+dDC
+bum
+bum
+axN
xbp
onY
gNy
@@ -97637,12 +98124,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
-yhx
+nbC
yhx
yhx
yhx
@@ -97793,13 +98280,13 @@ bxL
bxL
bxL
bum
-bum
+axN
xUL
bOb
-bum
-bum
-bum
-bum
+dFJ
+azH
+azH
+aHK
xbp
fen
eHK
@@ -97894,12 +98381,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
-yhx
+nbC
yhx
yhx
yhx
@@ -98050,7 +98537,7 @@ bxL
bxL
bxL
bum
-bum
+axN
bDA
bGW
bYY
@@ -98151,12 +98638,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
-yhx
+nbC
yhx
yhx
yhx
@@ -98307,7 +98794,7 @@ bxL
bxL
bxL
bum
-bum
+axN
bFx
bOb
bKI
@@ -98408,7 +98895,7 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
@@ -98564,7 +99051,7 @@ bqN
bqN
bxL
bum
-bum
+axN
bFx
bRD
caS
@@ -98665,14 +99152,14 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
yhx
yhx
yhx
@@ -98821,7 +99308,7 @@ bqN
bxL
bxL
bum
-bum
+axN
aEF
bYY
ccD
@@ -98922,14 +99409,14 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -99077,8 +99564,8 @@ bqN
bqN
bxL
bxL
-bum
-bum
+azH
+aHK
xUL
xUL
bKI
@@ -99179,14 +99666,14 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -99338,12 +99825,13 @@ xUL
xUL
xUL
xUL
+dDC
bum
bum
-bum
-bum
+axN
xbp
xUL
+dDC
bum
bum
bum
@@ -99357,8 +99845,7 @@ bum
bum
bum
bum
-bum
-bum
+axN
rGc
jPj
ucC
@@ -99436,14 +99923,14 @@ yhx
yhx
yhx
yhx
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -99595,27 +100082,27 @@ xUL
xUL
xUL
xUL
-bum
-bum
-bum
-bum
+dFJ
+azH
+azH
+aHK
xbp
xUL
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
+dFJ
+azH
+azH
+azH
+azH
+azH
+azH
+azH
+azH
+azH
+azH
+azH
+azH
+azH
+aHK
dQW
jls
ucC
@@ -99695,12 +100182,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -99848,8 +100335,8 @@ bqN
bqN
bxL
bxL
-bum
-bum
+aCr
+aEG
xUL
xUL
xUL
@@ -99952,7 +100439,7 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
@@ -100106,7 +100593,7 @@ bqN
bxL
bxL
bum
-bum
+axN
xUL
xUL
xUL
@@ -100209,12 +100696,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -100364,24 +100851,24 @@ bxL
bxL
bxL
bum
-bum
-bum
-bum
-bum
-bum
-bum
+aCr
+aCr
+aCr
+aCr
+aCr
+aEG
xbp
xUL
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
+lQJ
+aCr
+aCr
+aCr
+aCr
+aCr
+aCr
+aCr
+aCr
+aEG
rGc
tdX
tdX
@@ -100395,7 +100882,7 @@ aNU
kVD
noQ
leT
-leT
+mqd
leT
iCq
leT
@@ -100406,7 +100893,7 @@ wku
xGy
lBH
bnU
-bmX
+avT
avT
ydp
ydp
@@ -100466,12 +100953,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -100626,9 +101113,10 @@ bum
bum
bum
bum
-bum
+axN
xbp
xUL
+dDC
bum
bum
bum
@@ -100637,8 +101125,7 @@ bum
bum
bum
bum
-bum
-bum
+axN
dQW
tdX
tdX
@@ -100723,12 +101210,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -100883,9 +101370,10 @@ bum
bum
bum
bum
-bum
+axN
xbp
xUL
+dDC
bum
bum
bum
@@ -100894,8 +101382,7 @@ bum
bum
bum
bum
-bum
-bum
+axN
rGc
tdX
tdX
@@ -100980,12 +101467,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -101140,9 +101627,10 @@ bum
bum
bum
bum
-bum
+axN
xbp
xUL
+dDC
bum
bum
bum
@@ -101151,8 +101639,7 @@ bum
bum
bum
bum
-bum
-bum
+axN
dQW
tdX
tdX
@@ -101242,7 +101729,7 @@ avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -101397,9 +101884,10 @@ bum
bum
bum
bum
-bum
+axN
xbp
xUL
+dDC
bum
bum
bum
@@ -101408,8 +101896,7 @@ bum
bum
bum
bum
-bum
-bum
+axN
rGc
jPj
dQW
@@ -101492,14 +101979,14 @@ yhx
yhx
yhx
yhx
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -101654,9 +102141,10 @@ bum
bum
bum
bum
-bum
+axN
xbp
xUL
+dDC
bum
bum
bum
@@ -101665,8 +102153,7 @@ bum
bum
bum
bum
-bum
-bum
+axN
dQW
cly
cly
@@ -101749,14 +102236,14 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -101911,9 +102398,10 @@ bum
bum
bum
bum
-bum
+axN
xbp
xUL
+dDC
bum
bum
bum
@@ -101922,8 +102410,7 @@ bum
bum
bum
bum
-bum
-bum
+axN
xUL
xUL
xUL
@@ -102006,14 +102493,14 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -102168,9 +102655,10 @@ bum
bum
bum
bum
-bum
+axN
xbp
xUL
+dDC
bum
bum
bum
@@ -102179,8 +102667,7 @@ bum
bum
bum
bum
-bum
-bum
+axN
xUL
xUL
xUL
@@ -102263,14 +102750,14 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
yhx
yhx
yhx
@@ -102425,9 +102912,10 @@ bum
bum
bum
bum
-bum
+axN
xbp
xUL
+dDC
bum
bum
bum
@@ -102436,16 +102924,15 @@ bum
bum
bum
bum
-bum
-bum
+axN
xUL
xUL
xUL
xUL
xUL
-bum
-bum
-bum
+lQJ
+aCr
+aCr
hBq
pCv
iuP
@@ -102520,12 +103007,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
-yhx
+nbC
yhx
yhx
yhx
@@ -102677,24 +103164,24 @@ bqN
bxL
bxL
bxL
-bum
-bum
-bum
-bum
-bum
-bum
+azH
+azH
+azH
+azH
+azH
+aHK
xbp
xUL
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
+dFJ
+azH
+azH
+azH
+azH
+azH
+azH
+azH
+azH
+aHK
xUL
xUL
xUL
@@ -102777,12 +103264,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
-yhx
+nbC
yhx
yhx
yhx
@@ -103034,12 +103521,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
-yhx
+nbC
yhx
yhx
yhx
@@ -103291,12 +103778,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
-yhx
+nbC
yhx
yhx
yhx
@@ -103448,27 +103935,27 @@ bqN
bqN
bxL
bxL
-bum
-bum
-bum
-bum
-bum
-bum
+aCr
+aCr
+aCr
+aCr
+aCr
+aEG
xUL
xUL
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
+lQJ
+aCr
+aCr
+aCr
+aCr
+aCr
+aCr
+aCr
+aCr
+aCr
+aCr
+aCr
+aEG
xUL
xbp
sTq
@@ -103548,12 +104035,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
-yhx
+nbC
yhx
yhx
yhx
@@ -103710,9 +104197,10 @@ bum
bum
bum
bum
-bum
+axN
xUL
xUL
+dDC
bum
bum
bum
@@ -103724,11 +104212,10 @@ bum
bum
bum
bum
-bum
-bum
+axN
xUL
xbp
-sTq
+lgg
hBq
xBV
hBq
@@ -103748,7 +104235,7 @@ avT
avT
avT
avT
-bmX
+avT
ydp
ydp
ydp
@@ -103805,12 +104292,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
-yhx
+nbC
yhx
yhx
yhx
@@ -103967,9 +104454,10 @@ bum
bum
bum
bum
-bum
+axN
xUL
xUL
+dDC
bum
bum
bum
@@ -103981,8 +104469,7 @@ bum
bum
bum
bum
-bum
-bum
+axN
rGc
rvf
umD
@@ -104062,12 +104549,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
-yhx
+nbC
yhx
yhx
yhx
@@ -104224,9 +104711,10 @@ bum
bum
bum
bum
-bum
+axN
xUL
xUL
+dDC
bum
bum
bum
@@ -104238,8 +104726,7 @@ bum
bum
bum
bum
-bum
-bum
+axN
odg
xbp
bZa
@@ -104319,13 +104806,13 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
-yhx
-yhx
+nbC
+nbC
yhx
yhx
yhx
@@ -104349,7 +104836,7 @@ faJ
rot
avT
jxB
-aQK
+sQk
rot
avT
wuf
@@ -104481,9 +104968,10 @@ bum
bum
bum
bum
-bum
+axN
xUL
xUL
+dDC
bum
bum
bum
@@ -104495,12 +104983,11 @@ bum
bum
bum
bum
-bum
-bum
+axN
odg
xbp
-sTq
-sTq
+cVa
+qZb
lHa
nQd
umD
@@ -104582,8 +105069,8 @@ avT
avT
bBh
avT
-yhx
-yhx
+nbC
+nbC
yhx
yhx
yhx
@@ -104606,7 +105093,7 @@ vDy
rot
avT
jxB
-qfJ
+qjF
rot
avT
wuf
@@ -104738,9 +105225,10 @@ bum
bum
bum
bum
-bum
+axN
xUL
xUL
+dDC
bum
bum
bum
@@ -104752,12 +105240,11 @@ bum
bum
bum
bum
-bum
-bum
+axN
odg
xbp
-sTq
-sTq
+lgg
+oGZ
pQg
tFN
tFN
@@ -104833,13 +105320,13 @@ yhx
yhx
yhx
yhx
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
avT
bBh
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -104863,7 +105350,7 @@ vDy
rot
avT
jxB
-qfJ
+qjF
rot
avT
wuf
@@ -104995,9 +105482,10 @@ bxL
bum
bum
bum
-bum
+axN
xUL
xUL
+dDC
bum
bum
bum
@@ -105009,8 +105497,7 @@ bum
bum
bum
bum
-bum
-bum
+axN
dQW
rvf
cly
@@ -105092,12 +105579,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
-yhx
-yhx
+nbC
+nbC
yhx
yhx
yhx
@@ -105120,7 +105607,7 @@ vDy
rot
avT
jxB
-qfJ
+qjF
rot
avT
avT
@@ -105252,9 +105739,10 @@ bxL
bxL
bxL
bum
-bum
+axN
xUL
xUL
+dDC
bum
bum
bum
@@ -105266,8 +105754,7 @@ bum
bum
bum
bum
-bum
-bum
+axN
xUL
wDd
alE
@@ -105349,7 +105836,7 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
@@ -105377,7 +105864,7 @@ vDy
rot
avT
jxB
-qfJ
+qjF
rot
avT
avT
@@ -105512,22 +105999,22 @@ bKI
bKI
xUL
xUL
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
+dFJ
+azH
+azH
+azH
+azH
+azH
+azH
+azH
+azH
+azH
+azH
+azH
+aHK
+xUL
+xUL
+xUL
xUL
bOb
xUL
@@ -105606,7 +106093,7 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
@@ -105626,15 +106113,15 @@ avT
avT
avT
avT
-hGK
+jEm
avT
avT
avT
-hGK
+jEm
avT
avT
avT
-hGK
+jEm
avT
avT
avT
@@ -105863,7 +106350,7 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
rUq
sXy
@@ -105875,26 +106362,26 @@ oBl
uyM
dUH
fUm
-sXy
-sXy
-sXy
-sXy
-sXy
-sXy
-sXy
-fNh
-xUL
-xUL
-xUL
-xUL
-xUL
-nyq
-sXy
-fNh
-xUL
-nyq
-sXy
-sXy
+wMH
+wMH
+wMH
+wMH
+wMH
+wMH
+wMH
+cWI
+jWw
+jWw
+jWw
+jWw
+jWw
+gIW
+wMH
+cWI
+jWw
+gIW
+wMH
+wMH
uRc
avT
wuf
@@ -106120,8 +106607,8 @@ yhx
yhx
yhx
yhx
-yhx
-yhx
+nbC
+nbC
avT
avT
avT
@@ -106140,15 +106627,15 @@ avT
avT
avT
avT
-clq
+oPk
avT
avT
avT
-clq
+oPk
avT
avT
avT
-clq
+oPk
avT
avT
avT
@@ -106283,24 +106770,24 @@ bKI
bKI
bxL
bxL
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
-bum
+aCr
+aCr
+aCr
+aCr
+aCr
+aCr
+aCr
+aCr
+aCr
+aCr
+aCr
+aCr
+aCr
+aCr
+aCr
+aCr
+aCr
+aCr
bxL
bqN
bqN
@@ -106309,7 +106796,7 @@ bqN
avT
avT
avT
-bmX
+avT
avT
avT
avT
@@ -106397,15 +106884,15 @@ avT
avT
avT
jxB
-mmM
+qIW
rot
avT
jxB
-mmM
+qIW
rot
avT
jxB
-knR
+lQd
rot
avT
avT
@@ -106635,11 +107122,11 @@ yhx
yhx
yhx
yhx
-yhx
-yhx
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
+nbC
+nbC
yhx
yhx
yhx
@@ -106654,15 +107141,15 @@ avT
avT
avT
jxB
-mmM
+qIW
rot
avT
jxB
-mmM
+qIW
rot
avT
jxB
-knR
+lQd
rot
avT
avT
@@ -106911,15 +107398,15 @@ avT
avT
avT
jxB
-mmM
+qIW
rot
avT
jxB
-mmM
+qIW
rot
avT
jxB
-knR
+lQd
rot
avT
wuf
@@ -107168,15 +107655,15 @@ avT
avT
avT
jxB
-mmM
+qIW
rot
avT
jxB
-mmM
+qIW
rot
avT
jxB
-knR
+lQd
rot
avT
wuf
@@ -107425,15 +107912,15 @@ avT
avT
avT
jxB
-gTh
+pvP
rot
avT
jxB
-gTh
+pvP
rot
avT
jxB
-gTh
+pvP
rot
avT
wuf
diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm
index 63574c6475..d2fa8bcc70 100644
--- a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm
+++ b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm
@@ -200,13 +200,15 @@
/datum/dynamic_ruleset/latejoin/heretic_smuggler
name = "Heretic Smuggler"
antag_datum = /datum/antagonist/heretic
- antag_flag = ROLE_HERETIC
+ antag_flag = "latejoin_heretic"
protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
restricted_roles = list("AI","Cyborg")
required_candidates = 1
weight = 4
- cost = 10
- requirements = list(40,30,20,10,10,10,10,10,10,10)
+ cost = 25
+ requirements = list(60,60,60,55,50,50,50,50,50,50)
+ high_population_requirement = 50
+ property_weights = list("story_potential" = 1, "trust" = -1, "chaos" = 2, "extended" = -1, "valid" = 2)
repeatable = TRUE
//////////////////////////////////////////////
diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm
index 766ddcefc7..db4ec99558 100644
--- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm
+++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm
@@ -151,16 +151,18 @@
/datum/dynamic_ruleset/roundstart/heretics
name = "Heretics"
- antag_flag = ROLE_HERETIC
+ antag_flag = "heretic"
antag_datum = /datum/antagonist/heretic
protected_roles = list("Prisoner","Security Officer", "Warden", "Detective", "Head of Security", "Captain")
restricted_roles = list("AI", "Cyborg")
required_candidates = 1
weight = 3
- cost = 20
+ cost = 25
scaling_cost = 15
- requirements = list(50,45,45,40,35,20,20,15,10,10)
+ requirements = list(60,60,60,55,50,50,50,50,50,50)
+ property_weights = list("story_potential" = 1, "trust" = -1, "chaos" = 2, "extended" = -1, "valid" = 2)
antag_cap = list(1,1,1,1,2,2,2,2,3,3)
+ high_population_requirement = 50
/datum/dynamic_ruleset/roundstart/heretics/pre_execute()
diff --git a/code/game/gamemodes/dynamic/dynamic_storytellers.dm b/code/game/gamemodes/dynamic/dynamic_storytellers.dm
index 148de9568a..dd281c456f 100644
--- a/code/game/gamemodes/dynamic/dynamic_storytellers.dm
+++ b/code/game/gamemodes/dynamic/dynamic_storytellers.dm
@@ -22,14 +22,14 @@
var/datum/game_mode/dynamic/mode = null // Cached as soon as it's made, by dynamic.
/**
-Property weights are:
+Property weights are added to the config weight of the ruleset. They are:
"story_potential" -- essentially how many different ways the antag can be played.
"trust" -- How much it makes the crew trust each other. Negative values means they're suspicious. Team antags are like this.
"chaos" -- How chaotic it makes the round. Has some overlap with "valid" and somewhat contradicts "extended".
"valid" -- How likely the non-antag-enemy crew are to get involved, e.g. nukies encouraging the warden to
let everyone into the armory, wizard moving around and being a nuisance, nightmare busting lights.
"extended" -- How much the antag is conducive to a long round. Nukies and cults are bad for this; Wizard is less bad; and so on.
-"conversion" -- Basically a bool. Conversion antags, well, convert. It's its own class for a good reason.
+"conversion" -- Basically a bool. Conversion antags, well, convert. It's in its own class 'cause people kinda hate conversion.
*/
/datum/dynamic_storyteller/proc/start_injection_cooldowns()
@@ -126,8 +126,9 @@ Property weights are:
for(var/property in property_weights)
if(property in rule.property_weights) // just treat it as 0 if it's not in there
property_weight += rule.property_weights[property] * property_weights[property]
- if(property_weight > 0)
- drafted_rules[rule] = rule.get_weight() * property_weight * rule.weight_mult
+ var/calced_weight = (rule.get_weight() + property_weight) * rule.weight_mult
+ if(calced_weight > 0) // negatives in the list might cause problems
+ drafted_rules[rule] = calced_weight
return drafted_rules
/datum/dynamic_storyteller/proc/midround_draft()
@@ -144,21 +145,24 @@ Property weights are:
for(var/property in property_weights)
if(property in rule.property_weights) // just treat it as 0 if it's not in there
property_weight += rule.property_weights[property] * property_weights[property]
- if(property_weight > 0)
- var/threat_weight = 1
- if(!(rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET)) // makes the traitor rulesets always possible anyway
- var/cost_difference = abs(rule.cost-(mode.threat_level-mode.threat))
- /* Basically, the closer the cost is to the current threat-level-away-from-threat, the more likely it is to
- pick this particular ruleset.
- Let's use a toy example: there's 60 threat level and 10 threat spent.
- We want to pick a ruleset that's close to that, so we run the below equation, on two rulesets.
- Ruleset 1 has 30 cost, ruleset 2 has 5 cost.
- When we do the math, ruleset 1's threat_weight is 0.538, and ruleset 2's is 0.238, meaning ruleset 1
- is 2.26 times as likely to be picked, all other things considered.
- Of course, we don't want it to GUARANTEE the closest, that's no fun, so it's just a weight.
- */
- threat_weight = abs(1-abs(1-LOGISTIC_FUNCTION(2,0.05,cost_difference,0)))
- drafted_rules[rule] = rule.get_weight() * property_weight * rule.weight_mult * threat_weight
+ var/threat_weight = 1
+ if(!(rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET)) // makes the traitor rulesets always possible anyway
+ var/cost_difference = rule.cost-(mode.threat_level-mode.threat)
+ /* Basically, the closer the cost is to the current threat-level-away-from-threat, the more likely it is to
+ pick this particular ruleset.
+ Let's use a toy example: there's 60 threat level and 10 threat spent.
+ We want to pick a ruleset that's close to that, so we run the below equation, on two rulesets.
+ Ruleset 1 has 30 cost, ruleset 2 has 5 cost.
+ When we do the math, ruleset 1's threat_weight is 0.538, and ruleset 2's is 0.238, meaning ruleset 1
+ is 2.26 times as likely to be picked, all other things considered.
+ Of course, we don't want it to GUARANTEE the closest, that's no fun, so it's just a weight.
+ */
+ threat_weight = abs(1-abs(1-LOGISTIC_FUNCTION(2,0.05,abs(cost_difference),0)))
+ if(cost_difference > 0)
+ threat_weight /= (1+(cost_difference*0.1))
+ var/calced_weight = (rule.get_weight() + property_weight) * rule.weight_mult * threat_weight
+ if(calced_weight > 0)
+ drafted_rules[rule] = calced_weight
return drafted_rules
/datum/dynamic_storyteller/proc/latejoin_draft(mob/living/carbon/human/newPlayer)
@@ -180,12 +184,15 @@ Property weights are:
for(var/property in property_weights)
if(property in rule.property_weights)
property_weight += rule.property_weights[property] * property_weights[property]
- if(property_weight > 0)
- var/threat_weight = 1
- if(!(rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET))
- var/cost_difference = abs(rule.cost-(mode.threat_level-mode.threat))
- threat_weight = 1-abs(1-(LOGISTIC_FUNCTION(2,0.05,cost_difference,0)))
- drafted_rules[rule] = rule.get_weight() * property_weight * rule.weight_mult * threat_weight
+ var/threat_weight = 1
+ if(!(rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET))
+ var/cost_difference = rule.cost-(mode.threat_level-mode.threat)
+ threat_weight = 1-abs(1-(LOGISTIC_FUNCTION(2,0.05,abs(cost_difference),0)))
+ if(cost_difference > 0)
+ threat_weight /= (1+(cost_difference*0.1))
+ var/calced_weight = (rule.get_weight() + property_weight) * rule.weight_mult * threat_weight
+ if(calced_weight > 0)
+ drafted_rules[rule] = calced_weight
return drafted_rules
/datum/dynamic_storyteller/proc/event_draft()
@@ -196,8 +203,9 @@ Property weights are:
for(var/property in property_weights)
if(property in rule.property_weights)
property_weight += rule.property_weights[property] * property_weights[property]
- if(property_weight > 0)
- drafted_rules[rule] = rule.get_weight() + property_weight * rule.weight_mult
+ var/calced_weight = (rule.get_weight() + property_weight) * rule.weight_mult
+ if(calced_weight > 0)
+ drafted_rules[rule] = calced_weight
return drafted_rules
@@ -327,12 +335,6 @@ Property weights are:
flags = USE_PREV_ROUND_WEIGHTS
property_weights = list("story_potential" = 2)
-
-/datum/dynamic_storyteller/story/calculate_threat()
- var/current_time = (world.time / SSautotransfer.targettime)*180
- mode.threat_level = round((mode.initial_threat_level*(sin(current_time)/2)+0.75),0.1)
- return ..()
-
/datum/dynamic_storyteller/classic
name = "Classic"
config_tag = "classic"
diff --git a/code/game/mecha/mecha_defense.dm b/code/game/mecha/mecha_defense.dm
index 40336fb01e..e2d3af149f 100644
--- a/code/game/mecha/mecha_defense.dm
+++ b/code/game/mecha/mecha_defense.dm
@@ -1,12 +1,10 @@
/obj/mecha/proc/get_armour_facing(relative_dir)
switch(relative_dir)
- if(0) // BACKSTAB!
+ if(180) // BACKSTAB!
return facing_modifiers[BACK_ARMOUR]
- if(45, 90, 270, 315)
- return facing_modifiers[SIDE_ARMOUR]
- if(225, 180, 135)
+ if(0, 45) // direct or 45 degrees off
return facing_modifiers[FRONT_ARMOUR]
- return 1 //always return non-0
+ return facing_modifiers[SIDE_ARMOUR] //if its not a front hit or back hit then assume its from the side
/obj/mecha/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
. = ..()
@@ -43,7 +41,7 @@
break
if(attack_dir)
- var/facing_modifier = get_armour_facing(dir2angle(attack_dir) - dir2angle(src))
+ var/facing_modifier = get_armour_facing(abs(dir2angle(dir) - dir2angle(attack_dir)))
booster_damage_modifier /= facing_modifier
booster_deflection_modifier *= facing_modifier
if(prob(deflect_chance * booster_deflection_modifier))
diff --git a/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm b/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm
index 2f6a018a4c..dfda2bf152 100644
--- a/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm
+++ b/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm
@@ -251,7 +251,8 @@
var/mob/camera/eminence/E = owner
E.eminence_help()
-//Returns to the Ark
+/*
+//Returns to the Ark - Commented out and replaced with obelisk_jump
/datum/action/innate/eminence/ark_jump
name = "Return to Ark"
desc = "Warps you to the Ark."
@@ -265,6 +266,40 @@
flash_color(owner, flash_color = "#AF0AAF", flash_time = 25)
else
to_chat(owner, "There is no Ark!")
+*/
+
+//Warps to a chosen Obelisk
+/datum/action/innate/eminence/obelisk_jump
+ name = "Warp to Obelisk"
+ desc = "Warps to a chosen clockwork obelisk."
+ button_icon_state = "Abscond"
+
+/datum/action/innate/eminence/obelisk_jump/Activate()
+ var/list/possible_targets = list()
+ var/list/warpnames = list()
+
+ for(var/obj/structure/destructible/clockwork/powered/clockwork_obelisk/O in GLOB.all_clockwork_objects)
+ if(!O.Adjacent(owner) && O.anchored)
+ var/area/A = get_area(O)
+ var/locname = initial(A.name)
+ possible_targets[avoid_assoc_duplicate_keys("[locname] [O.name]", warpnames)] = O
+
+ if(!possible_targets.len)
+ to_chat(owner, "There are no Obelisks to warp to!")
+ return
+
+ var/target_key = input(owner, "Choose an Obelisk to warp to.", "Obelisk Warp") as null|anything in possible_targets
+ var/obj/structure/destructible/clockwork/powered/clockwork_obelisk/target = possible_targets[target_key]
+
+ if(!target_key || !owner)
+ return
+
+ if(!target)
+ to_chat(owner, "That Obelisk does no longer exist!")
+ return
+ owner.forceMove(get_turf(target))
+ owner.playsound_local(owner, 'sound/magic/magic_missile.ogg', 50, TRUE)
+ flash_color(owner, flash_color = "#AF0AAF", flash_time = 25)
//Warps to the Station
/datum/action/innate/eminence/station_jump
diff --git a/code/modules/antagonists/eldritch_cult/eldritch_antag.dm b/code/modules/antagonists/eldritch_cult/eldritch_antag.dm
index 367710b110..79dfbdd7c3 100644
--- a/code/modules/antagonists/eldritch_cult/eldritch_antag.dm
+++ b/code/modules/antagonists/eldritch_cult/eldritch_antag.dm
@@ -6,6 +6,7 @@
job_rank = ROLE_HERETIC
antag_hud_type = ANTAG_HUD_HERETIC
antag_hud_name = "heretic"
+ threat = 10
var/give_equipment = TRUE
var/list/researched_knowledge = list()
var/total_sacrifices = 0
@@ -208,6 +209,14 @@
/datum/antagonist/heretic/proc/get_all_knowledge()
return researched_knowledge
+/datum/antagonist/heretic/threat()
+ . = ..()
+ for(var/X in researched_knowledge)
+ var/datum/eldritch_knowledge/EK = researched_knowledge[X]
+ . += EK.cost
+ if(ascended)
+ . += 20
+
////////////////
// Objectives //
////////////////
diff --git a/html/changelogs/AutoChangeLog-pr-13292.yml b/html/changelogs/AutoChangeLog-pr-13292.yml
new file mode 100644
index 0000000000..cd239b63e1
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13292.yml
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes:
+ - bugfix: "Dynamic storytellers now calculate property weights properly."
diff --git a/html/changelogs/AutoChangeLog-pr-13293.yml b/html/changelogs/AutoChangeLog-pr-13293.yml
new file mode 100644
index 0000000000..a03ccef29c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13293.yml
@@ -0,0 +1,4 @@
+author: "lolman360"
+delete-after: True
+changes:
+ - bugfix: "shuttle engine/heater sprites now face the right way"
diff --git a/html/changelogs/AutoChangeLog-pr-13298.yml b/html/changelogs/AutoChangeLog-pr-13298.yml
new file mode 100644
index 0000000000..d05c29838b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13298.yml
@@ -0,0 +1,5 @@
+author: "DeltaFire15"
+delete-after: True
+changes:
+ - rscdel: "teleport-to-ark ability of the eminence, commented out"
+ - rscadd: "teleport-to-obelisk ability for the eminence"
diff --git a/html/changelogs/AutoChangeLog-pr-13302.yml b/html/changelogs/AutoChangeLog-pr-13302.yml
new file mode 100644
index 0000000000..5978601890
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13302.yml
@@ -0,0 +1,4 @@
+author: "Couls, ported by NecromancerAnne"
+delete-after: True
+changes:
+ - code_imp: "cleans up mech backstabbing code"
diff --git a/icons/turf/shuttle.dmi b/icons/turf/shuttle.dmi
index 985b9991a0..fbca824f47 100644
Binary files a/icons/turf/shuttle.dmi and b/icons/turf/shuttle.dmi differ