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 45e6e4dee0..ed574fa1a4 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" = (
@@ -10817,8 +10817,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;
@@ -10886,10 +10886,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{
@@ -10934,6 +10935,7 @@
/obj/structure/disposalpipe/segment{
dir = 6
},
+/obj/machinery/light/floor,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
"dvs" = (
@@ -10946,7 +10948,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{
@@ -11053,12 +11055,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"
@@ -11158,36 +11154,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
@@ -11265,9 +11236,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"
@@ -11354,7 +11327,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{
@@ -11386,7 +11359,7 @@
/obj/structure/disposalpipe/segment{
dir = 6
},
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
/area/crew_quarters/dorms)
"dKw" = (
/obj/structure/cable{
@@ -11437,6 +11410,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
@@ -12102,6 +12080,7 @@
dir = 1;
sortType = 26
},
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"egM" = (
@@ -12218,15 +12197,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
@@ -12287,6 +12257,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
@@ -12354,9 +12336,6 @@
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"ery" = (
-/obj/machinery/light{
- dir = 8
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -12371,10 +12350,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" = (
@@ -12587,6 +12562,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{
@@ -12690,6 +12671,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"
@@ -12870,7 +12858,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,
@@ -12982,25 +12970,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"
@@ -13174,10 +13143,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,
@@ -13417,6 +13382,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;
@@ -13489,7 +13468,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
@@ -13497,7 +13476,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
@@ -13819,6 +13798,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,
@@ -13914,9 +13900,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
@@ -13957,6 +13948,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
@@ -13986,17 +13982,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
},
@@ -14004,7 +13989,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,
@@ -14088,7 +14080,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{
@@ -14115,11 +14107,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{
@@ -14189,11 +14178,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
},
@@ -14355,6 +14339,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" = (
@@ -14376,9 +14363,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";
@@ -14391,6 +14375,7 @@
dir = 8
},
/obj/effect/landmark/blobstart,
+/obj/machinery/recharge_station,
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/dorms)
"fDi" = (
@@ -14416,6 +14401,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{
@@ -14514,7 +14506,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"
@@ -14733,11 +14736,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"
@@ -14869,6 +14872,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" = (
@@ -14955,6 +14961,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"
@@ -14998,8 +15011,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"
@@ -15044,7 +15063,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,
@@ -15273,6 +15292,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
@@ -15441,6 +15466,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,
@@ -15504,28 +15535,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,
@@ -15699,9 +15708,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,
@@ -15713,6 +15719,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" = (
@@ -15814,12 +15823,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{
@@ -16063,7 +16071,7 @@
dir = 1
},
/turf/open/floor/plasteel,
-/area/storage/atmos)
+/area/maintenance/department/electrical)
"gCG" = (
/obj/structure/closet/firecloset,
/turf/open/floor/plating,
@@ -16078,15 +16086,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,
@@ -16240,6 +16243,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{
@@ -16486,7 +16495,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{
@@ -16662,7 +16671,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
@@ -16692,11 +16701,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,
@@ -16773,7 +16789,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,
@@ -17108,13 +17125,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" = (
@@ -17158,6 +17178,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
@@ -17168,9 +17196,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" = (
@@ -17195,6 +17220,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,
@@ -17219,20 +17253,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" = (
@@ -17342,6 +17366,7 @@
/obj/machinery/light{
dir = 1
},
+/obj/machinery/vending/cigarette,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"hrN" = (
@@ -17361,15 +17386,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)
@@ -17419,12 +17443,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"
@@ -17471,11 +17489,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
@@ -17507,6 +17528,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
@@ -17567,7 +17596,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";
@@ -17589,6 +17618,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,
@@ -17680,7 +17721,7 @@
dir = 1;
name = "north facing firelock"
},
-/turf/open/floor/carpet,
+/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"hBb" = (
/obj/machinery/camera{
@@ -17710,6 +17751,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"
@@ -17720,6 +17765,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"
@@ -17829,7 +17884,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{
@@ -17855,7 +17910,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
@@ -17896,6 +17951,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
@@ -18001,7 +18062,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{
@@ -18127,7 +18188,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{
@@ -18154,7 +18215,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{
@@ -18403,6 +18464,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{
@@ -18554,6 +18619,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
@@ -18866,28 +18935,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{
@@ -18916,17 +18963,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" = (
@@ -18937,6 +18973,7 @@
dir = 10
},
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/obj/machinery/portable_atmospherics/canister,
/turf/open/floor/plasteel,
/area/science/mixing)
"ihJ" = (
@@ -18970,6 +19007,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
@@ -19305,6 +19345,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";
@@ -19363,7 +19409,7 @@
},
/obj/machinery/light,
/turf/open/floor/plating,
-/area/storage/atmos)
+/area/maintenance/department/electrical)
"itw" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -19437,7 +19483,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{
@@ -19446,15 +19492,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,
@@ -19488,6 +19525,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"
@@ -19501,6 +19545,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{
@@ -19791,6 +19841,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" = (
@@ -19976,7 +20033,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,
@@ -20018,6 +20075,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{
@@ -20030,14 +20094,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
},
@@ -20047,6 +20112,9 @@
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
+/obj/structure/window/reinforced{
+ dir = 8
+ },
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"iNE" = (
@@ -20062,22 +20130,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"
@@ -20102,12 +20154,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
@@ -20119,6 +20165,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" = (
@@ -20163,6 +20215,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";
@@ -20204,12 +20263,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" = (
@@ -20246,9 +20305,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,
@@ -20404,7 +20467,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{
@@ -20709,7 +20772,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,
@@ -20776,7 +20839,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
@@ -20898,10 +20961,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{
@@ -20952,11 +21016,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"
@@ -21027,7 +21091,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{
@@ -21122,22 +21186,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"
@@ -21256,6 +21304,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,
@@ -21569,7 +21623,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"
@@ -21604,6 +21658,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
@@ -21824,6 +21884,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,
@@ -21882,7 +21945,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
/area/crew_quarters/dorms)
"jYS" = (
/obj/structure/chair{
@@ -21941,6 +22004,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{
@@ -22027,15 +22097,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" = (
@@ -22124,24 +22197,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,
@@ -22245,6 +22305,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"
@@ -22412,7 +22480,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
@@ -22934,6 +23002,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
@@ -22963,6 +23038,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
@@ -23063,7 +23144,6 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/door/airlock/external,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
@@ -23071,6 +23151,7 @@
dir = 4
},
/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/external/glass,
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"kMy" = (
@@ -23153,9 +23234,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,
@@ -23166,6 +23244,9 @@
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
+/obj/structure/window/reinforced{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"kPA" = (
@@ -23227,9 +23308,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"
@@ -23363,6 +23441,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
@@ -23373,6 +23458,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"
@@ -23486,7 +23582,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{
@@ -23495,6 +23591,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"
@@ -23593,15 +23702,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" = (
@@ -23621,6 +23730,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"
@@ -23673,14 +23788,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";
@@ -23710,29 +23823,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)
@@ -23757,11 +23868,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" = (
@@ -23992,7 +24103,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
@@ -24544,7 +24655,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" = (
@@ -24571,12 +24687,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{
@@ -24591,12 +24701,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"
@@ -24672,6 +24776,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,
@@ -24716,27 +24833,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
@@ -25107,7 +25232,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{
@@ -25216,6 +25343,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{
@@ -25391,7 +25525,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"
@@ -25475,11 +25609,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
@@ -25499,6 +25633,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"
@@ -25591,7 +25734,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{
@@ -25846,17 +25989,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" = (
@@ -25917,6 +26071,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,
@@ -26527,7 +26691,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{
@@ -26618,6 +26782,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" = (
@@ -26635,7 +26803,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{
@@ -26975,13 +27147,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{
@@ -26994,19 +27166,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
@@ -27147,7 +27306,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
},
@@ -27155,7 +27313,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,
@@ -27244,6 +27403,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" = (
@@ -27258,7 +27423,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"
@@ -27362,7 +27527,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,
@@ -27450,7 +27615,7 @@
pixel_x = -24;
specialfunctions = 4
},
-/turf/open/floor/carpet,
+/turf/open/floor/carpet/blue,
/area/crew_quarters/dorms)
"nBk" = (
/obj/structure/cable{
@@ -27572,16 +27737,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"
@@ -27597,8 +27772,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
@@ -27640,6 +27828,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{
@@ -27792,6 +27990,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{
@@ -27921,10 +28126,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{
@@ -28021,6 +28231,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
@@ -28184,6 +28401,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
@@ -28639,7 +28862,7 @@
dir = 4;
name = "east facing firelock"
},
-/turf/open/floor/plasteel,
+/turf/open/floor/wood,
/area/crew_quarters/fitness)
"ojs" = (
/obj/structure/cable{
@@ -28824,6 +29047,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{
@@ -28860,45 +29095,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
@@ -28917,11 +29115,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" = (
@@ -28995,6 +29190,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"
@@ -29253,10 +29452,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" = (
@@ -29281,7 +29477,7 @@
c_tag = "Dorms South";
dir = 4
},
-/turf/open/floor/carpet,
+/turf/open/floor/wood,
/area/crew_quarters/dorms)
"oBF" = (
/obj/structure/cable{
@@ -29401,6 +29597,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"
@@ -29601,15 +29803,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,
@@ -29679,17 +29879,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" = (
@@ -29798,6 +30008,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
@@ -29994,17 +30210,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,
@@ -30085,13 +30291,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" = (
@@ -30233,23 +30437,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,
@@ -30419,7 +30611,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"
@@ -30553,6 +30745,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
@@ -30692,7 +30891,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,
@@ -30705,6 +30904,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{
@@ -30718,7 +30927,7 @@
dir = 4
},
/obj/machinery/door/poddoor/preopen{
- id = "xenobio2";
+ id = "xenobiospec";
name = "containment blast door"
},
/turf/open/floor/engine,
@@ -30887,6 +31096,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
@@ -30923,6 +31141,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" = (
@@ -31078,14 +31299,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" = (
@@ -31176,6 +31395,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
@@ -31346,8 +31570,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
@@ -31376,6 +31604,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)
@@ -31651,6 +31891,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" = (
@@ -31806,7 +32047,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
},
@@ -31814,7 +32054,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{
@@ -32022,7 +32263,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,
@@ -32103,6 +32344,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
@@ -32147,6 +32392,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
@@ -32238,23 +32495,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,
@@ -32338,7 +32579,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
@@ -32704,7 +32945,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"
@@ -32731,6 +32972,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,
@@ -32867,7 +33115,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,
@@ -32948,12 +33196,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)
@@ -32988,13 +33243,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{
@@ -33023,6 +33275,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{
@@ -33076,9 +33340,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
},
@@ -33086,6 +33347,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" = (
@@ -33184,6 +33448,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,
@@ -33337,6 +33609,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
@@ -33527,6 +33805,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
@@ -33566,14 +33850,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;
@@ -34095,7 +34385,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
@@ -34327,9 +34617,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;
@@ -34412,7 +34702,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,
@@ -34547,7 +34837,6 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/machinery/portable_atmospherics/canister,
/turf/open/floor/plasteel,
/area/science/mixing)
"rDE" = (
@@ -34570,6 +34859,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,
@@ -34705,6 +35006,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
@@ -34804,28 +35111,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
@@ -34865,9 +35160,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
@@ -34936,6 +35249,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" = (
@@ -35052,9 +35366,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" = (
@@ -35100,6 +35412,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,
@@ -35184,6 +35503,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"
},
@@ -35674,6 +35999,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{
@@ -35688,7 +36023,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,
@@ -35751,14 +36086,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";
@@ -35963,20 +36292,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" = (
@@ -36059,7 +36384,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" = (
@@ -36091,9 +36416,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
@@ -36101,6 +36423,9 @@
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
+/obj/structure/window/reinforced{
+ dir = 8
+ },
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"sLg" = (
@@ -36152,6 +36477,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,
@@ -36216,6 +36547,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" = (
@@ -36310,6 +36667,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
@@ -36396,8 +36762,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{
@@ -36884,22 +37266,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" = (
@@ -37181,7 +37550,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{
@@ -37288,6 +37657,7 @@
/obj/structure/disposalpipe/segment{
dir = 6
},
+/obj/machinery/light/floor,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
"tqp" = (
@@ -37357,7 +37727,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{
@@ -37555,6 +37925,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
@@ -37749,6 +38131,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,
@@ -37776,11 +38164,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
@@ -37816,11 +38205,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" = (
@@ -37894,9 +38281,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"
@@ -37966,6 +38356,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
@@ -38109,17 +38509,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{
@@ -38140,10 +38537,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" = (
@@ -38231,18 +38630,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)
@@ -38270,11 +38662,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
@@ -38350,6 +38744,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
@@ -38409,6 +38809,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"
@@ -38431,7 +38842,7 @@
pixel_x = -24;
specialfunctions = 4
},
-/turf/open/floor/carpet,
+/turf/open/floor/carpet/blue,
/area/crew_quarters/dorms)
"tYT" = (
/obj/structure/cable{
@@ -38720,7 +39131,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{
@@ -38803,7 +39214,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,
@@ -38814,6 +39225,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
@@ -38862,14 +39277,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" = (
@@ -38892,7 +39307,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,
@@ -39031,7 +39446,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,
@@ -39046,11 +39461,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
@@ -39105,13 +39527,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)
@@ -39194,6 +39612,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"
@@ -39384,13 +39808,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,
@@ -39566,12 +39990,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,
@@ -39582,6 +40000,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" = (
@@ -39769,12 +40193,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"
@@ -39843,8 +40269,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{
@@ -39937,6 +40369,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" = (
@@ -39968,6 +40401,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/light/floor,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
"uWW" = (
@@ -40246,11 +40680,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{
@@ -40268,7 +40700,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,
@@ -40407,7 +40839,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,
@@ -40485,6 +40917,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"
@@ -40608,13 +41045,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{
@@ -40703,7 +41137,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{
@@ -40736,7 +41170,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)
@@ -40812,7 +41246,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,
@@ -41015,11 +41449,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"
@@ -41193,12 +41633,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,
@@ -41208,7 +41648,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{
@@ -41295,6 +41735,7 @@
c_tag = "Northwest Paramedic Post";
network = list("ss13","medbay")
},
+/obj/item/wrench/medical,
/turf/open/floor/plasteel/white,
/area/medical/paramedic)
"vFe" = (
@@ -41306,6 +41747,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"
@@ -41319,6 +41772,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" = (
@@ -41430,17 +41885,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,
@@ -41457,16 +41902,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" = (
@@ -41477,7 +41921,7 @@
dir = 1
},
/turf/open/floor/plating,
-/area/storage/atmos)
+/area/maintenance/department/electrical)
"vLa" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -41601,6 +42045,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" = (
@@ -41669,15 +42117,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{
@@ -41718,13 +42166,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" = (
@@ -41875,6 +42321,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{
@@ -41887,7 +42349,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,
@@ -42232,11 +42694,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" = (
@@ -42262,7 +42724,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{
@@ -42281,6 +42743,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
@@ -42733,7 +43209,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{
@@ -42925,7 +43401,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;
@@ -43174,6 +43650,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"
@@ -43229,7 +43711,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,
@@ -43331,11 +43814,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" = (
@@ -43562,6 +44043,7 @@
/obj/machinery/light{
dir = 1
},
+/obj/machinery/vending/cigarette,
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"xaS" = (
@@ -43613,22 +44095,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" = (
@@ -43658,6 +44128,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
@@ -43666,9 +44144,6 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"xeI" = (
-/obj/machinery/conveyor_switch/oneway{
- id = "robo1"
- },
/obj/structure/disposalpipe/segment{
dir = 9
},
@@ -43680,8 +44155,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" = (
@@ -43819,10 +44299,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" = (
@@ -43885,6 +44365,7 @@
/obj/machinery/light{
dir = 4
},
+/obj/machinery/vending/wardrobe/robo_wardrobe,
/turf/open/floor/plasteel/white,
/area/science/robotics/lab)
"xmr" = (
@@ -44092,7 +44573,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{
@@ -44104,6 +44585,7 @@
/obj/structure/disposalpipe/segment{
dir = 9
},
+/obj/machinery/light/floor,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors)
"xui" = (
@@ -44242,11 +44724,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"
@@ -44857,6 +45336,7 @@
/obj/structure/disposalpipe/trunk{
dir = 4
},
+/obj/machinery/disposal/bin,
/turf/open/floor/wood,
/area/crew_quarters/bar)
"xUD" = (
@@ -44919,6 +45399,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{
@@ -45156,7 +45640,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"
@@ -45218,6 +45702,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" = (
@@ -51538,17 +52025,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
@@ -51795,17 +52282,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
@@ -51853,7 +52340,7 @@ ydp
ydp
buI
hnP
-swQ
+phs
ghq
ghq
ghq
@@ -52052,17 +52539,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
@@ -52110,14 +52597,14 @@ ydp
ydp
buI
buJ
-cXI
+ghq
ghq
hfZ
shR
ntV
jso
-shR
-shR
+tzb
+iru
hfZ
ghq
ghq
@@ -52309,17 +52796,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
@@ -52367,14 +52854,14 @@ ydp
bTC
buI
buJ
-cXI
+ghq
ghq
shR
shR
-shR
+onO
liL
scF
-hse
+lfD
shR
ghq
ghq
@@ -52566,17 +53053,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
@@ -52585,12 +53072,12 @@ vrd
vrd
vrd
vrd
+nbC
+nbC
+nbC
+nbC
yhx
-yhx
-yhx
-yhx
-yhx
-yhx
+nbC
yhx
yhx
yhx
@@ -52624,12 +53111,12 @@ ydp
buI
fJZ
phs
-cXI
+ghq
ghq
shR
shR
cpe
-cpe
+cUs
cpe
xIJ
shR
@@ -52824,15 +53311,15 @@ avT
avT
avT
avT
-hGK
+guI
avT
avT
avT
-hGK
+guI
avT
avT
avT
-hGK
+guI
avT
aNg
chZ
@@ -52847,12 +53334,12 @@ avT
avT
avT
avT
+nbC
+nbC
+nbC
+nbC
yhx
-yhx
-yhx
-yhx
-yhx
-yhx
+nbC
ydp
ydp
ydp
@@ -52881,7 +53368,7 @@ ydp
buI
lGy
ghq
-cXI
+ghq
aJC
shR
qVf
@@ -53077,21 +53564,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
@@ -53138,12 +53625,12 @@ avT
buI
gJx
ghq
-cXI
+ghq
irN
irr
xIJ
cpe
-ooR
+ghq
cpe
xIJ
irr
@@ -53338,15 +53825,15 @@ avT
avT
avT
avT
-clq
+hse
avT
avT
avT
-clq
+hse
avT
avT
avT
-clq
+hse
avT
aNg
chZ
@@ -53395,9 +53882,9 @@ avT
buI
phs
ghq
-cXI
+ghq
+irr
irr
-tFu
hmC
rBA
dfy
@@ -53594,17 +54081,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
@@ -53613,10 +54100,10 @@ vrd
vrd
vrd
vrd
-yhx
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
+nbC
bBh
avT
avT
@@ -53643,7 +54130,7 @@ avT
avT
avT
avT
-bmX
+avT
avT
avT
avT
@@ -53652,8 +54139,8 @@ ayq
ghq
ghq
ghq
-tSd
-lQp
+ghq
+vmr
rQu
rKd
gHG
@@ -53851,17 +54338,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
@@ -53873,7 +54360,7 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
rUq
sXy
sXy
@@ -54108,17 +54595,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
@@ -54130,13 +54617,13 @@ yhx
yhx
yhx
yhx
+nbC
+nbC
+nbC
+nbC
yhx
-yhx
-yhx
-yhx
-yhx
-yhx
-yhx
+nbC
+nbC
avT
avT
avT
@@ -54152,7 +54639,7 @@ ydp
avT
avT
avT
-avT
+bmX
apJ
apJ
apJ
@@ -54176,7 +54663,7 @@ cwT
aAC
mGl
grZ
-vdW
+cIh
ghq
bUB
bJf
@@ -54365,17 +54852,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
@@ -54393,7 +54880,7 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
@@ -54433,7 +54920,7 @@ hva
vZH
lac
iMX
-lhr
+cIh
ghq
bUB
bJf
@@ -54483,7 +54970,7 @@ wuf
avT
avT
avT
-bBh
+fUc
avT
avT
avT
@@ -54622,17 +55109,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
@@ -54650,8 +55137,8 @@ yhx
yhx
yhx
yhx
-yhx
-yhx
+nbC
+nbC
ydp
ydp
ydp
@@ -54740,7 +55227,7 @@ avT
avT
avT
avT
-bBh
+fUc
avT
avT
avT
@@ -54997,7 +55484,7 @@ rxI
rxI
rxI
avT
-hGK
+tEC
avT
rxI
rxI
@@ -55206,7 +55693,7 @@ nOG
vEm
fet
avT
-avT
+stP
avT
ydp
ydp
@@ -55253,9 +55740,9 @@ pjD
pjD
pjD
pjD
-fNh
-xUL
-nyq
+cih
+pIs
+ixO
fsh
fsh
fsh
@@ -55461,9 +55948,9 @@ azz
aAF
yiT
pwE
-fet
-avT
-avT
+iMk
+wMr
+bEp
bmX
avT
avT
@@ -55511,7 +55998,7 @@ dfx
dfx
dfx
avT
-clq
+uyV
avT
dfx
dfx
@@ -55720,7 +56207,7 @@ uKG
vEm
fet
avT
-avT
+kHJ
avT
avT
avT
@@ -55768,7 +56255,7 @@ avT
avT
avT
avT
-bBh
+fUc
avT
avT
avT
@@ -56025,7 +56512,7 @@ rxI
rxI
rxI
avT
-hGK
+tEC
avT
rxI
rxI
@@ -56281,9 +56768,9 @@ pjD
pjD
pjD
pjD
-fNh
-xUL
-nyq
+cih
+pIs
+ixO
fsh
fsh
fsh
@@ -56539,7 +57026,7 @@ dfx
dfx
dfx
avT
-clq
+uyV
avT
dfx
dfx
@@ -56796,7 +57283,7 @@ avT
avT
avT
avT
-bBh
+fUc
avT
avT
avT
@@ -57053,7 +57540,7 @@ rxI
rxI
rxI
avT
-hGK
+tEC
avT
rxI
rxI
@@ -57309,9 +57796,9 @@ pjD
pjD
pjD
pjD
-fNh
-xUL
-nyq
+cih
+pIs
+ixO
fsh
fsh
fsh
@@ -57567,7 +58054,7 @@ dfx
dfx
dfx
avT
-clq
+uyV
avT
dfx
dfx
@@ -57824,7 +58311,7 @@ avT
avT
avT
avT
-bBh
+fUc
avT
avT
avT
@@ -58007,7 +58494,7 @@ ydp
ydp
avT
bBh
-bmX
+avT
avT
gLH
ohf
@@ -58081,7 +58568,7 @@ avT
avT
avT
qlH
-bBh
+fUc
qlH
avT
avT
@@ -58286,8 +58773,8 @@ aFI
iek
wRz
erO
-aBK
-dFJ
+tmx
+tmx
kdA
aFI
avT
@@ -58544,8 +59031,8 @@ cwH
lam
erO
aBK
-aDf
-aEG
+aBK
+aBK
aFI
avT
avT
@@ -58800,8 +59287,8 @@ lWb
dfa
obB
aAe
-aBK
-aDf
+eXy
+aEE
aEE
bxM
avT
@@ -59057,8 +59544,8 @@ aFI
ays
mQK
auT
-aBK
-aDf
+hBM
+fol
aEI
bxM
avT
@@ -59314,7 +59801,7 @@ aFI
uJF
lam
jcS
-aBK
+hBM
aDc
aEH
bxM
@@ -59571,8 +60058,8 @@ nEi
jRU
uzT
gWn
-aBK
-aDf
+hBM
+jPf
aEK
bxM
avT
@@ -59828,7 +60315,7 @@ eGO
ayt
nuJ
aAw
-aBK
+rRQ
aEJ
aEJ
aIP
@@ -60135,11 +60622,11 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
xUL
bBh
xUL
-yhx
+nbC
yhx
yhx
yhx
@@ -60392,11 +60879,11 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
xUL
bBh
xUL
-yhx
+nbC
yhx
yhx
yhx
@@ -60648,12 +61135,12 @@ yhx
yhx
yhx
yhx
-yhx
-yhx
+nbC
+nbC
xUL
bBh
xUL
-yhx
+nbC
yhx
yhx
yhx
@@ -60905,12 +61392,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
xUL
bBh
xUL
-yhx
+nbC
yhx
yhx
yhx
@@ -61159,15 +61646,15 @@ yhx
yhx
yhx
yhx
-yhx
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
+nbC
euS
sXy
jAq
-yhx
-yhx
+nbC
+nbC
yhx
yhx
yhx
@@ -61417,13 +61904,13 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
bBh
xUL
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -61666,21 +62153,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
@@ -61920,10 +62407,10 @@ yhx
yhx
yhx
yhx
-yhx
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
+nbC
avT
xUL
xUL
@@ -61931,13 +62418,13 @@ xUL
xUL
avT
avT
-yhx
+nbC
xUL
xUL
bBh
xUL
-yhx
-yhx
+nbC
+nbC
yhx
yhx
yhx
@@ -62171,11 +62658,11 @@ yhx
yhx
yhx
yhx
-yhx
-yhx
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
+nbC
+nbC
yhx
avT
avT
@@ -62193,7 +62680,7 @@ sXy
sXy
jAq
xUL
-yhx
+nbC
yhx
yhx
yhx
@@ -62409,9 +62896,9 @@ odR
dPx
sPA
sKh
+dMo
irt
-irt
-guI
+srB
avT
avT
avT
@@ -62425,10 +62912,10 @@ ydp
ydp
ydp
yhx
-yhx
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
+nbC
avT
avT
avT
@@ -62441,16 +62928,16 @@ xUL
xUL
xUL
avT
-yhx
+nbC
xUL
xUL
xUL
xUL
xUL
avT
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
yhx
yhx
yhx
@@ -62666,7 +63153,7 @@ aLk
aNo
aOo
sKh
-irt
+dMo
srB
bzc
avT
@@ -62682,7 +63169,7 @@ ydp
ydp
ydp
yhx
-yhx
+nbC
avT
avT
avT
@@ -62696,16 +63183,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
@@ -62917,12 +63404,12 @@ aDb
qWM
hIH
nuS
-aPE
+qsD
wDR
fHF
-aPC
-aPE
-aPE
+aVv
+qsD
+qsD
hmM
bzc
bzc
@@ -62949,11 +63436,11 @@ xUL
xUL
xUL
avT
-yhx
-yhx
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
+nbC
+nbC
yhx
yhx
yhx
@@ -63174,12 +63661,12 @@ bxk
bxk
hIH
iFl
-aPC
+aVv
gCC
qAF
hOc
aOp
-aPE
+qsD
hmM
bzc
bzc
@@ -63202,11 +63689,11 @@ avT
euS
jAq
xUL
-yhx
-yhx
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
+nbC
+nbC
yhx
yhx
yhx
@@ -63431,12 +63918,12 @@ hTk
vHU
qTO
aHD
-aPC
+aVv
jOy
lqt
gPb
hFv
-aPC
+aVv
hmM
bzc
bzc
@@ -63458,8 +63945,8 @@ avT
euS
jAq
xUL
-yhx
-yhx
+nbC
+nbC
yhx
yhx
yhx
@@ -63688,7 +64175,7 @@ srU
aFO
aFY
aHD
-aPC
+aVv
hxx
vKT
faR
@@ -63714,8 +64201,8 @@ avT
euS
jAq
xUL
-yhx
-yhx
+nbC
+nbC
yhx
yhx
yhx
@@ -63945,7 +64432,7 @@ aDm
hLZ
aFY
aHD
-aPC
+aVv
cKK
sub
vrg
@@ -63970,8 +64457,8 @@ avT
euS
jAq
xUL
-yhx
-yhx
+nbC
+nbC
yhx
yhx
yhx
@@ -64152,9 +64639,9 @@ ydp
ydp
ydp
ydp
-ydp
-ydp
-avT
+bum
+bum
+bum
avT
mpj
gNb
@@ -64202,15 +64689,15 @@ aDp
eZi
aFU
aHD
-aPE
+qsD
jmf
fLW
utp
itp
-aPE
+qsD
aQV
vcG
-wgu
+lzB
avT
avT
ydp
@@ -64226,8 +64713,8 @@ avT
euS
jAq
xUL
-yhx
-yhx
+nbC
+nbC
yhx
yhx
yhx
@@ -64410,8 +64897,8 @@ ydp
ydp
ydp
ydp
-ydp
-avT
+bum
+bum
avT
mpj
eSJ
@@ -64459,12 +64946,12 @@ aDe
rJk
aFT
jOj
-aPE
-aKa
-aPE
-aPE
-aPE
-aPE
+qsD
+mSN
+qsD
+qsD
+qsD
+qsD
aQV
vcG
lzB
@@ -64483,7 +64970,7 @@ euS
jAq
xUL
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -64667,7 +65154,7 @@ ydp
ydp
ydp
ydp
-ydp
+bum
ydp
avT
mpj
@@ -64733,14 +65220,14 @@ ydp
ydp
ydp
ydp
-avT
+bmX
avT
avT
bBh
xUL
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
yhx
yhx
yhx
@@ -64982,7 +65469,7 @@ xUL
xUL
vcG
lzB
-bmX
+avT
avT
ydp
ydp
@@ -64995,8 +65482,8 @@ avT
avT
bBh
xUL
-yhx
-yhx
+nbC
+nbC
yhx
yhx
yhx
@@ -65190,7 +65677,7 @@ avT
avT
avT
xUL
-vBe
+xUL
mbm
iJl
iJl
@@ -65226,7 +65713,7 @@ xeI
rqW
rqW
aGD
-tJi
+rqW
myh
qLm
qTG
@@ -65252,7 +65739,7 @@ avT
avT
bBh
xUL
-yhx
+nbC
yhx
yhx
yhx
@@ -65479,9 +65966,9 @@ rQJ
fwn
awb
rqW
-ayC
-rPU
-fne
+rqW
+rqW
+rqW
rqW
rqW
fOA
@@ -65509,7 +65996,7 @@ avT
avT
bBh
xUL
-yhx
+nbC
yhx
yhx
yhx
@@ -65701,7 +66188,7 @@ ydp
ydp
avT
avT
-bmX
+avT
avT
xUL
ace
@@ -65735,12 +66222,12 @@ iPX
rQJ
fpS
wPD
+ihY
+rqW
+rqW
+rqW
rqW
-pIf
-pIf
-pIf
rqW
-aHK
myh
uJx
ikk
@@ -65766,7 +66253,7 @@ avT
avT
bBh
xUL
-yhx
+nbC
yhx
yhx
yhx
@@ -65993,11 +66480,11 @@ rQJ
fvz
awb
rqW
-ayC
-azH
-fne
rqW
-aCr
+rqW
+rqW
+rqW
+rqW
myh
lHH
oYn
@@ -66008,7 +66495,7 @@ wUr
avT
avT
avT
-vcG
+lcv
wgu
avT
avT
@@ -66023,7 +66510,7 @@ avT
avT
bBh
xUL
-yhx
+nbC
yhx
yhx
yhx
@@ -66218,7 +66705,7 @@ avT
avT
avT
avT
-bGt
+ace
avT
avT
avT
@@ -66475,7 +66962,7 @@ ydp
avT
avT
avT
-ace
+bGt
avT
avT
avT
@@ -66510,8 +66997,8 @@ myh
rQJ
rQJ
rQJ
-myh
-myh
+eXO
+kjx
rQJ
wUr
wUr
@@ -66767,9 +67254,9 @@ xxi
ayD
cGz
sqg
-avT
-ydp
-ydp
+xdr
+ihY
+rQJ
ydp
ydp
ydp
@@ -67023,10 +67510,10 @@ oaS
eqP
tcj
viF
-ayG
-avT
-avT
-ydp
+sqg
+pJm
+ihY
+rQJ
ydp
ydp
ydp
@@ -67281,9 +67768,9 @@ iat
pEF
nez
sqg
-avT
-avT
-avT
+fEz
+sae
+rQJ
ydp
ydp
ydp
@@ -67538,9 +68025,9 @@ axr
ayE
nez
sqg
-ydp
-ydp
-avT
+rQJ
+rQJ
+rQJ
ydp
ydp
ydp
@@ -67807,7 +68294,7 @@ ydp
avT
avT
avT
-vcG
+lcv
wgu
avT
avT
@@ -68042,7 +68529,7 @@ ujE
grz
arP
xWq
-wje
+xWI
nrd
wje
sqg
@@ -68792,7 +69279,7 @@ ace
avT
avT
avT
-bmX
+avT
avT
avT
avT
@@ -69058,7 +69545,7 @@ avT
avT
avT
vBe
-xnm
+tLb
xUL
rhX
lXR
@@ -69316,12 +69803,12 @@ avT
avT
xUL
xnm
-xUL
+vBe
eTu
kHd
ljT
kHd
-gVo
+kHd
rhX
xUL
xUL
@@ -69573,7 +70060,7 @@ avT
avT
xUL
xnm
-xUL
+vBe
eTu
kHd
apK
@@ -69606,7 +70093,7 @@ ydp
ydp
avT
avT
-vcG
+lcv
wgu
avT
avT
@@ -69829,7 +70316,7 @@ avT
avT
avT
vBe
-xnm
+tLb
xUL
rhX
rhX
@@ -70588,18 +71075,18 @@ avT
avT
avT
ace
-xUL
vBe
xUL
-xUL
-xUL
-xUL
vBe
xUL
xUL
xUL
vBe
xUL
+xUL
+xUL
+xUL
+vBe
xnm
avT
avT
@@ -70626,9 +71113,9 @@ ydp
ydp
ydp
ydp
-avT
-avT
-avT
+ydp
+ydp
+ydp
avT
avT
avT
@@ -70847,11 +71334,11 @@ avT
pQd
kLh
kQr
+qOJ
lZn
lZn
lZn
-lZn
-lZn
+qOJ
lZn
lZn
lZn
@@ -70881,12 +71368,12 @@ ydp
ydp
ydp
avT
-avT
-avT
-avT
-avT
-avT
-avT
+ydp
+ydp
+ydp
+ydp
+ydp
+ydp
avT
avT
avT
@@ -71138,23 +71625,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
@@ -71360,7 +71847,7 @@ avT
avT
avT
xZL
-qZO
+xBk
avT
avT
avT
@@ -71391,21 +71878,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
@@ -71450,7 +71937,7 @@ nxv
kYF
bVM
avT
-bmX
+avT
ydp
ydp
ydp
@@ -71629,7 +72116,7 @@ avT
avT
avT
avT
-bmX
+avT
avT
avT
ydp
@@ -71651,17 +72138,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
@@ -71873,8 +72360,8 @@ ydp
avT
avT
avT
-xZL
-xBk
+aez
+qZO
avT
avT
avT
@@ -71907,18 +72394,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
@@ -72164,17 +72651,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
@@ -72419,20 +72906,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
@@ -72678,18 +73165,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
@@ -72707,7 +73194,7 @@ avT
avT
avT
avT
-avT
+bmX
wql
wql
vEG
@@ -72935,18 +73422,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
@@ -73192,19 +73679,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
@@ -73217,7 +73704,7 @@ ydp
ydp
ydp
ydp
-bmX
+avT
avT
wql
wql
@@ -73429,7 +73916,8 @@ avT
avT
avT
avT
-avT
+bmX
+ydp
ydp
ydp
ydp
@@ -73449,18 +73937,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
@@ -73507,7 +73994,7 @@ bUD
bVM
avT
avT
-bmX
+avT
avT
avT
avT
@@ -73704,20 +74191,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
@@ -73929,7 +74416,7 @@ avT
avT
avT
avT
-xZL
+aez
qZO
avT
avT
@@ -73961,20 +74448,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
@@ -74218,20 +74705,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
@@ -74477,20 +74964,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
@@ -74733,19 +75220,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
@@ -74800,7 +75287,7 @@ cer
avT
avT
avT
-bmX
+avT
avT
avT
avT
@@ -74992,19 +75479,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
@@ -75249,17 +75736,17 @@ avT
avT
avT
avT
-avT
xUL
xUL
xUL
-avT
-avT
xUL
xUL
xUL
-avT
-avT
+xUL
+xUL
+xUL
+xUL
+xUL
vcG
lzB
avT
@@ -75512,7 +75999,7 @@ nGx
nGx
nGx
nGx
-nGx
+hnN
nGx
nGx
nGx
@@ -75526,8 +76013,8 @@ avT
avT
bok
unA
-bJQ
-bJQ
+xjZ
+xjZ
unA
avT
avT
@@ -75762,7 +76249,7 @@ avT
avT
avT
avT
-tFr
+vcG
dvc
sLv
sLv
@@ -75985,7 +76472,7 @@ avT
avT
avT
avT
-xZL
+aez
qZO
avT
avT
@@ -76033,7 +76520,7 @@ avT
avT
avT
avT
-bmX
+avT
avT
avT
bok
@@ -76094,7 +76581,7 @@ ruD
clR
avT
avT
-bmX
+avT
avT
avT
avT
@@ -76534,7 +77021,7 @@ gky
vmM
jOo
azc
-lzB
+nDN
avT
avT
avT
@@ -76559,7 +77046,7 @@ wcB
unA
avT
avT
-bmX
+avT
avT
bwt
cTD
@@ -76808,7 +77295,7 @@ ncg
aXh
jHC
bok
-ivM
+uFq
bok
unA
uFq
@@ -77263,12 +77750,12 @@ ydp
ydp
ydp
ydp
-avT
-avT
-avT
-avT
-avT
-avT
+pgp
+iHM
+iHM
+iHM
+iHM
+iHM
avT
xZL
xBk
@@ -77520,15 +78007,15 @@ ydp
ydp
ydp
ydp
+pgp
+sTt
+nRA
+pDg
+qSF
+iHM
avT
-avT
-avT
-bHt
-nZE
-nZE
-nZE
aez
-xBk
+qZO
avT
avT
ydp
@@ -77561,7 +78048,7 @@ kxI
dPM
xNs
wwx
-nDd
+aAh
aDQ
avT
avT
@@ -77777,15 +78264,15 @@ ydp
ydp
ydp
avT
-avT
-avT
-avT
+pgp
+xAv
+xAv
mps
xAv
-ruo
-ruo
+iHM
+avT
acQ
-aUb
+xBk
avT
avT
avT
@@ -78021,28 +78508,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
@@ -78278,28 +78765,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
@@ -78535,27 +79022,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
@@ -78591,13 +79078,13 @@ spa
dIj
pIH
bpT
+dMo
irt
irt
+dMo
irt
irt
-irt
-irt
-irt
+dMo
gZS
uyK
aRt
@@ -78792,27 +79279,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
@@ -79048,26 +79535,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
@@ -79103,8 +79590,8 @@ cPI
hPe
vAs
ktw
-xZL
-lzB
+aez
+nDN
avT
avT
avT
@@ -79305,26 +79792,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
@@ -79346,7 +79833,7 @@ ydp
ydp
ydp
avT
-bmX
+avT
avT
avT
avT
@@ -79360,7 +79847,7 @@ spa
vir
fkr
ktw
-oME
+xZL
lzB
avT
avT
@@ -79562,27 +80049,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
@@ -79820,29 +80307,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
@@ -79957,7 +80444,7 @@ jQj
avT
avT
avT
-bmX
+avT
avT
avT
avT
@@ -80078,25 +80565,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
@@ -80125,7 +80612,7 @@ sLv
sLv
sLv
sLv
-sLv
+cEs
sLv
sLv
sLv
@@ -80335,25 +80822,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
@@ -80592,20 +81079,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
@@ -80849,21 +81336,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
@@ -81106,28 +81593,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
@@ -81363,18 +81850,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
@@ -81503,7 +81990,7 @@ avT
avT
avT
avT
-avT
+bmX
ydp
ydp
ydp
@@ -81625,20 +82112,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
@@ -81661,7 +82148,7 @@ avT
avT
avT
tFr
-lzB
+nDN
avT
avT
avT
@@ -81882,30 +82369,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
@@ -81915,7 +82402,7 @@ xUL
vBe
xUL
xUL
-xUL
+vBe
xUL
vcG
lzB
@@ -81975,7 +82462,7 @@ anA
wbT
rTs
hTL
-uRg
+hTL
jab
jFy
qJV
@@ -82140,39 +82627,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
@@ -82392,19 +82879,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
@@ -82418,7 +82905,7 @@ xUL
xUL
xUL
avT
-bmX
+avT
avT
avT
avT
@@ -82478,7 +82965,7 @@ vAs
vAs
krT
pze
-bEi
+sLF
bEi
lbp
bAs
@@ -82654,25 +83141,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
@@ -82740,7 +83227,7 @@ bFT
bCO
gRE
thV
-bCO
+qBl
bEa
kxj
aaw
@@ -82911,7 +83398,7 @@ avT
pgp
aab
aad
-gLk
+gdH
fBs
pgp
pgp
@@ -83457,10 +83944,10 @@ ydp
ydp
avT
avT
-bmX
+avT
avT
tFr
-lzB
+nDN
avT
avT
ydp
@@ -84178,7 +84665,7 @@ ydp
ydp
ydp
ydp
-avT
+bmX
avT
ydp
ydp
@@ -84693,7 +85180,7 @@ ydp
ydp
avT
avT
-bmX
+avT
avT
avT
avT
@@ -84795,7 +85282,7 @@ hJE
cmC
aIt
bCO
-bBN
+hyx
vTF
tRe
eVp
@@ -85080,7 +85567,7 @@ bPn
avT
avT
avT
-bmX
+avT
avT
avT
avT
@@ -85259,7 +85746,7 @@ ydp
avT
avT
tFr
-lzB
+nDN
avT
avT
avT
@@ -85432,23 +85919,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
@@ -86290,7 +86777,7 @@ vcG
lzB
avT
avT
-bmX
+avT
avT
ydp
ydp
@@ -86512,7 +86999,7 @@ mGp
rgm
wAx
wAx
-wAx
+ule
uEz
uEz
wzf
@@ -87026,11 +87513,11 @@ mKv
sAh
sAh
acb
-aar
+urI
+uEz
+uEz
uEz
uEz
-hrS
-lQJ
lia
uvB
tOY
@@ -87058,7 +87545,7 @@ xUL
xUL
avT
tFr
-lzB
+nDN
avT
avT
ydp
@@ -87103,7 +87590,7 @@ avT
avT
avT
avT
-bmX
+avT
avT
avT
avT
@@ -87285,10 +87772,10 @@ sAh
acb
urI
qkO
-uEz
-blD
+qnx
kge
-gls
+kge
+qnx
tgd
tRC
pJS
@@ -87382,7 +87869,7 @@ avT
avT
avT
avT
-bmX
+avT
avT
avT
ydp
@@ -87542,12 +88029,12 @@ qss
qss
ylW
uoV
-uEz
-blD
+qnx
+pgk
pgk
bKl
-iNK
-chN
+tgd
+tRC
pJS
sWD
bNF
@@ -87799,9 +88286,9 @@ sAh
acb
urI
uoV
-uEz
-blD
-pgk
+qnx
+kbE
+kbE
qnx
pbf
sFw
@@ -87884,7 +88371,7 @@ sXy
ikA
avT
avT
-bmX
+avT
avT
avT
avT
@@ -88056,10 +88543,10 @@ sAh
acb
urI
uoV
-uEz
-blD
-eLl
-igK
+qnx
+kge
+kge
+qnx
xcL
hop
pJS
@@ -88287,14 +88774,14 @@ ydp
ydp
ydp
ydp
-bmX
+avT
avT
avT
bBh
avT
aKf
irQ
-huF
+cfp
cfp
gxY
cfp
@@ -88313,11 +88800,11 @@ qss
oXl
pPz
uoV
-uEz
-hsQ
-cDO
-jAT
-nmL
+qnx
+pgk
+pgk
+qnx
+tgd
vKP
pJS
hNg
@@ -88405,7 +88892,7 @@ ydp
ydp
ydp
ydp
-avT
+bmX
avT
ydp
ydp
@@ -88552,7 +89039,7 @@ avT
aKf
irQ
jLG
-piu
+lhr
piu
xac
gNI
@@ -88570,12 +89057,12 @@ wAx
wAx
wAx
hru
-uEz
-uEz
-uEz
-ejw
-rTv
-eOO
+qnx
+kbE
+kbE
+qnx
+tgd
+tRC
pJS
hNg
bNF
@@ -88802,7 +89289,7 @@ ydp
ydp
ydp
avT
-avT
+bmX
ydp
bBh
avT
@@ -88830,9 +89317,9 @@ pbg
uEz
uEz
uEz
-ejw
-rTv
-eOO
+cvN
+gjZ
+tRC
pJS
jiY
bNF
@@ -88857,7 +89344,7 @@ xUL
xiw
avT
tFr
-lzB
+nDN
avT
avT
avT
@@ -88945,7 +89432,7 @@ ydp
ydp
ydp
avT
-bmX
+avT
avT
ydp
ydp
@@ -90607,7 +91094,7 @@ bBh
avT
aKf
gLO
-jvV
+cfp
evO
cfp
kBe
@@ -90656,7 +91143,7 @@ avT
avT
avT
tFr
-lzB
+nDN
avT
avT
avT
@@ -91422,7 +91909,7 @@ uMF
jsl
gFM
cuY
-nGx
+hnN
nGx
nGx
nGx
@@ -91679,11 +92166,11 @@ dks
nEl
ust
sHJ
+cEs
sLv
sLv
sLv
sLv
-ybT
asr
avT
avT
@@ -91989,12 +92476,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
bBh
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -92195,7 +92682,7 @@ lGB
jJu
avT
avT
-bmX
+avT
avT
avT
avT
@@ -92246,12 +92733,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
bBh
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -92399,8 +92886,8 @@ bqN
avT
xUL
xUL
-bmX
avT
+bmX
bxL
bxL
bxL
@@ -92408,7 +92895,7 @@ xUL
bxL
dri
dri
-dDC
+uot
nQp
kVx
eLQ
@@ -92503,12 +92990,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
bBh
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -92641,7 +93128,7 @@ avT
avT
bzc
xUL
-avT
+bmX
avT
ydp
ydp
@@ -92660,7 +93147,7 @@ avT
avT
bxL
bxL
-bum
+axN
xUL
xUL
dri
@@ -92758,14 +93245,14 @@ yhx
yhx
yhx
yhx
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
avT
avT
bBh
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -92895,7 +93382,7 @@ ydp
ydp
ydp
avT
-avT
+bum
bzh
xUL
avT
@@ -92917,7 +93404,7 @@ avT
bxL
bxL
bum
-bum
+axN
xUL
xUL
rww
@@ -92925,7 +93412,7 @@ rww
rww
ttQ
lNU
-bZI
+nDd
bZI
nNV
dBP
@@ -93015,14 +93502,14 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
avT
bBh
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -93152,9 +93639,9 @@ ydp
ydp
ydp
avT
-avT
-avT
-bmX
+bum
+bum
+bum
avT
avT
ydp
@@ -93174,7 +93661,7 @@ bxL
bxL
bum
bum
-bum
+axN
xUL
xUL
jrq
@@ -93272,14 +93759,14 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
euS
sXy
sXy
jAq
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -93409,10 +93896,10 @@ ydp
ydp
ydp
ydp
-avT
-avT
-avT
-avT
+bum
+bum
+bum
+bum
ydp
ydp
ydp
@@ -93431,7 +93918,7 @@ bKI
bum
bum
bum
-bum
+axN
xUL
xUL
rww
@@ -93529,14 +94016,14 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
avT
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -93667,7 +94154,7 @@ ydp
ydp
avT
avT
-avT
+bum
avT
avT
ydp
@@ -93688,7 +94175,7 @@ bKI
bum
bum
bum
-bum
+axN
xUL
xUL
dri
@@ -93786,14 +94273,14 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
avT
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
yhx
yhx
yhx
@@ -93945,7 +94432,7 @@ bKI
bum
bum
bum
-bum
+axN
xUL
xUL
wmB
@@ -94043,12 +94530,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -94199,10 +94686,10 @@ bKI
bCC
bCC
bKI
-bum
-bum
-bum
-bum
+azH
+azH
+azH
+aHK
xUL
xUL
fen
@@ -94245,7 +94732,7 @@ qzz
uqa
iIQ
avT
-bmX
+avT
avT
avT
ydp
@@ -94300,12 +94787,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -94557,7 +95044,7 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
@@ -94709,7 +95196,7 @@ bqN
bqN
bqN
bxL
-bum
+axN
xUL
xUL
xUL
@@ -94814,12 +95301,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -94966,8 +95453,8 @@ bqN
bqN
bxL
bxL
-bum
-bum
+ayC
+aEG
xUL
xUL
bKI
@@ -95071,12 +95558,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -95224,7 +95711,7 @@ bqN
bqN
bxL
bum
-bum
+axN
xUL
xUL
bKI
@@ -95328,12 +95815,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -95481,7 +95968,7 @@ bqN
bxL
bxL
bum
-bum
+axN
xUL
xUL
bKI
@@ -95585,12 +96072,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -95737,8 +96224,8 @@ bqN
bqN
bxL
bxL
-bum
-bum
+azH
+aHK
xUL
xUL
bKI
@@ -95840,14 +96327,14 @@ yhx
yhx
yhx
yhx
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -96005,7 +96492,7 @@ bKI
bKI
bMT
fgj
-nOk
+lQp
lfG
sdr
gyE
@@ -96097,14 +96584,14 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -96359,9 +96846,9 @@ avT
avT
avT
bBh
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
yhx
yhx
yhx
@@ -96508,9 +96995,9 @@ bqN
bqN
bxL
bxL
-bum
-bum
-bum
+aCr
+aCr
+aEG
xUL
bOb
bKI
@@ -96611,7 +97098,7 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
@@ -96767,7 +97254,7 @@ bqN
bxL
bum
bum
-bum
+axN
xUL
bOb
bKI
@@ -96868,12 +97355,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
-yhx
+nbC
yhx
yhx
yhx
@@ -97024,7 +97511,7 @@ bqN
bxL
bum
bum
-bum
+axN
xUL
bOb
bKI
@@ -97073,7 +97560,7 @@ wFO
mZp
avT
avT
-bmX
+avT
avT
avT
avT
@@ -97125,12 +97612,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
-yhx
+nbC
yhx
yhx
yhx
@@ -97281,7 +97768,7 @@ bqN
bxL
bum
bum
-bum
+axN
xUL
bOb
bKI
@@ -97382,12 +97869,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
-yhx
+nbC
yhx
yhx
yhx
@@ -97538,13 +98025,13 @@ bqN
bxL
bum
bum
-bum
+axN
xUL
bOb
-xUL
-xUL
-xUL
-xUL
+dDC
+bum
+bum
+axN
xbp
onY
gNy
@@ -97639,12 +98126,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
-yhx
+nbC
yhx
yhx
yhx
@@ -97795,13 +98282,13 @@ bxL
bxL
bxL
bum
-bum
+axN
xUL
bOb
-bum
-bum
-bum
-bum
+dFJ
+azH
+azH
+aHK
xbp
fen
eHK
@@ -97896,12 +98383,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
-yhx
+nbC
yhx
yhx
yhx
@@ -98052,7 +98539,7 @@ bxL
bxL
bxL
bum
-bum
+axN
bDA
bGW
bYY
@@ -98153,12 +98640,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
-yhx
+nbC
yhx
yhx
yhx
@@ -98309,7 +98796,7 @@ bxL
bxL
bxL
bum
-bum
+axN
bFx
bOb
bKI
@@ -98410,7 +98897,7 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
@@ -98566,7 +99053,7 @@ bqN
bqN
bxL
bum
-bum
+axN
bFx
bRD
caS
@@ -98667,14 +99154,14 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
yhx
yhx
yhx
@@ -98823,7 +99310,7 @@ bqN
bxL
bxL
bum
-bum
+axN
aEF
bYY
ccD
@@ -98924,14 +99411,14 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -99079,8 +99566,8 @@ bqN
bqN
bxL
bxL
-bum
-bum
+azH
+aHK
xUL
xUL
bKI
@@ -99181,14 +99668,14 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -99340,12 +99827,13 @@ xUL
xUL
xUL
xUL
+dDC
bum
bum
-bum
-bum
+axN
xbp
xUL
+dDC
bum
bum
bum
@@ -99359,8 +99847,7 @@ bum
bum
bum
bum
-bum
-bum
+axN
rGc
jPj
ucC
@@ -99438,14 +99925,14 @@ yhx
yhx
yhx
yhx
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -99597,27 +100084,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
@@ -99697,12 +100184,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -99850,8 +100337,8 @@ bqN
bqN
bxL
bxL
-bum
-bum
+aCr
+aEG
xUL
xUL
xUL
@@ -99954,7 +100441,7 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
@@ -100108,7 +100595,7 @@ bqN
bxL
bxL
bum
-bum
+axN
xUL
xUL
xUL
@@ -100211,12 +100698,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -100366,24 +100853,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
@@ -100397,7 +100884,7 @@ aNU
kVD
noQ
leT
-leT
+mqd
leT
iCq
leT
@@ -100408,7 +100895,7 @@ wku
xGy
lBH
bnU
-bmX
+avT
avT
ydp
ydp
@@ -100468,12 +100955,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -100628,9 +101115,10 @@ bum
bum
bum
bum
-bum
+axN
xbp
xUL
+dDC
bum
bum
bum
@@ -100639,8 +101127,7 @@ bum
bum
bum
bum
-bum
-bum
+axN
dQW
tdX
tdX
@@ -100725,12 +101212,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -100885,9 +101372,10 @@ bum
bum
bum
bum
-bum
+axN
xbp
xUL
+dDC
bum
bum
bum
@@ -100896,8 +101384,7 @@ bum
bum
bum
bum
-bum
-bum
+axN
rGc
tdX
tdX
@@ -100982,12 +101469,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -101142,9 +101629,10 @@ bum
bum
bum
bum
-bum
+axN
xbp
xUL
+dDC
bum
bum
bum
@@ -101153,8 +101641,7 @@ bum
bum
bum
bum
-bum
-bum
+axN
dQW
tdX
tdX
@@ -101244,7 +101731,7 @@ avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -101399,9 +101886,10 @@ bum
bum
bum
bum
-bum
+axN
xbp
xUL
+dDC
bum
bum
bum
@@ -101410,8 +101898,7 @@ bum
bum
bum
bum
-bum
-bum
+axN
rGc
jPj
dQW
@@ -101494,14 +101981,14 @@ yhx
yhx
yhx
yhx
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -101656,9 +102143,10 @@ bum
bum
bum
bum
-bum
+axN
xbp
xUL
+dDC
bum
bum
bum
@@ -101667,8 +102155,7 @@ bum
bum
bum
bum
-bum
-bum
+axN
dQW
cly
cly
@@ -101751,14 +102238,14 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -101913,9 +102400,10 @@ bum
bum
bum
bum
-bum
+axN
xbp
xUL
+dDC
bum
bum
bum
@@ -101924,8 +102412,7 @@ bum
bum
bum
bum
-bum
-bum
+axN
xUL
xUL
xUL
@@ -102008,14 +102495,14 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
avT
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -102170,9 +102657,10 @@ bum
bum
bum
bum
-bum
+axN
xbp
xUL
+dDC
bum
bum
bum
@@ -102181,8 +102669,7 @@ bum
bum
bum
bum
-bum
-bum
+axN
xUL
xUL
xUL
@@ -102265,14 +102752,14 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
yhx
yhx
yhx
@@ -102427,9 +102914,10 @@ bum
bum
bum
bum
-bum
+axN
xbp
xUL
+dDC
bum
bum
bum
@@ -102438,16 +102926,15 @@ bum
bum
bum
bum
-bum
-bum
+axN
xUL
xUL
xUL
xUL
xUL
-bum
-bum
-bum
+lQJ
+aCr
+aCr
hBq
pCv
iuP
@@ -102522,12 +103009,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
-yhx
+nbC
yhx
yhx
yhx
@@ -102679,24 +103166,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
@@ -102779,12 +103266,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
-yhx
+nbC
yhx
yhx
yhx
@@ -103036,12 +103523,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
-yhx
+nbC
yhx
yhx
yhx
@@ -103293,12 +103780,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
-yhx
+nbC
yhx
yhx
yhx
@@ -103450,27 +103937,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
@@ -103550,12 +104037,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
-yhx
+nbC
yhx
yhx
yhx
@@ -103712,9 +104199,10 @@ bum
bum
bum
bum
-bum
+axN
xUL
xUL
+dDC
bum
bum
bum
@@ -103726,11 +104214,10 @@ bum
bum
bum
bum
-bum
-bum
+axN
xUL
xbp
-sTq
+lgg
hBq
xBV
hBq
@@ -103750,7 +104237,7 @@ avT
avT
avT
avT
-bmX
+avT
ydp
ydp
ydp
@@ -103807,12 +104294,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
-yhx
+nbC
yhx
yhx
yhx
@@ -103969,9 +104456,10 @@ bum
bum
bum
bum
-bum
+axN
xUL
xUL
+dDC
bum
bum
bum
@@ -103983,8 +104471,7 @@ bum
bum
bum
bum
-bum
-bum
+axN
rGc
rvf
umD
@@ -104064,12 +104551,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
-yhx
+nbC
yhx
yhx
yhx
@@ -104226,9 +104713,10 @@ bum
bum
bum
bum
-bum
+axN
xUL
xUL
+dDC
bum
bum
bum
@@ -104240,8 +104728,7 @@ bum
bum
bum
bum
-bum
-bum
+axN
odg
xbp
bZa
@@ -104321,13 +104808,13 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
avT
avT
bBh
-yhx
-yhx
+nbC
+nbC
yhx
yhx
yhx
@@ -104351,7 +104838,7 @@ faJ
rot
avT
jxB
-aQK
+sQk
rot
avT
wuf
@@ -104483,9 +104970,10 @@ bum
bum
bum
bum
-bum
+axN
xUL
xUL
+dDC
bum
bum
bum
@@ -104497,12 +104985,11 @@ bum
bum
bum
bum
-bum
-bum
+axN
odg
xbp
-sTq
-sTq
+cVa
+qZb
lHa
nQd
umD
@@ -104584,8 +105071,8 @@ avT
avT
bBh
avT
-yhx
-yhx
+nbC
+nbC
yhx
yhx
yhx
@@ -104608,7 +105095,7 @@ vDy
rot
avT
jxB
-qfJ
+qjF
rot
avT
wuf
@@ -104740,9 +105227,10 @@ bum
bum
bum
bum
-bum
+axN
xUL
xUL
+dDC
bum
bum
bum
@@ -104754,12 +105242,11 @@ bum
bum
bum
bum
-bum
-bum
+axN
odg
xbp
-sTq
-sTq
+lgg
+oGZ
pQg
tFN
tFN
@@ -104835,13 +105322,13 @@ yhx
yhx
yhx
yhx
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
avT
bBh
avT
-yhx
+nbC
yhx
yhx
yhx
@@ -104865,7 +105352,7 @@ vDy
rot
avT
jxB
-qfJ
+qjF
rot
avT
wuf
@@ -104997,9 +105484,10 @@ bxL
bum
bum
bum
-bum
+axN
xUL
xUL
+dDC
bum
bum
bum
@@ -105011,8 +105499,7 @@ bum
bum
bum
bum
-bum
-bum
+axN
dQW
rvf
cly
@@ -105094,12 +105581,12 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
-yhx
-yhx
+nbC
+nbC
yhx
yhx
yhx
@@ -105122,7 +105609,7 @@ vDy
rot
avT
jxB
-qfJ
+qjF
rot
avT
avT
@@ -105254,9 +105741,10 @@ bxL
bxL
bxL
bum
-bum
+axN
xUL
xUL
+dDC
bum
bum
bum
@@ -105268,8 +105756,7 @@ bum
bum
bum
bum
-bum
-bum
+axN
xUL
wDd
alE
@@ -105351,7 +105838,7 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
@@ -105379,7 +105866,7 @@ vDy
rot
avT
jxB
-qfJ
+qjF
rot
avT
avT
@@ -105514,22 +106001,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
@@ -105608,7 +106095,7 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
bBh
avT
@@ -105628,15 +106115,15 @@ avT
avT
avT
avT
-hGK
+jEm
avT
avT
avT
-hGK
+jEm
avT
avT
avT
-hGK
+jEm
avT
avT
avT
@@ -105865,7 +106352,7 @@ yhx
yhx
yhx
yhx
-yhx
+nbC
avT
rUq
sXy
@@ -105877,26 +106364,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
@@ -106122,8 +106609,8 @@ yhx
yhx
yhx
yhx
-yhx
-yhx
+nbC
+nbC
avT
avT
avT
@@ -106142,15 +106629,15 @@ avT
avT
avT
avT
-clq
+oPk
avT
avT
avT
-clq
+oPk
avT
avT
avT
-clq
+oPk
avT
avT
avT
@@ -106285,24 +106772,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
@@ -106311,7 +106798,7 @@ bqN
avT
avT
avT
-bmX
+avT
avT
avT
avT
@@ -106399,15 +106886,15 @@ avT
avT
avT
jxB
-mmM
+qIW
rot
avT
jxB
-mmM
+qIW
rot
avT
jxB
-knR
+lQd
rot
avT
avT
@@ -106637,11 +107124,11 @@ yhx
yhx
yhx
yhx
-yhx
-yhx
-yhx
-yhx
-yhx
+nbC
+nbC
+nbC
+nbC
+nbC
yhx
yhx
yhx
@@ -106656,15 +107143,15 @@ avT
avT
avT
jxB
-mmM
+qIW
rot
avT
jxB
-mmM
+qIW
rot
avT
jxB
-knR
+lQd
rot
avT
avT
@@ -106913,15 +107400,15 @@ avT
avT
avT
jxB
-mmM
+qIW
rot
avT
jxB
-mmM
+qIW
rot
avT
jxB
-knR
+lQd
rot
avT
wuf
@@ -107170,15 +107657,15 @@ avT
avT
avT
jxB
-mmM
+qIW
rot
avT
jxB
-mmM
+qIW
rot
avT
jxB
-knR
+lQd
rot
avT
wuf
@@ -107427,15 +107914,15 @@ avT
avT
avT
jxB
-gTh
+pvP
rot
avT
jxB
-gTh
+pvP
rot
avT
jxB
-gTh
+pvP
rot
avT
wuf
diff --git a/code/__HELPERS/_lists.dm b/code/__HELPERS/_lists.dm
index 719735392d..0171057286 100644
--- a/code/__HELPERS/_lists.dm
+++ b/code/__HELPERS/_lists.dm
@@ -681,3 +681,11 @@
continue
if(istype(D, path))
return TRUE
+
+/proc/safe_json_encode(list/L, default = "")
+ . = default
+ return json_encode(L)
+
+/proc/safe_json_decode(string, default = list())
+ . = default
+ return json_decode(string)
diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm
index 6dcb5f2534..1d09057617 100644
--- a/code/__HELPERS/roundend.dm
+++ b/code/__HELPERS/roundend.dm
@@ -402,7 +402,7 @@
for (var/i in GLOB.ai_list)
var/mob/living/silicon/ai/aiPlayer = i
if(aiPlayer.mind)
- parts += "[aiPlayer.name] (Played by: [aiPlayer.mind.key])'s laws [aiPlayer.stat != DEAD ? "at the end of the round" : "when it was deactivated"] were:"
+ parts += "[aiPlayer.name][aiPlayer.mind.hide_ckey ? "" : " (Played by: [aiPlayer.mind.key])"]'s laws [aiPlayer.stat != DEAD ? "at the end of the round" : "when it was deactivated"] were:"
parts += aiPlayer.laws.get_law_list(include_zeroth=TRUE)
parts += "Total law changes: [aiPlayer.law_change_counter]"
@@ -413,14 +413,14 @@
for(var/mob/living/silicon/robot/robo in aiPlayer.connected_robots)
borg_num--
if(robo.mind)
- robolist += "[robo.name] (Played by: [robo.mind.key])[robo.stat == DEAD ? " (Deactivated)" : ""][borg_num ?", ":""]
"
+ robolist += "[robo.name][robo.mind.hide_ckey ? "" : " (Played by: [robo.mind.key])"] [robo.stat == DEAD ? " (Deactivated)" : ""][borg_num ?", ":""]
"
parts += "[robolist]"
if(!borg_spacer)
borg_spacer = TRUE
for (var/mob/living/silicon/robot/robo in GLOB.silicon_mobs)
if (!robo.connected_ai && robo.mind)
- parts += "[borg_spacer?"
":""][robo.name] (Played by: [robo.mind.key]) [(robo.stat != DEAD)? "survived as an AI-less borg!" : "was unable to survive the rigors of being a cyborg without an AI."] Its laws were:"
+ parts += "[borg_spacer?"
":""][robo.name][robo.mind.hide_ckey ? "" : " (Played by: [robo.mind.key])"] [(robo.stat != DEAD)? "survived as an AI-less borg!" : "was unable to survive the rigors of being a cyborg without an AI."] Its laws were:"
if(robo) //How the hell do we lose robo between here and the world messages directly above this?
parts += robo.laws.get_law_list(include_zeroth=TRUE)
@@ -529,7 +529,7 @@
var/jobtext = ""
if(ply.assigned_role)
jobtext = " the [ply.assigned_role]"
- var/text = "[ply.key] was [ply.name][jobtext] and"
+ var/text = "[ply.hide_ckey ? "[ply.name][jobtext] " : "[ply.key] was [ply.name][jobtext] and "]"
if(ply.current)
if(ply.current.stat == DEAD)
text += " died"
diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm
index c4d105a3a6..bbbf99c9de 100644
--- a/code/__HELPERS/type2type.dm
+++ b/code/__HELPERS/type2type.dm
@@ -462,16 +462,14 @@
else
. = max(0, min(255, 138.5177312231 * log(temp - 10) - 305.0447927307))
-/proc/fusionpower2text(power) //used when displaying fusion power on analyzers
- switch(power)
- if(0 to 5)
- return "low"
- if(5 to 20)
- return "mid"
- if(20 to 50)
- return "high"
- if(50 to INFINITY)
- return "super"
+/proc/instability2text(instability) //used when displaying fusion power on analyzers
+ switch(instability)
+ if(0 to 2)
+ return "stable, meaning that its heat will always increase."
+ if(2 to 3)
+ return "metastable, meaning that its heat will trend upwards."
+ if (3 to INFINITY)
+ return "unstable, meaning that its heat will trend downwards."
/proc/color2hex(color) //web colors
if(!color)
diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm
index 865f405442..14a1924e76 100644
--- a/code/_globalvars/lists/maintenance_loot.dm
+++ b/code/_globalvars/lists/maintenance_loot.dm
@@ -107,13 +107,8 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
/obj/item/toy/eightball = 1,
/obj/item/reagent_containers/pill/floorpill = 1,
/obj/item/reagent_containers/food/snacks/cannedpeaches/maint = 2,
- /obj/item/storage/daki = 3, //VERY IMPORTANT CIT CHANGE - adds bodypillows to maint
- /obj/item/storage/pill_bottle/penis_enlargement = 2,
- /obj/item/storage/pill_bottle/breast_enlargement = 2,
/obj/item/clothing/shoes/wheelys = 1,
/obj/item/clothing/shoes/kindleKicks = 1,
- /obj/item/autosurgeon/penis = 1,
- /obj/item/autosurgeon/testicles = 1,
/obj/item/storage/box/marshmallow = 2,
/obj/item/clothing/gloves/tackler/offbrand = 1,
/obj/item/stack/sticky_tape = 1,
diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm
index fee70ee3d5..706a5ed955 100644
--- a/code/_globalvars/lists/objects.dm
+++ b/code/_globalvars/lists/objects.dm
@@ -13,6 +13,7 @@ GLOBAL_LIST_EMPTY(deliverybeacontags) //list of all tags associated with d
GLOBAL_LIST_EMPTY(nuke_list)
GLOBAL_LIST_EMPTY(alarmdisplay) //list of all machines or programs that can display station alerts
GLOBAL_LIST_EMPTY(singularities) //list of all singularities on the station (actually technically all engines)
+GLOBAL_LIST_EMPTY(grounding_rods) //list of all grounding rods on the station
GLOBAL_LIST(chemical_reactions_list) //list of all /datum/chemical_reaction datums. Used during chemical reactions
GLOBAL_LIST(chemical_reagents_list) //list of all /datum/reagent datums indexed by reagent id. Used by chemistry stuff
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index cb99fdc5a3..0731cf8bf4 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -41,6 +41,8 @@
var/special_role
var/list/restricted_roles = list()
+ var/hide_ckey = FALSE //hide ckey from round-end report
+
var/list/spell_list = list() // Wizard mode & "Give Spell" badmin button.
var/linglink
@@ -69,6 +71,7 @@
///What character we spawned in as- either at roundstart or latejoin, so we know for persistent scars if we ended as the same person or not
var/mob/original_character
+
/datum/mind/New(var/key)
skill_holder = new(src)
src.key = key
@@ -137,6 +140,8 @@
if(L.client?.prefs && L.client.prefs.auto_ooc && L.client.prefs.chat_toggles & CHAT_OOC)
DISABLE_BITFIELD(L.client.prefs.chat_toggles,CHAT_OOC)
+ hide_ckey = current.client?.prefs?.hide_ckey
+
SEND_SIGNAL(src, COMSIG_MIND_TRANSFER, new_character, old_character)
SEND_SIGNAL(new_character, COMSIG_MOB_ON_NEW_MIND)
@@ -780,6 +785,7 @@
if(!mind.name)
mind.name = real_name
mind.current = src
+ mind.hide_ckey = client?.prefs?.hide_ckey
/mob/living/carbon/mind_initialize()
..()
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_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
index 6a7671cd5b..b29584aa58 100644
--- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
+++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
@@ -538,7 +538,7 @@
name = "Slaughter Demon"
config_tag = "slaughter_demon"
antag_flag = ROLE_ALIEN
- enemy_roles = list("Security Officer","Shaft Miner","Head of Security","Captain","Janitor","AI","Cyborg")
+ enemy_roles = list("Security Officer","Shaft Miner","Head of Security","Captain","Janitor","AI","Cyborg","Bartender")
required_enemies = list(3,2,2,2,2,1,1,1,1,0)
required_candidates = 1
weight = 4
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/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index 228c2e1f52..d88a9c9072 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -74,12 +74,6 @@
/obj/machinery/door/firedoor/Bumped(atom/movable/AM)
if(panel_open || operating || welded)
return
- if(ismob(AM))
- var/mob/user = AM
- if(density && !welded && !operating && !(stat & NOPOWER) && (!density || allow_hand_open(user)))
- add_fingerprint(user)
- open()
- return TRUE
return FALSE
/obj/machinery/door/firedoor/power_change()
@@ -90,14 +84,6 @@
stat |= NOPOWER
/obj/machinery/door/firedoor/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
- if(!welded && !operating && !(stat & NOPOWER) && (!density || allow_hand_open(user)))
- add_fingerprint(user)
- if(density)
- emergency_close_timer = world.time + 30 // prevent it from instaclosing again if in space
- open()
- else
- close()
- return TRUE
if(operating || !density)
return
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/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm
index 41270bb09e..871fe838d7 100644
--- a/code/game/objects/effects/anomalies.dm
+++ b/code/game/objects/effects/anomalies.dm
@@ -285,7 +285,7 @@
S.rabid = TRUE
S.amount_grown = SLIME_EVOLUTION_THRESHOLD
S.Evolve()
- offer_control(S)
+ offer_control(S,POLL_IGNORE_SENTIENCE_POTION)
/////////////////////
diff --git a/code/game/objects/items/broom.dm b/code/game/objects/items/broom.dm
index 225644109f..4cbd75ed94 100644
--- a/code/game/objects/items/broom.dm
+++ b/code/game/objects/items/broom.dm
@@ -28,39 +28,37 @@
/// triggered on wield of two handed item
/obj/item/broom/proc/on_wield(obj/item/source, mob/user)
to_chat(user, "You brace the [src] against the ground in a firm sweeping stance.")
- RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/sweep)
+ RegisterSignal(user, COMSIG_MOVABLE_PRE_MOVE, .proc/sweep)
/// triggered on unwield of two handed item
/obj/item/broom/proc/on_unwield(obj/item/source, mob/user)
- UnregisterSignal(user, COMSIG_MOVABLE_MOVED)
+ UnregisterSignal(user, COMSIG_MOVABLE_PRE_MOVE)
/obj/item/broom/afterattack(atom/A, mob/user, proximity)
. = ..()
if(!proximity)
return
- sweep(user, A, FALSE)
+ sweep(user, A)
-/obj/item/broom/proc/sweep(mob/user, atom/A, moving = TRUE)
- var/turf/target
- if (!moving)
- if (isturf(A))
- target = A
- else
- target = A.loc
- else
- target = user.loc
- if (!isturf(target))
+/obj/item/broom/proc/sweep(datum/source, atom/newLoc)
+ if(!ismob(source) || !isturf(newLoc) || (get_dist(source, newLoc) > 1))
return
- if (locate(/obj/structure/table) in target.contents)
+ var/turf/target = newLoc
+ var/atom/movable/AM
+ var/sweep_dir = get_dir(source, target)
+ if(!sweep_dir)
return
+ for(var/i in target.contents)
+ AM = i
+ if(AM.density) // eh good enough heuristic check
+ return
var/i = 0
for(var/obj/item/garbage in target.contents)
if(!garbage.anchored)
- garbage.Move(get_step(target, user.dir), user.dir)
- i++
- if(i >= 20)
+ step(garbage, sweep_dir)
+ if(++i > 20)
break
- if(i >= 1)
+ if(i)
playsound(loc, 'sound/weapons/thudswoosh.ogg', 30, TRUE, -1)
/obj/item/broom/proc/janicart_insert(mob/user, obj/structure/janitorialcart/J) //bless you whoever fixes this copypasta
diff --git a/code/game/objects/items/devices/portable_chem_mixer.dm b/code/game/objects/items/devices/portable_chem_mixer.dm
new file mode 100644
index 0000000000..25ecef5955
--- /dev/null
+++ b/code/game/objects/items/devices/portable_chem_mixer.dm
@@ -0,0 +1,207 @@
+/obj/item/storage/portable_chem_mixer
+ name = "Portable Chemical Mixer"
+ desc = "A portable device that dispenses and mixes chemicals. All necessary reagents need to be supplied with beakers. A label indicates that a screwdriver is required to open it for refills. This device can be worn on a belt. The letters 'S&T' are imprinted on the side."
+ icon = 'icons/obj/chemical.dmi'
+ icon_state = "portablechemicalmixer_open"
+ w_class = WEIGHT_CLASS_HUGE
+ slot_flags = ITEM_SLOT_BELT
+ custom_price = 2000
+ custom_premium_price = 2000
+
+ var/obj/item/reagent_containers/beaker = null ///Creating an empty slot for a beaker that can be added to dispense into
+ var/amount = 30 ///The amount of reagent that is to be dispensed currently
+
+ var/list/dispensable_reagents = list() ///List in which all currently dispensable reagents go
+
+/obj/item/storage/portable_chem_mixer/ComponentInitialize()
+ . = ..()
+ var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.max_combined_w_class = 200
+ STR.max_items = 50
+ STR.insert_preposition = "in"
+ STR.can_hold = typecacheof(list(
+ /obj/item/reagent_containers/glass/beaker,
+ ))
+
+/obj/item/storage/portable_chem_mixer/Destroy()
+ QDEL_NULL(beaker)
+ return ..()
+
+/obj/item/storage/portable_chem_mixer/ex_act(severity, target)
+ if(severity < 3)
+ ..()
+
+/obj/item/storage/portable_chem_mixer/attackby(obj/item/I, mob/user, params)
+ var/locked = SEND_SIGNAL(src, COMSIG_IS_STORAGE_LOCKED)
+ if (I.tool_behaviour == TOOL_SCREWDRIVER)
+ SEND_SIGNAL(src, COMSIG_TRY_STORAGE_SET_LOCKSTATE, !locked)
+ if (!locked)
+ update_contents()
+ if (locked)
+ replace_beaker(user)
+ update_icon()
+ I.play_tool_sound(src, 50)
+ return
+
+ else if (istype(I, /obj/item/reagent_containers) && !(I.item_flags & ABSTRACT) && I.is_open_container() && locked)
+ var/obj/item/reagent_containers/B = I
+ . = TRUE //no afterattack
+ if(!user.transferItemToLoc(B, src))
+ return
+ replace_beaker(user, B)
+ update_icon()
+ updateUsrDialog()
+ return
+
+ return ..()
+
+/**
+ * Updates the contents of the portable chemical mixer
+ *
+ * A list of dispensable reagents is created by iterating through each source beaker in the portable chemical beaker and reading its contents
+ */
+/obj/item/storage/portable_chem_mixer/proc/update_contents()
+ dispensable_reagents.Cut()
+
+ for (var/obj/item/reagent_containers/glass/beaker/B in contents)
+ var/key = B.reagents.get_master_reagent_id()
+ if (!(key in dispensable_reagents))
+ dispensable_reagents[key] = list()
+ dispensable_reagents[key]["reagents"] = list()
+ dispensable_reagents[key]["reagents"] += B.reagents
+
+ return
+
+/obj/item/storage/portable_chem_mixer/update_icon_state()
+ var/locked = SEND_SIGNAL(src, COMSIG_IS_STORAGE_LOCKED)
+ if (!locked)
+ icon_state = "portablechemicalmixer_open"
+ else if (beaker)
+ icon_state = "portablechemicalmixer_full"
+ else
+ icon_state = "portablechemicalmixer_empty"
+
+
+/obj/item/storage/portable_chem_mixer/AltClick(mob/living/user)
+ var/locked = SEND_SIGNAL(src, COMSIG_IS_STORAGE_LOCKED)
+ if (!locked)
+ return ..()
+ if(!can_interact(user) || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+ return
+ replace_beaker(user)
+ update_icon()
+
+/**
+ * Replaces the beaker of the portable chemical mixer with another beaker, or simply adds the new beaker if none is in currently
+ *
+ * Checks if a valid user and a valid new beaker exist and attempts to replace the current beaker in the portable chemical mixer with the one in hand. Simply places the new beaker in if no beaker is currently loaded
+ * Arguments:
+ * * mob/living/user - The user who is trying to exchange beakers
+ * * obj/item/reagent_containers/new_beaker - The new beaker that the user wants to put into the device
+ */
+/obj/item/storage/portable_chem_mixer/proc/replace_beaker(mob/living/user, obj/item/reagent_containers/new_beaker)
+ if(!user)
+ return FALSE
+ if(beaker)
+ user.put_in_hands(beaker)
+ beaker = null
+ if(new_beaker)
+ beaker = new_beaker
+ return TRUE
+
+/obj/item/storage/portable_chem_mixer/attack_hand(mob/user)
+ if (loc != user)
+ return ..()
+ if(SEND_SIGNAL(src, COMSIG_IS_STORAGE_LOCKED))
+ ui_interact(user)
+ return
+
+/obj/item/storage/portable_chem_mixer/attack_self(mob/user)
+ if(loc == user)
+ var/locked = SEND_SIGNAL(src, COMSIG_IS_STORAGE_LOCKED)
+ if (locked)
+ ui_interact(user)
+ return
+ else
+ to_chat(user, "The portable chemical mixer is currently open and its contents can be accessed.")
+ return
+ return
+
+/obj/item/storage/portable_chem_mixer/MouseDrop(obj/over_object)
+ . = ..()
+ if(ismob(loc))
+ var/mob/M = loc
+ if(!M.incapacitated() && istype(over_object, /obj/screen/inventory/hand))
+ var/obj/screen/inventory/hand/H = over_object
+ M.putItemFromInventoryInHandIfPossible(src, H.held_index)
+
+/obj/item/storage/portable_chem_mixer/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "PortableChemMixer", name)
+ if(user.hallucinating())
+ // to not ruin the immersion by constantly changing the fake chemicals
+ ui.set_autoupdate(FALSE)
+ ui.open()
+
+/obj/item/storage/portable_chem_mixer/ui_data(mob/user)
+ var/list/data = list()
+ data["amount"] = amount
+ data["isBeakerLoaded"] = beaker ? 1 : 0
+ data["beakerCurrentVolume"] = beaker ? beaker.reagents.total_volume : null
+ data["beakerMaxVolume"] = beaker ? beaker.volume : null
+ data["beakerTransferAmounts"] = beaker ? beaker.possible_transfer_amounts : null
+ var/chemicals[0]
+ var/is_hallucinating = user.hallucinating()
+ if(user.hallucinating())
+ is_hallucinating = TRUE
+ for(var/re in dispensable_reagents)
+ var/value = dispensable_reagents[re]
+ var/datum/reagent/temp = GLOB.chemical_reagents_list[re]
+ if(temp)
+ var/chemname = temp.name
+ var/total_volume = 0
+ for (var/datum/reagents/rs in value["reagents"])
+ total_volume += rs.total_volume
+ if(is_hallucinating && prob(5))
+ chemname = "[pick_list_replacements("hallucination.json", "chemicals")]"
+ chemicals.Add(list(list("title" = chemname, "id" = ckey(temp.name), "volume" = total_volume )))
+ data["chemicals"] = chemicals
+ var/beakerContents[0]
+ if(beaker)
+ for(var/datum/reagent/R in beaker.reagents.reagent_list)
+ beakerContents.Add(list(list("name" = R.name, "id" = ckey(R.name), "volume" = R.volume))) // list in a list because Byond merges the first list...
+ data["beakerContents"] = beakerContents
+ return data
+
+/obj/item/storage/portable_chem_mixer/ui_act(action, params)
+ if(..())
+ return
+ switch(action)
+ if("amount")
+ var/target = text2num(params["target"])
+ amount = target
+ . = TRUE
+ if("dispense")
+ var/reagent_name = params["reagent"]
+ var/datum/reagent/reagent = GLOB.name2reagent[reagent_name]
+ var/entry = dispensable_reagents[reagent]
+ if(beaker)
+ var/datum/reagents/R = beaker.reagents
+ var/actual = min(amount, 1000, R.maximum_volume - R.total_volume)
+ // todo: add check if we have enough reagent left
+ for (var/datum/reagents/source in entry["reagents"])
+ var/to_transfer = min(source.total_volume, actual)
+ source.trans_to(beaker, to_transfer)
+ actual -= to_transfer
+ if (actual <= 0)
+ break
+ . = TRUE
+ if("remove")
+ var/amount = text2num(params["amount"])
+ beaker.reagents.remove_all(amount)
+ . = TRUE
+ if("eject")
+ replace_beaker(usr)
+ update_icon()
+ . = TRUE
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index fae2833c8a..8fdeaa0f9f 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -729,10 +729,10 @@ GENETICS SCANNER
to_chat(user, "[target] is empty!")
if(cached_scan_results && cached_scan_results["fusion"]) //notify the user if a fusion reaction was detected
- var/fusion_power = round(cached_scan_results["fusion"], 0.01)
- var/tier = fusionpower2text(fusion_power)
+ var/instability = round(cached_scan_results["fusion"], 0.01)
+ var/tier = instability2text(instability)
to_chat(user, "Large amounts of free neutrons detected in the air indicate that a fusion reaction took place.")
- to_chat(user, "Power of the last fusion reaction: [fusion_power]\n This power indicates it was a [tier]-tier fusion reaction.")
+ to_chat(user, "Instability of the last fusion reaction: [instability]\n This indicates it was [tier].")
return
/obj/item/analyzer/proc/scan_turf(mob/user, turf/location)
@@ -783,10 +783,10 @@ GENETICS SCANNER
to_chat(user, "Temperature: [round(environment.return_temperature()-T0C, 0.01)] °C ([round(environment.return_temperature(), 0.01)] K)")
if(cached_scan_results && cached_scan_results["fusion"]) //notify the user if a fusion reaction was detected
- var/fusion_power = round(cached_scan_results["fusion"], 0.01)
- var/tier = fusionpower2text(fusion_power)
+ var/instability = round(cached_scan_results["fusion"], 0.01)
+ var/tier = instability2text(instability)
to_chat(user, "Large amounts of free neutrons detected in the air indicate that a fusion reaction took place.")
- to_chat(user, "Power of the last fusion reaction: [fusion_power]\n This power indicates it was a [tier]-tier fusion reaction.")
+ to_chat(user, "Instability of the last fusion reaction: [instability]\n This indicates it was [tier].")
/obj/item/analyzer/ranged
desc = "A hand-held scanner which uses advanced spectroscopy and infrared readings to analyze gases as a distance. Alt-Click to use the built in barometer function."
@@ -992,4 +992,4 @@ GENETICS SCANNER
#undef SCANMODE_CHEMICAL
#undef SCANMODE_WOUND
#undef SCANNER_CONDENSED
-#undef SCANNER_VERBOSE
\ No newline at end of file
+#undef SCANNER_VERBOSE
diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm
index 01d2924a90..52ff0f740e 100644
--- a/code/game/objects/items/melee/misc.dm
+++ b/code/game/objects/items/melee/misc.dm
@@ -234,6 +234,9 @@
/obj/item/melee/rapier/attack(mob/living/target, mob/living/user)
. = ..()
if(iscarbon(target))
+ if(HAS_TRAIT(user, TRAIT_PACIFISM))
+ visible_message("[user] gently taps [target] with [src].",null,null,COMBAT_MESSAGE_RANGE)
+ log_combat(user, target, "slept", src)
var/mob/living/carbon/H = target
H.Dizzy(10)
H.adjustStaminaLoss(30)
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index 99b302e9ce..3abee4db33 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -304,18 +304,20 @@
/obj/proc/reskin_obj(mob/M)
if(!LAZYLEN(unique_reskin))
return
- var/dat = "Reskin options for [name]:\n"
- for(var/V in unique_reskin)
- var/output = icon2html(src, M, unique_reskin[V])
- dat += "[V]: [output]\n"
- to_chat(M, dat)
-
- var/choice = input(M, always_reskinnable ? "Choose the a reskin for [src]" : "Warning, you can only reskin [src] once!","Reskin Object") as null|anything in unique_reskin
- if(QDELETED(src) || !choice || (current_skin && !always_reskinnable) || M.incapacitated() || !in_range(M,src) || !unique_reskin[choice] || unique_reskin[choice] == current_skin)
- return
- current_skin = choice
+ var/list/skins = list()
+ for(var/S in unique_reskin)
+ skins[S] = image(icon = icon, icon_state = unique_reskin[S])
+ var/choice = show_radial_menu(M, src, skins, custom_check = CALLBACK(src, .proc/check_skinnable, M), radius = 40, require_near = TRUE)
+ if(!choice)
+ return FALSE
icon_state = unique_reskin[choice]
- to_chat(M, "[src] is now skinned as '[choice]'.")
+ current_skin = choice
+ return
+
+/obj/proc/check_skinnable(/mob/M)
+ if(current_skin || !always_reskinnable)
+ return FALSE
+ return TRUE
/obj/update_overlays()
. = ..()
diff --git a/code/game/world.dm b/code/game/world.dm
index a342200b3d..2d174c86e5 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -20,8 +20,6 @@ GLOBAL_LIST(topic_status_cache)
log_world("World loaded at [TIME_STAMP("hh:mm:ss", FALSE)]!")
- SetupExternalRSC()
-
GLOB.config_error_log = GLOB.world_manifest_log = GLOB.world_pda_log = GLOB.world_job_debug_log = GLOB.sql_error_log = GLOB.world_href_log = GLOB.world_runtime_log = GLOB.world_attack_log = GLOB.world_game_log = "data/logs/config_error.[GUID()].log" //temporary file used to record errors with loading config, moved to log directory once logging is set bl
make_datum_references_lists() //initialises global lists for referencing frequently used datums (so that we only ever do it once)
@@ -87,17 +85,6 @@ GLOBAL_LIST(topic_status_cache)
#endif
SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, /proc/addtimer, cb, 10 SECONDS))
-/world/proc/SetupExternalRSC()
-#if (PRELOAD_RSC == 0)
- GLOB.external_rsc_urls = world.file2list("[global.config.directory]/external_rsc_urls.txt","\n")
- var/i=1
- while(i<=GLOB.external_rsc_urls.len)
- if(GLOB.external_rsc_urls[i])
- i++
- else
- GLOB.external_rsc_urls.Cut(i,i+1)
-#endif
-
/world/proc/SetupLogs()
var/override_dir = params[OVERRIDE_LOG_DIRECTORY_PARAMETER]
if(!override_dir)
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/code/modules/antagonists/slaughter/slaughter.dm b/code/modules/antagonists/slaughter/slaughter.dm
index d1db363b04..a26d081f08 100644
--- a/code/modules/antagonists/slaughter/slaughter.dm
+++ b/code/modules/antagonists/slaughter/slaughter.dm
@@ -66,6 +66,10 @@
var/wound_bonus_per_hit = 5
// How much our wound_bonus hitstreak bonus caps at (peak demonry)
var/wound_bonus_hitstreak_max = 12
+ // Keep the people we eat
+ var/list/consumed_mobs = list()
+ //buffs only happen when hearts are eaten, so this needs to be kept track separately
+ var/consumed_buff = 0
/mob/living/simple_animal/slaughter/Initialize()
..()
@@ -112,8 +116,44 @@
/mob/living/simple_animal/slaughter/phasein()
. = ..()
add_movespeed_modifier(/datum/movespeed_modifier/slaughter)
- addtimer(CALLBACK(src, .proc/remove_movespeed_modifier, /datum/movespeed_modifier/slaughter), 6 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE)
+ var/slowdown_time = 6 SECONDS + (0.5 * consumed_buff)
+ addtimer(CALLBACK(src, .proc/remove_movespeed_modifier, /datum/movespeed_modifier/slaughter), slowdown_time, TIMER_UNIQUE | TIMER_OVERRIDE)
+/mob/living/simple_animal/slaughter/Destroy()
+ release_victims()
+ . = ..()
+
+/mob/living/simple_animal/slaughter/proc/release_victims()
+ if(!consumed_mobs)
+ return
+
+ for(var/mob/living/M in consumed_mobs)
+ if(!M)
+ continue
+ var/turf/T = find_safe_turf()
+ if(!T)
+ T = get_turf(src)
+ M.forceMove(T)
+
+/mob/living/simple_animal/slaughter/proc/refresh_consumed_buff()
+ melee_damage_lower = 22.5 + (0.5 * consumed_buff)
+ melee_damage_upper = 22.5 + (1 * consumed_buff)
+
+/mob/living/simple_animal/slaughter/bloodcrawl_swallow(var/mob/living/victim)
+ if(consumed_mobs)
+ // Keep their corpse so rescue is possible
+ consumed_mobs += victim
+ victim.reagents?.add_reagent(/datum/reagent/preservahyde,3) // make it so that they don't decay in there
+ var/obj/item/organ/heart/heart = victim.getorganslot(ORGAN_SLOT_HEART)
+ if(heart)
+ qdel(heart)
+ consumed_buff++
+ refresh_consumed_buff()
+ else
+ // Be safe and just eject the corpse
+ victim.forceMove(get_turf(victim))
+ victim.exit_blood_effect()
+ victim.visible_message("[victim] falls out of the air, covered in blood, looking highly confused. And dead.")
//The loot from killing a slaughter demon - can be consumed to allow the user to blood crawl
/obj/item/organ/heart/demon
@@ -178,9 +218,6 @@
prison of hugs."
loot = list(/mob/living/simple_animal/pet/cat/kitten{name = "Laughter"})
- // Keep the people we hug!
- var/list/consumed_mobs = list()
-
playstyle_string = "You are a laughter \
demon, a wonderful creature from another realm. You have a single \
desire: To hug and tickle.
\
@@ -195,10 +232,6 @@
released and fully healed, because in the end it's just a jape, \
sibling!"
-/mob/living/simple_animal/slaughter/laughter/Destroy()
- release_friends()
- . = ..()
-
/mob/living/simple_animal/slaughter/laughter/ex_act(severity)
switch(severity)
if(1)
@@ -208,7 +241,22 @@
if(3)
adjustBruteLoss(30)
-/mob/living/simple_animal/slaughter/laughter/proc/release_friends()
+/mob/living/simple_animal/slaughter/laughter/refresh_consumed_buff()
+ melee_damage_lower -= 0.5 // JAPES
+ melee_damage_upper += 1
+
+/mob/living/simple_animal/slaughter/laughter/bloodcrawl_swallow(var/mob/living/victim)
+ if(consumed_mobs)
+ // Keep their corpse so rescue is possible
+ consumed_mobs += victim
+ refresh_consumed_buff()
+ else
+ // Be safe and just eject the corpse
+ victim.forceMove(get_turf(victim))
+ victim.exit_blood_effect()
+ victim.visible_message("[victim] falls out of the air, covered in blood, looking highly confused. And dead.")
+
+/mob/living/simple_animal/slaughter/laughter/release_victims()
if(!consumed_mobs)
return
@@ -223,13 +271,3 @@
M.grab_ghost(force = TRUE)
playsound(T, feast_sound, 50, 1, -1)
to_chat(M, "You leave [src]'s warm embrace, and feel ready to take on the world.")
-
-/mob/living/simple_animal/slaughter/laughter/bloodcrawl_swallow(var/mob/living/victim)
- if(consumed_mobs)
- // Keep their corpse so rescue is possible
- consumed_mobs += victim
- else
- // Be safe and just eject the corpse
- victim.forceMove(get_turf(victim))
- victim.exit_blood_effect()
- victim.visible_message("[victim] falls out of the air, covered in blood, looking highly confused. And dead.")
diff --git a/code/modules/antagonists/traitor/classes/freeform.dm b/code/modules/antagonists/traitor/classes/freeform.dm
index 998373a77c..1ca385ef19 100644
--- a/code/modules/antagonists/traitor/classes/freeform.dm
+++ b/code/modules/antagonists/traitor/classes/freeform.dm
@@ -1,7 +1,7 @@
/datum/traitor_class/human/freeform
name = "Waffle Co Agent"
employer = "Waffle Company"
- weight = 16
+ weight = 0 // should not spawn in unless admins bus something in the traitor panel with setting traitor classes
chaos = 0
/datum/traitor_class/human/freeform/forge_objectives(datum/antagonist/traitor/T)
diff --git a/code/modules/antagonists/traitor/classes/subterfuge.dm b/code/modules/antagonists/traitor/classes/subterfuge.dm
index ae43f11fe7..ad049f3264 100644
--- a/code/modules/antagonists/traitor/classes/subterfuge.dm
+++ b/code/modules/antagonists/traitor/classes/subterfuge.dm
@@ -1,7 +1,7 @@
/datum/traitor_class/human/subterfuge
name = "MI13 Operative"
employer = "MI13"
- weight = 20
+ weight = 36
chaos = -5
/datum/traitor_class/human/subterfuge/forge_single_objective(datum/antagonist/traitor/T)
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index b077a0c8db..51e027522c 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -163,6 +163,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
)
var/custom_speech_verb = "default" //if your say_mod is to be something other than your races
var/custom_tongue = "default" //if your tongue is to be something other than your races
+ var/chosen_limb_id //body sprite selected to load for the users limbs, null means default, is sanitized when loaded
/// Security record note section
var/security_records
@@ -246,7 +247,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
/// Which of the 5 persistent scar slots we randomly roll to load for this round, if enabled. Actually rolled in [/datum/preferences/proc/load_character(slot)]
var/scars_index = 1
- var/chosen_limb_id //body sprite selected to load for the users limbs, null means default, is sanitized when loaded
+ var/hide_ckey = FALSE //pref for hiding if your ckey shows round-end or not
/datum/preferences/New(client/C)
parent = C
@@ -372,6 +373,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "[medical_records]"
else
dat += "[TextPreview(medical_records)]...
"
+ dat += "
Hide ckey: [hide_ckey ? "Enabled" : "Disabled"]
"
dat += ""
//Character Appearance
@@ -1448,6 +1450,11 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(!isnull(msg))
features["ooc_notes"] = msg
+ if("hide_ckey")
+ hide_ckey = !hide_ckey
+ if(user)
+ user.mind?.hide_ckey = hide_ckey
+
if("hair")
var/new_hair = input(user, "Choose your character's hair colour:", "Character Preference","#"+hair_color) as color|null
if(new_hair)
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 55a594cf21..8591d77e50 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -515,7 +515,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["scars4"] >> scars_list["4"]
S["scars5"] >> scars_list["5"]
S["chosen_limb_id"] >> chosen_limb_id
-
+ S["hide_ckey"] >> hide_ckey //saved per-character
//Custom names
for(var/custom_name_id in GLOB.preferences_custom_names)
@@ -859,6 +859,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
WRITE_FILE(S["joblessrole"] , joblessrole)
//Write prefs
WRITE_FILE(S["job_preferences"] , job_preferences)
+ WRITE_FILE(S["hide_ckey"] , hide_ckey)
//Quirks
WRITE_FILE(S["all_quirks"] , all_quirks)
@@ -874,6 +875,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
WRITE_FILE(S["scars4"] , scars_list["4"])
WRITE_FILE(S["scars5"] , scars_list["5"])
+
//gear loadout
if(chosen_gear.len)
var/text_to_save = chosen_gear.Join("|")
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index cf7dbc7462..6732f1c86c 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -80,7 +80,9 @@
item_state = "hostrench"
flags_inv = 0
strip_delay = 80
- unique_reskin = list("Coat" = "hostrench", "Cloak" = "trenchcloak")
+ unique_reskin = list("Coat" = "hostrench",
+ "Cloak" = "trenchcloak"
+ )
/obj/item/clothing/suit/armor/vest/warden
name = "warden's jacket"
diff --git a/code/modules/events/brain_trauma.dm b/code/modules/events/brain_trauma.dm
index 3e8182a827..0a07e2a693 100644
--- a/code/modules/events/brain_trauma.dm
+++ b/code/modules/events/brain_trauma.dm
@@ -14,7 +14,8 @@
continue
if(!H.getorgan(/obj/item/organ/brain)) // If only I had a brain
continue
-
+ if(HAS_TRAIT(H,TRAIT_EXEMPT_HEALTH_EVENTS))
+ continue
traumatize(H)
break
diff --git a/code/modules/events/fake_virus.dm b/code/modules/events/fake_virus.dm
index 77520198e8..cebf1ed14b 100644
--- a/code/modules/events/fake_virus.dm
+++ b/code/modules/events/fake_virus.dm
@@ -6,7 +6,7 @@
/datum/round_event/fake_virus/start()
var/list/fake_virus_victims = list()
for(var/mob/living/carbon/human/H in shuffle(GLOB.player_list))
- if(!H.client || H.stat == DEAD || H.InCritical())
+ if(!H.client || H.stat == DEAD || H.InCritical() || HAS_TRAIT(H,TRAIT_EXEMPT_HEALTH_EVENTS))
continue
fake_virus_victims += H
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index e03de83e02..819b005b43 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -78,10 +78,7 @@
if(28)
new /obj/item/clothing/neck/necklace/memento_mori(src)
if(29)
- if(prob(50))
- new /obj/item/malf_upgrade(src)
- else
- new /obj/item/disk/tech_disk/illegal(src)
+ new /obj/item/disk/tech_disk/illegal(src)
//KA modkit design discs
/obj/item/disk/design_disk/modkit_disc
diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm
index 1bdd988694..b74dd6fa20 100644
--- a/code/modules/mob/living/simple_animal/slime/slime.dm
+++ b/code/modules/mob/living/simple_animal/slime/slime.dm
@@ -106,6 +106,7 @@
set_colour(new_colour)
. = ..()
AddComponent(/datum/component/footstep, FOOTSTEP_MOB_SLIME, 7.5)
+ set_nutrition(rand(650, 800))
/mob/living/simple_animal/slime/Destroy()
for (var/A in actions)
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index 31bfb5621f..0d4afd0915 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -50,6 +50,8 @@
var/datum/callback/CB = foo
CB.Invoke()
+ mind?.hide_ckey = client?.prefs?.hide_ckey
+
log_message("Client [key_name(src)] has taken ownership of mob [src]([src.type])", LOG_OWNERSHIP)
SEND_SIGNAL(src, COMSIG_MOB_CLIENT_LOGIN, client)
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 52b755d926..aa6635f73d 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -431,7 +431,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
/mob/living/getImplant(type)
return locate(type) in implants
-/proc/offer_control(mob/M)
+/proc/offer_control(mob/M,ignore_category=null)
to_chat(M, "Control of your mob has been offered to dead players.")
if(usr)
log_admin("[key_name(usr)] has offered control of ([key_name(M)]) to ghosts.")
@@ -445,7 +445,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
var/datum/antagonist/A = M.mind.has_antag_datum(/datum/antagonist/)
if(A)
poll_message = "[poll_message] Status:[A.name]."
- var/list/mob/candidates = pollCandidatesForMob(poll_message, ROLE_PAI, null, FALSE, 100, M)
+ var/list/mob/candidates = pollCandidatesForMob(poll_message, ROLE_PAI, null, FALSE, 100, M, ignore_category)
if(LAZYLEN(candidates))
var/mob/C = pick(candidates)
diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm
index eb80548441..be24ea0fef 100644
--- a/code/modules/power/tesla/coil.dm
+++ b/code/modules/power/tesla/coil.dm
@@ -160,6 +160,14 @@
buckle_lying = FALSE
buckle_requires_restraints = TRUE
+/obj/machinery/power/grounding_rod/Initialize()
+ GLOB.grounding_rods |= src
+ return ..()
+
+/obj/machinery/power/grounding_rod/Destroy()
+ GLOB.grounding_rods.Remove(src)
+ return ..()
+
/obj/machinery/power/grounding_rod/default_unfasten_wrench(mob/user, obj/item/I, time = 20)
. = ..()
if(. == SUCCESSFUL_UNFASTEN)
diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm
index 06e5d27f6d..89c5aa3316 100644
--- a/code/modules/power/tesla/energy_ball.dm
+++ b/code/modules/power/tesla/energy_ball.dm
@@ -31,6 +31,7 @@
var/produced_power
var/energy_to_raise = 32
var/energy_to_lower = -20
+ var/obj/machinery/power/grounding_rod/rodtarget
/obj/singularity/energy_ball/Initialize(mapload, starting_energy = 50, is_miniball = FALSE)
miniball = is_miniball
@@ -60,11 +61,12 @@
return //don't annnounce miniballs
..()
-
/obj/singularity/energy_ball/process()
if(!orbiting)
handle_energy()
+ determine_containment()
+
move_the_basket_ball(4 + orbiting_balls.len * 1.5)
playsound(src.loc, 'sound/magic/lightningbolt.ogg', 100, TRUE, extrarange = 30)
@@ -87,12 +89,19 @@
if(orbiting_balls.len)
. += "There are [orbiting_balls.len] mini-balls orbiting it."
-
/obj/singularity/energy_ball/proc/move_the_basket_ball(var/move_amount)
//we face the last thing we zapped, so this lets us favor that direction a bit
var/move_bias = pick(GLOB.alldirs)
+ var/move_dir
+ for(var/rod in GLOB.grounding_rods) // grounding rods pull the tesla ball, picks the nearest one
+ if(!rodtarget || get_dist(src,rod)= energy_to_raise)
@@ -121,6 +144,10 @@
else if(orbiting_balls.len)
dissipate() //sing code has a much better system.
+ if(energy<=0)
+ investigate_log("fizzled.", INVESTIGATE_SINGULO)
+ qdel(src)
+
/obj/singularity/energy_ball/proc/new_mini_ball()
if(!loc)
return
@@ -134,7 +161,6 @@
EB.orbit(src, orbitsize, pick(FALSE, TRUE), rand(10, 25), pick(3, 4, 5, 6, 36))
-
/obj/singularity/energy_ball/Bump(atom/A)
dust_mobs(A)
@@ -166,7 +192,6 @@
if (!QDELETED(src))
qdel(src)
-
/obj/singularity/energy_ball/proc/dust_mobs(atom/A)
if(isliving(A))
var/mob/living/L = A
@@ -329,6 +354,12 @@
else
power = closest_atom.zap_act(power, zap_flags, shocked_targets)
+
+ var/obj/singularity/energy_ball/tesla = source
+ if(istype(tesla))
+ if(istype(closest_atom,/obj/machinery/power/grounding_rod) && tesla.energy>13 && !tesla.contained)
+ qdel(closest_atom) // each rod deletes two miniballs,
+ tesla.energy = round(tesla.energy/1.5625) // if there are no miniballs the rod stays and continues to pull the ball in
if(prob(20))//I know I know
tesla_zap(closest_atom, next_range, power * 0.5, zap_flags, shocked_targets)
tesla_zap(closest_atom, next_range, power * 0.5, zap_flags, shocked_targets)
diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
index e1433eb64e..3675efa283 100644
--- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
@@ -329,7 +329,7 @@
color = "#101000" // rgb: 16, 16, 0
nutriment_factor = 0
taste_description = "sweet red tea"
- glass_icon_state = "teaglass"
+ glass_icon_state = "tea_red"
glass_name = "glass of red tea"
glass_desc = "A piping hot tea that helps with the digestion of food."
@@ -340,6 +340,7 @@
M.drowsyness = max(0,M.drowsyness-1)
M.jitteriness = max(0,M.jitteriness-3)
M.adjust_bodytemperature(23 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL)
+ ..()
. = 1
/datum/reagent/consumable/tea/green
@@ -348,7 +349,7 @@
color = "#101000" // rgb: 16, 16, 0
nutriment_factor = 0
taste_description = "tart green tea"
- glass_icon_state = "teaglass"
+ glass_icon_state = "tea_green"
glass_name = "glass of tea"
glass_desc = "A calming glass of green tea to help get you through the day."
@@ -358,6 +359,7 @@
M.drowsyness = max(0,M.drowsyness-1)
M.jitteriness = max(0,M.jitteriness-3)
M.adjust_bodytemperature(15 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL)
+ ..()
. = 1
/datum/reagent/consumable/tea/forest
@@ -367,7 +369,7 @@
nutriment_factor = 0
quality = DRINK_NICE
taste_description = "sweet tea"
- glass_icon_state = "teaglass"
+ glass_icon_state = "tea_forest"
glass_name = "glass of forest tea"
glass_desc = "A lovely glass of tea and honey."
@@ -379,6 +381,7 @@
M.drowsyness = max(0,M.drowsyness-1)
M.jitteriness = max(0,M.jitteriness-3)
M.adjust_bodytemperature(15 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL)
+ ..()
. = 1
/datum/reagent/consumable/tea/mush
@@ -388,7 +391,7 @@
nutriment_factor = 0
quality = DRINK_NICE
taste_description = "fungal infections"
- glass_icon_state = "teaglass"
+ glass_icon_state = "tea_mush"
glass_name = "glass of mush tea"
glass_desc = "A cold merky brown tea."
@@ -398,6 +401,7 @@
M.Dizzy(10)
if(prob(10))
M.disgust = 0
+ ..()
. = 1
/datum/reagent/consumable/lemonade
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index 0a9fce2e67..7013412e6d 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -354,6 +354,16 @@
category = list("Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
+/datum/design/portable_chem_mixer
+ name = "Portable Chemical Mixer"
+ desc = "A portable device that dispenses and mixes chemicals. Reagents have to be supplied with beakers."
+ id = "portable_chem_mixer"
+ build_type = PROTOLATHE
+ departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
+ materials = list(/datum/material/plastic = 5000, /datum/material/iron = 10000, /datum/material/glass = 3000)
+ build_path = /obj/item/storage/portable_chem_mixer
+ category = list("Equipment")
+
/////////////////////////////////////////
//////////Cybernetic Implants////////////
/////////////////////////////////////////
diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm
index c739d426c2..e758a43589 100644
--- a/code/modules/unit_tests/_unit_tests.dm
+++ b/code/modules/unit_tests/_unit_tests.dm
@@ -3,6 +3,7 @@
#ifdef UNIT_TESTS
#include "anchored_mobs.dm"
+#include "character_saving.dm"
#include "component_tests.dm"
#include "reagent_id_typos.dm"
#include "reagent_recipe_collisions.dm"
diff --git a/code/modules/unit_tests/character_saving.dm b/code/modules/unit_tests/character_saving.dm
new file mode 100644
index 0000000000..6c83d4142a
--- /dev/null
+++ b/code/modules/unit_tests/character_saving.dm
@@ -0,0 +1,14 @@
+/datum/unit_test/character_saving/Run()
+ try
+ var/datum/preferences/P = new
+ P.load_path("test")
+ P.features["flavor_text"] = "Foo"
+ P.features["ooc_notes"] = "Bar"
+ P.save_character()
+ P.load_character()
+ if(P.features["flavor_text"] != "Foo")
+ Fail("Flavor text is failing to save.")
+ if(P.features["ooc_notes"] != "Bar")
+ Fail("OOC text is failing to save.")
+ catch(var/exception/e)
+ Fail("Failed to save and load character due to exception [e.name]")
diff --git a/code/modules/vending/kinkmate.dm b/code/modules/vending/kinkmate.dm
index a78a4e6ef4..e522583772 100644
--- a/code/modules/vending/kinkmate.dm
+++ b/code/modules/vending/kinkmate.dm
@@ -26,7 +26,12 @@
/obj/item/clothing/under/shorts/polychromic/pantsu = 3,
/obj/item/clothing/under/misc/poly_bottomless = 3,
/obj/item/clothing/under/misc/poly_tanktop = 3,
- /obj/item/clothing/under/misc/poly_tanktop/female = 3
+ /obj/item/clothing/under/misc/poly_tanktop/female = 3,
+ /obj/item/autosurgeon/penis = 3,
+ /obj/item/autosurgeon/testicles = 3,
+ /obj/item/storage/pill_bottle/penis_enlargement = 5,
+ /obj/item/storage/pill_bottle/breast_enlargement = 5,
+ /obj/item/storage/daki = 4
)
contraband = list(
/obj/item/clothing/neck/petcollar/locked = 2,
diff --git a/html/changelog.html b/html/changelog.html
index 573d4c5dd8..01d3861fc5 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,123 @@
-->
+
02 September 2020
+
Putnam3145 updated:
+
+ - Added a unit test for character saving.
+ - Plastitanium rapier no longer silently sleeps with no chance at counterplay when used by pacifists.
+ - Fusion scan is now actually useful.
+
+
Tupinambis updated:
+
+ - moved the dakis, genital growth pills, and genital autosurgeons out of the maintenance loot table and into kinkmates.
+
+
raspy-on-osu updated:
+
+ - pyroclastic anomaly client spam
+
+
timothyteakettle updated:
+
+ - you can hide your ckey now from the roundend report
+
+
+
01 September 2020
+
BlueWildrose updated:
+
+ - fixed slimes starting off hungry
+
+
+
31 August 2020
+
Arturlang updated:
+
+ - Slimes can now damage structures, don't leave them unfed!
+
+
Chiirno updated:
+
+ - Moves pill_bottles/dice to box/dice on CogStation.
+
+
Couls, ported by NecromancerAnne updated:
+
+ - cleans up mech backstabbing code
+
+
DeltaFire15 updated:
+
+ - teleport-to-ark ability of the eminence, commented out
+ - teleport-to-obelisk ability for the eminence
+
+
Detective-Google updated:
+
+ - plasmamen have no more slowdown
+ - object reskins now use very nice and cool radials
+
+
EmeraldSundisk updated:
+
+ - Adds a pool to MetaStation
+ - Slight readjustments to the surrounding area
+ - Fixes a handful of external airlocks
+
+
ForrestWick updated:
+
+ - removes wall walking boots from nukie uplink
+
+
Ghommie updated:
+
+ - e-gun overlays and some floor decals should have been fixed.
+
+
LetterN updated:
+
+
Lynxless updated:
+
+ - Changed anatomic panacea into a direct buff, instead of a chem injection
+ - Changed the values of anatomic panacea
+ - Added a new icon for panacea's buff alert
+
+
Putnam3145 updated:
+
+ - Pref for genital/vore examine text
+ - Fixed a couple events having ghost roles eligible.
+ - Buffed slaughter demon: gets stronger as it eats people
+ - Nerfed slaughter demon: no longer permanently round-removes all who are eaten by it, instead releasing their now-heartless bodies
+ - Dynamic storytellers now calculate property weights properly.
+
+
Sonic121x updated:
+
+ - Fix the four type of new tea that will stuck inside your vein.
+ - drinking glass sprite for those tea.
+
+
kappa-sama updated:
+
+ - miners can no longer acquire funny antag item
+
+
lolman360 updated:
+
+ - shuttle engine/heater sprites now face the right way
+
+
raspy-on-osu updated:
+
+ - TEG power output
+ - tesla movement priorities
+ - tesla counterplay
+ - tesla containment check (containment variable now usable)
+
+
silicons updated:
+
+ - brooms now sweep objects on MOVABLE_PRE_MOVE rather than MOVABLE_MOVED
+ - firedoors no longer automatically open on touch when there's no pressure differences.
+
+
timothyteakettle updated:
+
+ - buzz, buzz2 and ping are now all unrestricted emotes and can be used by anyone
+ - the drake credit and pickle credit sprites have been removed
+ - tongue speech handling is now done by accent datums
+
+
zeroisthebiggay updated:
+
+
30 August 2020
raspy-on-osu updated:
@@ -1374,67 +1491,6 @@
- bohbombing is a thing now
-
- 30 June 2020
- Fikou updated:
-
- - spray cans, airlock painters, and decal painters added to engineering/service/autolathe (where applicable)
-
- Ghommie updated:
-
- - Fixed a gap on the male insect anthro torso sprite when facing south.
- - Fixed mecha ID access not being removable.
- - Fixed a peeve with the hypno trance status effect not sanitizing some heard hypnosis inputs (i.e. custom say messages like say"honks*clownem ipsum dolor")
- - fixed an issue about using stacks with only 1 amount left.
- - Fixed a peeve on attack messages against carbons/humans.
- - Fixed missing hypnochair board.
- - Fixed material walls and tiles. My bad on that port.
-
- Ghommie (inspired by MrDoomBringer's work on tgstation) updated:
-
- Ghommie (porting PRs by XTDM, coiax, MrDoomBringer) updated:
-
- - Random Events now have a follow link for ghosts!
- - Adds the Spontaneous Brain Trauma to the event pool. Sometimes your brain just goes a little wrong.
- - Sometimes a low level cloning pod will make errors in replicating your brain, leaving you with a mild brain trauma.
- - When a person is cloned, any mental traumas are cloned as well.
- - The wizard federation announces that the Curse of Madness is out of beta and is now available for purchase for 4 points. It causes long-lasting brain traumas to all inhabitants of a target space station.
- - The wizard federation declines responsibility for any self-harm caused by curses cast while inside the targeted station.
- - Due to the extensive testing of the Curse of Madness some unique new trauma types have appeared across Nanotrasen-controlled space.
- - Curse of Madness can now be triggered by a wizard's Summon Events, at the same chance as Summon Guns or Summon Magic.
- - When an admin triggers Curse of Madness manually, they can specify their own dark truth to horrify the station with.
-
- nightred updated:
-
- - Created two_handed component
- - Updated all existing two handed items to use the new component
-
- silicons updated:
-
- - typing indicators no longer generates duplicate message boxes.
- - config errors now have line numbers.
- - outgoing mentorpms are now blue instead of green for the sender.
- - *squish
-
- timothyteakettle updated:
-
- - you can now select your tongue and speech verb in the character customization menu!
- - skeleton is now split into two more types, greater and lesser
- - non-carbon blood is now not white
- - fixed a bunch of grammar/spelling mistakes
-
-
- 29 June 2020
- b1tt3r1n0 updated:
-
- - Made teratomas from sdgf less powergame
-
- timothyteakettle updated:
-
- - slimes no longer have white blood by default
-