diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index bb372563cf..7693ea16a2 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -69,35 +69,18 @@
/turf/closed/wall/r_wall,
/area/security/prison)
"aaj" = (
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
/obj/structure/cable{
icon_state = "4-8"
},
-/turf/closed/wall/r_wall,
-/area/security/prison)
-"aak" = (
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/security/prison)
-"aal" = (
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel,
/area/security/prison)
"aam" = (
/obj/structure/cable{
icon_state = "0-2"
},
-/obj/structure/cable{
- icon_state = "0-8"
- },
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/security/prison)
@@ -115,11 +98,17 @@
/obj/structure/sign/warning/electricshock{
pixel_y = 32
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/grass,
/area/security/prison)
"aap" = (
/obj/machinery/hydroponics/soil,
/obj/item/seeds/carrot,
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
/turf/open/floor/grass,
/area/security/prison)
"aaq" = (
@@ -140,17 +129,29 @@
/obj/structure/sink{
pixel_y = 20
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel,
/area/security/prison)
"aar" = (
/obj/machinery/hydroponics/soil,
/obj/item/seeds/glowshroom,
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/grass,
/area/security/prison)
"aas" = (
/obj/structure/sign/warning/electricshock{
pixel_y = 32
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel,
/area/security/prison)
"aat" = (
@@ -5666,6 +5667,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
/turf/open/floor/plasteel,
/area/security/brig)
"akw" = (
@@ -5845,10 +5849,13 @@
/area/science/xenobiology)
"akQ" = (
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "1-2"
},
-/turf/closed/wall,
-/area/security/brig)
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison)
"akR" = (
/obj/machinery/camera{
c_tag = "Security Office";
@@ -6108,7 +6115,7 @@
"alq" = (
/obj/machinery/door/airlock/security/glass{
name = "Evidence Storage";
- req_access_txt = "4"
+ req_one_access_txt = "4;1"
},
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -6142,25 +6149,11 @@
/turf/open/floor/plasteel,
/area/security/brig)
"alt" = (
-/obj/machinery/door/airlock/security/glass{
- id_tag = "innerbrig";
- name = "Brig";
- req_access_txt = "63"
- },
-/obj/machinery/door/firedoor,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
+/obj/structure/cable{
+ icon_state = "1-2"
},
/turf/open/floor/plasteel,
/area/security/brig)
@@ -6180,16 +6173,11 @@
/area/ai_monitored/nuke_storage)
"alv" = (
/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/structure/cable{
- icon_state = "0-4"
- },
/obj/machinery/door/poddoor/preopen{
id = "Secure Gate";
name = "brig shutters"
},
+/obj/structure/cable,
/turf/open/floor/plating,
/area/security/brig)
"alw" = (
@@ -6272,6 +6260,9 @@
/obj/effect/turf_decal/tile/red{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
/turf/open/floor/plasteel,
/area/security/brig)
"alB" = (
@@ -6572,9 +6563,6 @@
/turf/open/floor/engine,
/area/science/xenobiology)
"amm" = (
-/obj/structure/cable{
- icon_state = "0-8"
- },
/obj/structure/cable{
icon_state = "0-4"
},
@@ -6609,6 +6597,9 @@
/obj/effect/turf_decal/tile/red{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel,
/area/security/brig)
"amq" = (
@@ -6661,9 +6652,6 @@
icon_state = "0-8"
},
/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
- icon_state = "0-4"
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
/area/security/brig)
@@ -6763,6 +6751,12 @@
/obj/effect/turf_decal/tile/red{
dir = 1
},
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
/turf/open/floor/plasteel,
/area/security/brig)
"amJ" = (
@@ -6853,25 +6847,15 @@
},
/turf/open/floor/plasteel,
/area/science/xenobiology)
-"amR" = (
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/machinery/door/poddoor/preopen{
- id = "Secure Gate";
- name = "brig shutters"
- },
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/security/brig)
"amS" = (
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
},
-/turf/closed/wall/r_wall,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel,
/area/security/brig)
"amT" = (
/obj/structure/cable{
@@ -7271,9 +7255,11 @@
/obj/structure/cable{
icon_state = "0-4"
},
-/obj/structure/cable,
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
/turf/open/floor/plating,
/area/security/brig)
"anQ" = (
@@ -7281,9 +7267,6 @@
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
-/obj/structure/cable{
- icon_state = "1-2"
- },
/turf/open/floor/plasteel,
/area/security/brig)
"anR" = (
@@ -7514,14 +7497,13 @@
/obj/structure/cable{
icon_state = "0-4"
},
-/obj/structure/cable,
/obj/machinery/door/poddoor/preopen{
id = "Secure Gate";
name = "brig shutters"
},
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
- icon_state = "1-8"
+ icon_state = "0-8"
},
/turf/open/floor/plating,
/area/security/brig)
@@ -7755,13 +7737,13 @@
/area/security/brig)
"aoZ" = (
/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
- icon_state = "0-2"
- },
/obj/machinery/door/poddoor/preopen{
id = "Secure Brig Control";
name = "brig shutters"
},
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
/turf/open/floor/plating,
/area/security/warden)
"apa" = (
@@ -7780,6 +7762,9 @@
/area/science/xenobiology)
"apc" = (
/obj/structure/chair/office/dark,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
"apd" = (
@@ -7933,6 +7918,12 @@
pixel_x = 6;
pixel_y = 3
},
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
"apw" = (
@@ -8052,6 +8043,12 @@
pixel_y = -24;
req_access_txt = "2"
},
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
"apI" = (
@@ -8133,9 +8130,6 @@
req_access_txt = "63"
},
/obj/machinery/door/firedoor,
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
@@ -8158,14 +8152,19 @@
/turf/open/floor/plating,
/area/maintenance/fore)
"apT" = (
+/obj/machinery/door/poddoor/preopen{
+ id = "Cell Interior Shutters";
+ name = "brig shutters"
+ },
+/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "0-8"
},
/obj/structure/cable{
- icon_state = "1-8"
+ icon_state = "0-4"
},
-/turf/closed/wall/r_wall,
-/area/security/warden)
+/turf/open/floor/plating,
+/area/security/brig)
"apU" = (
/turf/open/floor/plating,
/area/security/vacantoffice/b)
@@ -8181,20 +8180,6 @@
},
/turf/open/floor/plating,
/area/maintenance/fore)
-"apX" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/machinery/door/poddoor/preopen{
- id = "Secure Brig Control";
- name = "brig shutters"
- },
-/turf/open/floor/plating,
-/area/security/warden)
"apY" = (
/obj/machinery/light/small{
dir = 1
@@ -8406,13 +8391,11 @@
/area/crew_quarters/fitness/pool)
"aqt" = (
/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
- icon_state = "0-8"
- },
/obj/machinery/door/poddoor/preopen{
id = "Secure Brig Control";
name = "brig shutters"
},
+/obj/structure/cable,
/turf/open/floor/plating,
/area/security/warden)
"aqu" = (
@@ -8858,6 +8841,9 @@
c_tag = "Brig Control";
dir = 1
},
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
"arz" = (
@@ -52616,9 +52602,6 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
-/obj/structure/cable{
- icon_state = "1-2"
- },
/turf/open/floor/plasteel,
/area/security/brig)
"cLS" = (
@@ -53521,9 +53504,17 @@
/area/science/circuit)
"dyE" = (
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "0-4"
},
-/turf/open/floor/plasteel,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/door/poddoor/preopen{
+ id = "Secure Gate";
+ name = "brig shutters"
+ },
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
/area/security/brig)
"dyS" = (
/obj/effect/turf_decal/tile/green{
@@ -53583,9 +53574,6 @@
/turf/open/space,
/area/space/nearstation)
"dCV" = (
-/obj/structure/cable{
- icon_state = "1-4"
- },
/obj/effect/turf_decal/tile/red{
dir = 1
},
@@ -54994,11 +54982,11 @@
/obj/structure/cable{
icon_state = "0-8"
},
-/obj/structure/cable{
- icon_state = "0-4"
- },
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
/turf/open/floor/plating,
/area/security/brig)
"gOZ" = (
@@ -56342,15 +56330,15 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
-/obj/structure/cable{
- icon_state = "2-4"
- },
/obj/effect/turf_decal/tile/red{
dir = 1
},
/obj/effect/turf_decal/tile/red{
dir = 4
},
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
/turf/open/floor/plasteel,
/area/security/brig)
"kcx" = (
@@ -56869,9 +56857,6 @@
/turf/open/floor/plasteel,
/area/security/brig)
"laq" = (
-/obj/structure/cable{
- icon_state = "2-8"
- },
/obj/structure/cable{
icon_state = "2-4"
},
@@ -57160,7 +57145,7 @@
/area/maintenance/starboard/aft)
"lZn" = (
/obj/machinery/door/airlock/security/glass{
- id_tag = "innerbrig";
+ id_tag = null;
name = "Brig Infirmary";
req_access_txt = "2"
},
@@ -58195,9 +58180,6 @@
/area/hallway/primary/central)
"ovv" = (
/obj/structure/table,
-/obj/structure/cable{
- icon_state = "0-2"
- },
/obj/effect/turf_decal/tile/red{
dir = 1
},
@@ -58540,9 +58522,6 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
-/obj/structure/cable{
- icon_state = "2-4"
- },
/obj/effect/turf_decal/tile/red{
dir = 1
},
@@ -58671,9 +58650,6 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
-/obj/structure/cable{
- icon_state = "2-8"
- },
/obj/effect/turf_decal/tile/red{
dir = 1
},
@@ -58681,7 +58657,10 @@
dir = 4
},
/obj/structure/cable{
- icon_state = "2-4"
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
},
/turf/open/floor/plasteel,
/area/security/brig)
@@ -58809,9 +58788,6 @@
/turf/open/floor/plating,
/area/crew_quarters/fitness)
"pQr" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
/obj/effect/turf_decal/tile/green,
/obj/effect/turf_decal/tile/green{
dir = 8
@@ -59498,9 +59474,6 @@
/area/maintenance/bar)
"rCl" = (
/obj/machinery/door/firedoor,
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
@@ -59544,20 +59517,6 @@
},
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
-"rJv" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/machinery/door/poddoor/preopen{
- id = "Secure Gate";
- name = "brig shutters"
- },
-/turf/open/floor/plating,
-/area/security/brig)
"rJw" = (
/obj/structure/table/glass,
/obj/item/hemostat,
@@ -59764,9 +59723,6 @@
},
/area/crew_quarters/fitness)
"seP" = (
-/obj/structure/cable{
- icon_state = "0-4"
- },
/obj/structure/cable{
icon_state = "0-8"
},
@@ -61092,6 +61048,9 @@
/area/maintenance/starboard/aft)
"uXt" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel,
/area/security/brig)
"vae" = (
@@ -61332,13 +61291,13 @@
/area/crew_quarters/dorms)
"vyK" = (
/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
- icon_state = "0-8"
- },
/obj/machinery/door/poddoor/preopen{
id = "Secure Gate";
name = "brig shutters"
},
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
/turf/open/floor/plating,
/area/security/brig)
"vzp" = (
@@ -88087,7 +88046,7 @@ aaa
aaa
aag
aaa
-aak
+aam
aap
saX
aaD
@@ -88344,7 +88303,7 @@ aaa
aaa
aag
aaf
-aaj
+aai
aao
aax
aaC
@@ -88370,7 +88329,7 @@ alz
cZe
alg
plS
-dyE
+afM
pQr
aou
aqC
@@ -88601,7 +88560,7 @@ aaa
aaa
aag
aaa
-aal
+aam
aar
uGI
aaF
@@ -88858,7 +88817,7 @@ aaa
aaa
aag
aaf
-aaj
+aai
aaq
dyS
aaE
@@ -88883,10 +88842,10 @@ agj
agM
sAk
akp
-akQ
+agj
amB
amn
-amS
+aiX
anz
anz
aov
@@ -89115,8 +89074,8 @@ aaa
aaa
aag
aaa
-aal
-aat
+aam
+aaj
aat
aat
aat
@@ -89143,7 +89102,7 @@ akM
amm
gyr
anM
-rJv
+xal
aqC
anz
aox
@@ -89372,7 +89331,7 @@ aaa
aaa
aag
aaf
-aaj
+aai
aas
aat
aat
@@ -89395,12 +89354,12 @@ akU
afM
lBz
alA
-ene
-alg
+alt
+amS
kbm
-dyE
+afM
cKC
-seP
+dyE
aqC
anR
aow
@@ -89630,7 +89589,7 @@ aaa
aag
aaa
aam
-aav
+akQ
aav
aav
aav
@@ -89657,7 +89616,7 @@ akT
gNE
gLz
anB
-amR
+seP
aqC
anz
aov
@@ -89911,10 +89870,10 @@ fxx
ako
ene
amj
-akQ
+agj
amB
amn
-amS
+aiX
anz
anz
aov
@@ -90171,7 +90130,7 @@ amk
amm
gyr
mos
-rJv
+xal
aqC
anz
aov
@@ -90424,11 +90383,11 @@ akF
aiy
akv
uXt
-alg
+amS
pAK
-dyE
+afM
anQ
-seP
+dyE
aqC
anz
aov
@@ -90685,7 +90644,7 @@ akT
amx
any
arD
-amR
+seP
aqC
anz
aov
@@ -90939,10 +90898,10 @@ ajc
akz
ene
als
-akQ
-amB
+agj
+apT
amn
-amS
+aiX
aqD
anz
aov
@@ -91196,7 +91155,7 @@ ajc
akz
ene
alg
-alt
+alw
amp
aot
apR
@@ -91455,7 +91414,7 @@ itD
alg
vyK
amI
-alg
+amS
alv
aqE
anS
@@ -91970,7 +91929,7 @@ agn
agn
amN
aoZ
-apT
+agn
anw
anz
cXU
@@ -92227,7 +92186,7 @@ akY
alE
amU
apH
-apX
+aqt
aqC
anz
gfC
diff --git a/_maps/map_files/CogStation/CogStation.dmm b/_maps/map_files/CogStation/CogStation.dmm
index a4d34264ae..a62dfcf0a2 100644
--- a/_maps/map_files/CogStation/CogStation.dmm
+++ b/_maps/map_files/CogStation/CogStation.dmm
@@ -3,8 +3,17 @@
/turf/open/space/basic,
/area/space)
"aab" = (
-/turf/closed/wall,
-/area/crew_quarters/abandoned_gambling_den)
+/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/arcade";
+ name = "Arcade APC";
+ pixel_y = -26
+ },
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/maintenance/fore)
"aac" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 6
@@ -660,9 +669,8 @@
/turf/open/floor/plating/airless,
/area/router/aux)
"abF" = (
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/turf/closed/wall,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"abG" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -701,9 +709,9 @@
/turf/open/floor/plating,
/area/crew_quarters/theatre/clown)
"abJ" = (
-/obj/machinery/computer/arcade/orion_trail,
-/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
+/turf/closed/wall,
+/area/crew_quarters/arcade)
"abK" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -808,9 +816,9 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"abZ" = (
-/obj/machinery/computer/arcade/minesweeper,
+/obj/machinery/computer/arcade/orion_trail,
/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"aca" = (
/obj/machinery/conveyor/auto{
dir = 5;
@@ -850,9 +858,9 @@
/turf/open/floor/plating/airless,
/area/router/aux)
"acf" = (
-/obj/machinery/computer/arcade,
+/obj/machinery/computer/arcade/minesweeper,
/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"acg" = (
/obj/machinery/light{
dir = 8;
@@ -874,8 +882,9 @@
},
/area/hallway/secondary/entry)
"aci" = (
-/turf/closed/wall,
-/area/medical/medbay)
+/obj/machinery/computer/arcade,
+/turf/open/floor/carpet/arcade,
+/area/crew_quarters/arcade)
"acj" = (
/obj/machinery/conveyor/auto{
dir = 4;
@@ -1042,10 +1051,10 @@
dir = 1
},
/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"acA" = (
/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"acB" = (
/obj/machinery/conveyor{
dir = 6;
@@ -1127,9 +1136,11 @@
/turf/open/floor/plating/airless,
/area/router/aux)
"acK" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/medical/medbay)
+/obj/structure/sign/poster/official/foam_force_ad{
+ pixel_y = 32
+ },
+/turf/open/floor/carpet/arcade,
+/area/crew_quarters/arcade)
"acL" = (
/obj/machinery/door/poddoor{
id = "executionspaceblast"
@@ -1275,11 +1286,9 @@
/turf/closed/wall/r_wall,
/area/security/brig)
"adc" = (
-/obj/structure/sign/poster/official/foam_force_ad{
- pixel_y = 32
- },
+/obj/structure/chair/stool,
/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"add" = (
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 6
@@ -1511,8 +1520,9 @@
/area/security/brig)
"adL" = (
/obj/structure/chair/stool,
+/obj/effect/landmark/start/assistant,
/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"adM" = (
/turf/closed/wall,
/area/crew_quarters/observatory)
@@ -1546,34 +1556,13 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"adR" = (
-/obj/structure/window/reinforced{
- dir = 1;
- pixel_y = 1
+/obj/structure/chair/stool,
+/obj/machinery/airalarm{
+ dir = 8;
+ pixel_x = 23
},
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/item/storage/box/beakers,
-/obj/item/hand_labeler,
-/obj/item/folder/white{
- pixel_x = -6;
- pixel_y = 4
- },
-/obj/item/stamp/denied{
- pixel_x = 8;
- pixel_y = 8
- },
-/obj/item/stamp,
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/turf/open/floor/carpet/arcade,
+/area/crew_quarters/arcade)
"adS" = (
/turf/closed/wall,
/area/construction)
@@ -1696,10 +1685,11 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"aej" = (
-/obj/structure/chair/stool,
-/obj/effect/landmark/start/assistant,
+/obj/machinery/vr_sleeper{
+ dir = 4
+ },
/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"aek" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -1912,13 +1902,9 @@
/turf/open/floor/plating,
/area/maintenance/fore)
"aeI" = (
-/obj/structure/chair/stool,
-/obj/machinery/airalarm{
- dir = 8;
- pixel_x = 23
- },
+/obj/effect/landmark/event_spawn,
/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"aeJ" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
@@ -2488,10 +2474,10 @@
/area/crew_quarters/observatory)
"agc" = (
/obj/machinery/vr_sleeper{
- dir = 4
+ dir = 8
},
/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"agd" = (
/obj/structure/fans/tiny/invisible,
/obj/docking_port/stationary{
@@ -2675,9 +2661,18 @@
/turf/open/floor/plating,
/area/maintenance/fore)
"agC" = (
-/obj/effect/landmark/event_spawn,
+/obj/machinery/vr_sleeper{
+ dir = 4
+ },
+/obj/machinery/light{
+ dir = 8;
+ light_color = "#e8eaff"
+ },
+/obj/structure/sign/poster/official/soft_cap_pop_art{
+ pixel_x = -32
+ },
/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"agD" = (
/obj/machinery/seed_extractor,
/obj/effect/decal/cleanable/dirt,
@@ -2796,8 +2791,12 @@
/obj/machinery/vr_sleeper{
dir = 8
},
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#e8eaff"
+ },
/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"agU" = (
/obj/structure/table,
/obj/effect/turf_decal/tile/yellow{
@@ -4429,8 +4428,11 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"akN" = (
-/turf/open/space/basic,
-/area/router/aux)
+/obj/structure/chair/stool,
+/obj/effect/landmark/start/assistant,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/turf/open/floor/carpet/arcade,
+/area/crew_quarters/arcade)
"akO" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -4881,18 +4883,15 @@
/turf/open/floor/plating,
/area/construction/secondary)
"alZ" = (
-/obj/machinery/vr_sleeper{
+/obj/machinery/light_switch{
+ pixel_x = -24
+ },
+/obj/machinery/camera{
+ c_tag = "Arcade";
dir = 4
},
-/obj/machinery/light{
- dir = 8;
- light_color = "#e8eaff"
- },
-/obj/structure/sign/poster/official/soft_cap_pop_art{
- pixel_x = -32
- },
/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"ama" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -5383,32 +5382,15 @@
/turf/open/floor/plating,
/area/construction/secondary)
"ang" = (
-/turf/closed/wall/r_wall,
-/area/engine/storage_shared)
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/carpet/arcade,
+/area/crew_quarters/arcade)
"anh" = (
-/obj/structure/window/reinforced{
- dir = 4
+/obj/structure/sign/poster/official/nanomichi_ad{
+ pixel_x = 32
},
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/item/clothing/glasses/regular,
-/obj/machinery/door/window/northright{
- name = "Medical Booth Desk";
- req_access_txt = "5"
- },
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/turf/open/floor/carpet/arcade,
+/area/crew_quarters/arcade)
"ani" = (
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/tile/red,
@@ -5479,15 +5461,9 @@
},
/area/chapel/main)
"anq" = (
-/obj/machinery/vr_sleeper{
- dir = 8
- },
-/obj/machinery/light{
- dir = 4;
- light_color = "#e8eaff"
- },
+/obj/machinery/vending/snack/random,
/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"anr" = (
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/pipe/simple/supplymain/visible{
@@ -5608,11 +5584,9 @@
/turf/open/floor/plasteel/dark/corner,
/area/hallway/secondary/entry)
"anE" = (
-/obj/structure/chair/stool,
-/obj/effect/landmark/start/assistant,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/obj/machinery/vending/games,
/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"anF" = (
/obj/machinery/smartfridge,
/turf/closed/wall,
@@ -5638,15 +5612,20 @@
/turf/open/floor/plating,
/area/security/checkpoint)
"anI" = (
-/obj/machinery/light_switch{
- pixel_x = -24
+/obj/machinery/portable_atmospherics/scrubber,
+/obj/effect/turf_decal/bot,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ icon_state = "0-4"
},
-/obj/machinery/camera{
- c_tag = "Arcade";
- dir = 4
+/obj/machinery/power/apc{
+ areastring = "/area/storage/emergency";
+ dir = 1;
+ name = "Emergency Storage APC";
+ pixel_y = 24
},
-/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/turf/open/floor/plasteel,
+/area/storage/emergency)
"anJ" = (
/obj/structure/table,
/obj/effect/turf_decal/tile/red,
@@ -5687,9 +5666,9 @@
/turf/closed/wall/r_wall,
/area/security/detectives_office)
"anL" = (
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/obj/effect/spawner/structure/window,
+/turf/open/floor/plating,
+/area/crew_quarters/arcade)
"anM" = (
/obj/machinery/recharge_station,
/obj/effect/turf_decal/tile/yellow{
@@ -5732,11 +5711,12 @@
/turf/open/floor/plasteel,
/area/storage/tools)
"anP" = (
-/obj/structure/sign/poster/official/nanomichi_ad{
- pixel_x = 32
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
+ name = "Arcade"
},
/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"anQ" = (
/obj/structure/chair{
dir = 4
@@ -5781,9 +5761,13 @@
/turf/open/floor/plasteel,
/area/storage/tools)
"anT" = (
-/obj/machinery/vending/snack/random,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
+ name = "Arcade"
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/area/crew_quarters/arcade)
"anU" = (
/turf/closed/wall/r_wall,
/area/security/brig)
@@ -5865,13 +5849,11 @@
/turf/open/floor/carpet/purple,
/area/crew_quarters/dorms/purple)
"aof" = (
-/obj/machinery/vending/games,
-/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/turf/closed/wall/r_wall,
+/area/crew_quarters/fitness/cogpool)
"aog" = (
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
-/area/crew_quarters/abandoned_gambling_den)
+/turf/closed/wall,
+/area/crew_quarters/fitness/cogpool)
"aoh" = (
/obj/machinery/light_switch{
pixel_y = -24
@@ -6158,12 +6140,9 @@
/turf/closed/wall/r_wall,
/area/router/service)
"aoL" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
- name = "Arcade"
- },
-/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/obj/effect/spawner/structure/window,
+/turf/open/floor/plating,
+/area/crew_quarters/fitness/cogpool)
"aoM" = (
/obj/structure/closet/crate,
/obj/item/stock_parts/matter_bin,
@@ -6267,11 +6246,15 @@
"aoU" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
- name = "Arcade"
+ name = "Pool"
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/carpet/arcade,
-/area/crew_quarters/abandoned_gambling_den)
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
+/turf/open/floor/plasteel/white/side,
+/area/crew_quarters/fitness/cogpool)
"aoV" = (
/obj/effect/turf_decal/tile/red{
dir = 4
@@ -6355,11 +6338,16 @@
/turf/open/floor/plasteel,
/area/security/brig)
"apd" = (
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
+ name = "Pool"
},
-/turf/closed/wall/r_wall,
-/area/engine/storage_shared)
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white/side,
+/area/crew_quarters/fitness/cogpool)
"ape" = (
/obj/structure/grille,
/turf/open/floor/plating,
@@ -6409,8 +6397,9 @@
/turf/open/floor/wood,
/area/crew_quarters/fitness)
"apm" = (
-/turf/closed/wall/r_wall,
-/area/crew_quarters/fitness/pool)
+/obj/machinery/holopad,
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
"apn" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -6491,28 +6480,27 @@
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet/fitness)
"apy" = (
-/turf/closed/wall,
-/area/crew_quarters/fitness/pool)
+/obj/machinery/pool/controller,
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
"apz" = (
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
-/area/crew_quarters/fitness/pool)
+/obj/structure/table,
+/obj/item/toy/beach_ball{
+ pixel_y = 12
+ },
+/obj/item/clothing/glasses/sunglasses{
+ pixel_y = 4
+ },
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
"apA" = (
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/closed/wall,
/area/crew_quarters/dorms/purple)
"apB" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
- name = "Pool"
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
-/turf/open/floor/plasteel/white/side,
-/area/crew_quarters/fitness/pool)
+/obj/structure/chair/comfy/teal,
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
"apC" = (
/turf/closed/wall/r_wall,
/area/hydroponics)
@@ -6541,16 +6529,15 @@
/turf/open/floor/plasteel,
/area/hydroponics)
"apG" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
- name = "Pool"
+/obj/structure/table,
+/obj/item/clothing/glasses/sunglasses{
+ pixel_y = 4
},
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
},
-/turf/open/floor/plasteel/white/side,
-/area/crew_quarters/fitness/pool)
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
"apH" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -6732,15 +6719,16 @@
/turf/open/floor/plating,
/area/construction/secondary)
"aqc" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/medical/glass{
- name = "Medical Booth";
- req_access_txt = "5"
+/obj/structure/chair/comfy/teal,
+/obj/machinery/light{
+ dir = 1;
+ light_color = "#cee5d2"
},
-/obj/effect/turf_decal/delivery,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plasteel,
-/area/medical/medbay)
+/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
"aqd" = (
/obj/structure/chair/sofa/right,
/obj/machinery/camera{
@@ -6820,9 +6808,17 @@
/turf/open/floor/plasteel/dark,
/area/crew_quarters/bar)
"aqn" = (
-/obj/structure/sign/departments/medbay/alt,
-/turf/closed/wall/r_wall,
-/area/medical/medbay)
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/item/kirbyplants{
+ icon_state = "plant-02"
+ },
+/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
"aqo" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -7008,13 +7004,26 @@
/turf/open/floor/plating,
/area/hallway/secondary/service)
"aqO" = (
-/obj/machinery/holopad,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
+ dir = 9
+ },
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
"aqP" = (
-/obj/machinery/pool/controller,
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
"aqQ" = (
/turf/closed/wall/r_wall,
/area/crew_quarters/kitchen/backroom)
@@ -7027,22 +7036,32 @@
/turf/open/floor/plating,
/area/crew_quarters/theatre/clown)
"aqS" = (
-/obj/structure/table,
-/obj/item/toy/beach_ball{
- pixel_y = 12
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
},
-/obj/item/clothing/glasses/sunglasses{
- pixel_y = 4
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk{
+ dir = 4
},
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
"aqT" = (
-/obj/structure/chair/comfy/teal,
-/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/closed/wall,
+/area/crew_quarters/fitness/cogpool)
"aqU" = (
-/turf/closed/wall/r_wall,
-/area/medical/medbay)
+/obj/machinery/light{
+ dir = 8;
+ light_color = "#e8eaff"
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
"aqV" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/maintenance{
@@ -7336,15 +7355,9 @@
/turf/open/floor/carpet/blue,
/area/crew_quarters/dorms/blue)
"arB" = (
-/obj/structure/table,
-/obj/item/clothing/glasses/sunglasses{
- pixel_y = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 4
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
"arC" = (
/obj/structure/sign/warning/fire{
desc = "A sign that states the labeled room's number.";
@@ -7378,16 +7391,11 @@
/turf/closed/wall/r_wall,
/area/maintenance/starboard/central)
"arF" = (
-/obj/structure/chair/comfy/teal,
-/obj/machinery/light{
- dir = 1;
- light_color = "#cee5d2"
- },
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
- dir = 4
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
},
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
"arG" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
@@ -7453,48 +7461,48 @@
/turf/open/floor/plating,
/area/router/service)
"arN" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/item/kirbyplants{
- icon_state = "plant-02"
- },
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
- dir = 4
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#e8eaff"
},
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
"arO" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
- dir = 9
- },
-/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/turf/closed/wall,
+/area/medical/clinic)
"arP" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/medical/clinic)
"arQ" = (
+/obj/structure/window/reinforced{
+ dir = 1;
+ pixel_y = 1
+ },
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
/obj/effect/turf_decal/tile/blue{
dir = 1
},
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
- dir = 4
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
},
+/obj/item/storage/box/beakers,
+/obj/item/hand_labeler,
+/obj/item/folder/white{
+ pixel_x = -6;
+ pixel_y = 4
+ },
+/obj/item/stamp/denied{
+ pixel_x = 8;
+ pixel_y = 8
+ },
+/obj/item/stamp,
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/medical/clinic)
"arR" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -7543,11 +7551,29 @@
/turf/open/floor/carpet/purple,
/area/crew_quarters/dorms/purple)
"arV" = (
-/obj/structure/disposalpipe/segment{
+/obj/structure/window/reinforced{
dir = 4
},
-/turf/closed/wall,
-/area/crew_quarters/fitness/pool)
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/item/clothing/glasses/regular,
+/obj/machinery/door/window/northright{
+ name = "Medical Booth Desk";
+ req_access_txt = "5"
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/clinic)
"arW" = (
/obj/structure/closet/firecloset,
/obj/effect/turf_decal/bot,
@@ -7558,37 +7584,19 @@
/turf/open/floor/plasteel,
/area/tcommsat/computer)
"arX" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/medical/glass{
+ name = "Medical Booth";
+ req_access_txt = "5"
},
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/item/stack/medical/gauze,
-/obj/item/reagent_containers/blood,
-/obj/item/stack/medical/suture,
-/obj/item/stack/medical/mesh,
-/obj/structure/extinguisher_cabinet{
- pixel_x = -26
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel,
+/area/medical/clinic)
"arY" = (
-/obj/machinery/light{
- dir = 8;
- light_color = "#e8eaff"
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/corner,
-/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/obj/structure/sign/departments/medbay/alt,
+/turf/closed/wall/r_wall,
+/area/medical/clinic)
"arZ" = (
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 8
@@ -7597,9 +7605,17 @@
/turf/open/floor/carpet/purple,
/area/crew_quarters/dorms/purple)
"asa" = (
-/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
"asb" = (
/obj/machinery/airalarm{
dir = 1;
@@ -7675,11 +7691,11 @@
/turf/open/floor/carpet/blue,
/area/crew_quarters/dorms/blue)
"asi" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
+/obj/machinery/pool/filter{
+ pixel_y = 16
},
-/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/turf/open/pool,
+/area/crew_quarters/fitness/cogpool)
"asj" = (
/obj/effect/turf_decal/tile/red,
/obj/structure/disposalpipe/segment{
@@ -7806,17 +7822,8 @@
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"ast" = (
-/obj/machinery/computer/med_data{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/turf/open/pool,
+/area/crew_quarters/fitness/cogpool)
"asu" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -7824,30 +7831,25 @@
/turf/closed/wall/rust,
/area/maintenance/disposal)
"asv" = (
-/obj/machinery/light{
- dir = 4;
- light_color = "#e8eaff"
- },
-/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
-"asw" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
-"asx" = (
-/obj/machinery/pool/filter{
- pixel_y = 16
+/obj/structure/pool/ladder{
+ dir = 2;
+ pixel_y = 24
},
/turf/open/pool,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
+"asw" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
+"asx" = (
+/obj/machinery/airalarm{
+ dir = 8;
+ pixel_x = 23
+ },
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
"asy" = (
/obj/effect/landmark/start/assistant,
/obj/machinery/holopad,
@@ -7872,21 +7874,41 @@
/turf/open/floor/plating,
/area/router/service)
"asB" = (
-/turf/open/pool,
-/area/crew_quarters/fitness/pool)
+/turf/closed/wall/r_wall,
+/area/medical/clinic)
"asC" = (
-/obj/structure/pool/ladder{
- dir = 2;
- pixel_y = 24
+/obj/structure/table,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
},
-/turf/open/pool,
-/area/crew_quarters/fitness/pool)
-"asD" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/effect/turf_decal/tile/blue{
dir = 8
},
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/item/stack/medical/gauze,
+/obj/item/reagent_containers/blood,
+/obj/item/stack/medical/suture,
+/obj/item/stack/medical/mesh,
+/obj/structure/extinguisher_cabinet{
+ pixel_x = -26
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/medical/clinic)
+"asD" = (
+/obj/machinery/computer/med_data{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/clinic)
"asE" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -7921,7 +7943,7 @@
dir = 1
},
/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/area/medical/clinic)
"asH" = (
/obj/machinery/camera{
c_tag = "Port Bow Solar Maintenance";
@@ -7948,33 +7970,11 @@
},
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/area/medical/clinic)
"asJ" = (
/turf/closed/wall,
/area/crew_quarters/toilet)
"asK" = (
-/obj/machinery/airalarm{
- dir = 8;
- pixel_x = 23
- },
-/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
-"asL" = (
-/turf/closed/wall,
-/area/security/brig)
-"asM" = (
-/obj/structure/bed/roller,
-/obj/machinery/iv_drip,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
-"asN" = (
/obj/effect/turf_decal/tile/blue{
dir = 8
},
@@ -7985,7 +7985,28 @@
dir = 4
},
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
+"asL" = (
+/turf/closed/wall,
+/area/security/brig)
+"asM" = (
+/obj/machinery/light_switch{
+ pixel_x = 24
+ },
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
+"asN" = (
+/obj/structure/bed/roller,
+/obj/machinery/iv_drip,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/turf/open/floor/plasteel/white,
+/area/medical/clinic)
"asO" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -8012,15 +8033,17 @@
/turf/open/floor/plasteel,
/area/router/service)
"asR" = (
-/obj/machinery/light_switch{
- pixel_x = 24
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 6
},
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/medical/clinic)
"asS" = (
-/obj/machinery/pool/drain,
-/turf/open/pool,
-/area/crew_quarters/fitness/pool)
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/clinic)
"asT" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
@@ -8032,9 +8055,19 @@
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/kitchen)
"asU" = (
-/obj/structure/pool/Lboard,
-/turf/open/pool,
-/area/crew_quarters/fitness/pool)
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = 28
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 9
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/clinic)
"asV" = (
/obj/machinery/atmospherics/pipe/manifold/orange/hidden,
/turf/open/floor/plasteel,
@@ -8085,12 +8118,9 @@
/turf/open/floor/plasteel,
/area/security/main)
"atb" = (
-/obj/structure/pool/Rboard,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/obj/machinery/pool/drain,
+/turf/open/pool,
+/area/crew_quarters/fitness/cogpool)
"atc" = (
/turf/closed/wall,
/area/security/main)
@@ -8716,24 +8746,16 @@
/turf/open/floor/carpet/purple,
/area/crew_quarters/dorms/purple)
"auC" = (
-/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/obj/structure/pool/Lboard,
+/turf/open/pool,
+/area/crew_quarters/fitness/cogpool)
"auD" = (
-/obj/machinery/light{
- dir = 8;
- light_color = "#e8eaff"
- },
-/obj/effect/turf_decal/tile/blue{
+/obj/structure/pool/Rboard,
+/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
"auE" = (
/obj/structure/bed,
/obj/item/clothing/glasses/sunglasses/blindfold,
@@ -8801,16 +8823,8 @@
/turf/open/floor/plasteel,
/area/crew_quarters/lounge)
"auN" = (
-/obj/machinery/door/airlock/maintenance{
- name = "Pool Maintenance";
- req_one_access_txt = "12"
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/crew_quarters/fitness/pool)
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
"auO" = (
/obj/structure/closet/crate/freezer,
/turf/open/floor/plating,
@@ -8833,11 +8847,23 @@
/turf/open/floor/plasteel,
/area/crew_quarters/lounge)
"auR" = (
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 6
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/obj/machinery/sleeper{
+ dir = 8
+ },
+/obj/machinery/airalarm{
+ pixel_y = 24
},
/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/area/medical/clinic)
"auS" = (
/obj/machinery/atmospherics/pipe/manifold4w/orange/hidden,
/turf/open/floor/plasteel,
@@ -8888,20 +8914,24 @@
/turf/open/floor/plasteel/stairs/right,
/area/router/service)
"auY" = (
+/obj/machinery/light{
+ dir = 1
+ },
/obj/effect/turf_decal/tile/blue{
dir = 4
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
},
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
+/obj/item/radio/intercom{
+ name = "Station Intercom (Common)";
+ pixel_y = 26
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+/obj/machinery/sleep_console{
dir = 8
},
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/medical/clinic)
"auZ" = (
/obj/structure/disposalpipe/junction/flip,
/obj/structure/cable{
@@ -8924,20 +8954,13 @@
/turf/closed/wall,
/area/hallway/secondary/civilian)
"avc" = (
+/obj/vehicle/ridden/wheelchair,
/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 10
- },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/medical/clinic)
"avd" = (
/obj/structure/sign/warning{
name = "\improper COLD TEMPERATURES";
@@ -9019,17 +9042,11 @@
/turf/open/floor/plasteel,
/area/hydroponics)
"avl" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
+/obj/machinery/holopad,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/medical/clinic)
"avm" = (
/turf/closed/wall/r_wall,
/area/hallway/secondary/civilian)
@@ -9122,11 +9139,8 @@
/turf/open/floor/plating,
/area/space/nearstation)
"avw" = (
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
- },
/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/area/medical/clinic)
"avx" = (
/obj/structure/table,
/obj/item/hand_labeler,
@@ -9162,17 +9176,17 @@
/turf/open/floor/plasteel,
/area/router/service)
"avA" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/structure/table/optable,
+/obj/machinery/light_switch{
+ pixel_x = 24
},
-/obj/effect/turf_decal/tile/yellow{
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
dir = 4
},
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
+/obj/item/reagent_containers/blood/random,
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/medical/clinic)
"avB" = (
/obj/machinery/portable_atmospherics/canister/air,
/obj/effect/turf_decal/stripes/line{
@@ -9181,14 +9195,21 @@
/turf/open/floor/plasteel,
/area/router/service)
"avC" = (
+/obj/machinery/light{
+ dir = 8;
+ light_color = "#e8eaff"
+ },
/obj/effect/turf_decal/tile/blue{
dir = 8
},
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
/obj/effect/turf_decal/stripes/line{
- dir = 1
+ dir = 4
},
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
"avD" = (
/obj/structure/rack,
/obj/item/clothing/suit/space/fragile,
@@ -9201,11 +9222,14 @@
/turf/open/floor/plasteel,
/area/router/service)
"avE" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
dir = 1
},
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/medical/clinic)
"avF" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -9220,20 +9244,13 @@
/turf/closed/wall,
/area/security/prison)
"avH" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/medical/clinic)
"avI" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/medical/clinic)
"avJ" = (
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
@@ -9243,18 +9260,20 @@
/turf/open/floor/plasteel,
/area/security/main)
"avK" = (
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 11
+ },
+/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
dir = 4
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/effect/landmark/start/assistant,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1
+/obj/item/radio/intercom{
+ name = "Station Intercom (Common)";
+ pixel_x = 26
},
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/medical/clinic)
"avL" = (
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
@@ -9294,14 +9313,19 @@
/turf/open/floor/plasteel/dark,
/area/crew_quarters/bar)
"avQ" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
+/obj/structure/closet/emcloset,
+/obj/effect/turf_decal/delivery,
+/obj/structure/cable{
+ icon_state = "0-4"
},
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
+/obj/machinery/power/apc{
+ areastring = "/area/medical/clinic";
+ dir = 8;
+ name = "Medical Booth APC";
+ pixel_x = -24
},
-/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/turf/open/floor/plasteel,
+/area/hallway/secondary/civilian)
"avR" = (
/obj/machinery/washing_machine,
/obj/machinery/light/small{
@@ -9323,17 +9347,31 @@
/turf/open/floor/plasteel,
/area/crew_quarters/bar)
"avU" = (
+/obj/machinery/door/airlock/maintenance{
+ name = "Pool Maintenance";
+ req_one_access_txt = "12"
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/fitness/cogpool)
+"avV" = (
/obj/effect/turf_decal/tile/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 8
},
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
-"avV" = (
-/obj/item/kirbyplants{
- icon_state = "plant-14"
- },
-/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
"avW" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 5
@@ -9366,19 +9404,19 @@
/area/hallway/secondary/service)
"awa" = (
/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/machinery/camera{
- c_tag = "Pool";
- dir = 1
- },
-/obj/structure/closet/secure_closet/personal,
-/obj/effect/turf_decal/tile/yellow{
dir = 8
},
-/obj/item/toy/poolnoodle/red,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 10
+ },
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
"awb" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
@@ -9408,15 +9446,16 @@
/area/maintenance/solars/port)
"awe" = (
/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/structure/closet/secure_closet/personal,
-/obj/effect/turf_decal/tile/yellow{
dir = 4
},
-/obj/item/toy/poolnoodle/blue,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
"awf" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
@@ -9531,19 +9570,17 @@
/turf/open/floor/plating,
/area/maintenance/solars/port)
"aws" = (
-/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/yellow{
dir = 4
},
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = 28
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 9
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
},
/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/area/crew_quarters/fitness/cogpool)
"awt" = (
/obj/structure/table/reinforced,
/obj/effect/turf_decal/tile/red,
@@ -9608,23 +9645,14 @@
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/barbershop)
"awA" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
/obj/effect/turf_decal/tile/blue{
dir = 8
},
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/machinery/sleeper{
- dir = 8
- },
-/obj/machinery/airalarm{
- pixel_y = 24
- },
/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/area/crew_quarters/fitness/cogpool)
"awB" = (
/obj/machinery/microwave,
/obj/effect/turf_decal/tile/bar{
@@ -9839,24 +9867,17 @@
/turf/open/floor/plasteel,
/area/storage/tools)
"awW" = (
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
+"awX" = (
+/obj/effect/turf_decal/stripes/corner{
dir = 4
},
-/obj/structure/closet/athletic_mixed,
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/item/toy/poolnoodle/yellow,
/turf/open/floor/plasteel/white,
-/area/crew_quarters/fitness/pool)
-"awX" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/maintenance{
- name = "Pool External Maintenance";
- req_access_txt = "12"
- },
-/turf/open/floor/plating,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
"awY" = (
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -9953,8 +9974,16 @@
/turf/open/floor/plating,
/area/maintenance/solars/port)
"axg" = (
-/turf/closed/wall/mineral/wood,
-/area/crew_quarters/fitness/pool)
+/obj/machinery/vending/medical,
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/clinic)
"axh" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
dir = 4
@@ -10072,11 +10101,16 @@
/turf/open/floor/plasteel,
/area/hydroponics)
"axt" = (
-/obj/structure/mineral_door/woodrustic{
- name = "Sauna"
+/obj/structure/closet/secure_closet/medical1,
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
},
-/turf/open/floor/wood,
-/area/crew_quarters/fitness/pool)
+/obj/item/clothing/mask/surgical,
+/obj/item/clothing/suit/apron/surgical,
+/obj/item/clothing/gloves/color/latex,
+/turf/open/floor/plasteel/white,
+/area/medical/clinic)
"axu" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
@@ -10265,9 +10299,14 @@
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"axM" = (
-/obj/structure/sign/warning/fire,
-/turf/closed/wall/mineral/wood,
-/area/crew_quarters/fitness/pool)
+/obj/structure/closet/secure_closet/medical2,
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/turf/open/floor/plasteel/white,
+/area/medical/clinic)
"axN" = (
/obj/machinery/light_switch{
pixel_y = 24
@@ -10311,8 +10350,25 @@
/turf/closed/wall/r_wall,
/area/hydroponics/garden)
"axR" = (
-/turf/open/floor/plating,
-/area/crew_quarters/fitness/pool)
+/obj/structure/table,
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/item/surgical_drapes,
+/obj/item/scalpel,
+/obj/item/circular_saw{
+ pixel_y = 16
+ },
+/obj/item/hemostat,
+/obj/item/retractor,
+/obj/item/surgicaldrill,
+/obj/item/cautery,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/clinic)
"axS" = (
/obj/structure/closet/crate,
/obj/item/storage/box/lights/mixed,
@@ -10341,13 +10397,18 @@
/turf/open/floor/plasteel,
/area/hydroponics/lobby)
"axV" = (
-/obj/machinery/light/small{
- dir = 1
+/obj/machinery/disposal/bin{
+ name = "Corpse Delivery"
},
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/machinery/atmospherics/components/unary/thermomachine/heater/on,
-/turf/open/floor/plating,
-/area/crew_quarters/fitness/pool)
+/obj/machinery/light,
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/blue,
+/obj/structure/disposalpipe/trunk,
+/obj/effect/turf_decal/delivery/red,
+/turf/open/floor/plasteel/white,
+/area/medical/clinic)
"axW" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
@@ -10389,12 +10450,19 @@
/turf/open/floor/plating/airless,
/area/space/nearstation)
"ayb" = (
-/obj/machinery/space_heater,
-/obj/structure/sign/poster/official/no_erp{
- pixel_y = 32
+/obj/machinery/disposal/bin,
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+ dir = 4
},
-/turf/open/floor/wood,
-/area/crew_quarters/fitness/pool)
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white,
+/area/medical/clinic)
"ayc" = (
/obj/structure/kitchenspike,
/turf/open/floor/plasteel/freezer,
@@ -10463,16 +10531,20 @@
/turf/open/floor/plasteel,
/area/security/prison)
"ayn" = (
-/turf/open/floor/wood,
-/area/crew_quarters/fitness/pool)
-"ayo" = (
-/obj/machinery/light/small{
- dir = 4;
- light_color = "#d8b1b1"
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/obj/structure/bedsheetbin/towel,
-/turf/open/floor/wood,
-/area/crew_quarters/fitness/pool)
+/turf/closed/wall,
+/area/medical/clinic)
+"ayo" = (
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
"ayp" = (
/obj/machinery/firealarm{
dir = 4;
@@ -10879,24 +10951,18 @@
/turf/open/floor/plasteel,
/area/security/brig)
"azg" = (
-/obj/machinery/light{
- dir = 1
- },
/obj/effect/turf_decal/tile/blue{
dir = 4
},
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/obj/item/radio/intercom{
- name = "Station Intercom (Common)";
- pixel_y = 26
- },
-/obj/machinery/sleep_console{
+/obj/effect/turf_decal/tile/yellow{
dir = 8
},
+/obj/effect/landmark/start/assistant,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 1
+ },
/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/area/crew_quarters/fitness/cogpool)
"azh" = (
/obj/effect/landmark/xeno_spawn,
/turf/open/floor/grass,
@@ -10981,13 +11047,14 @@
/turf/open/floor/plasteel/dark,
/area/security/brig)
"azo" = (
-/obj/vehicle/ridden/wheelchair,
/obj/effect/turf_decal/tile/blue{
- dir = 1
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/area/crew_quarters/fitness/cogpool)
"azp" = (
/obj/machinery/light_switch{
pixel_y = -24
@@ -11135,12 +11202,11 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/civilian)
"azE" = (
-/obj/machinery/portable_atmospherics/pump,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+/obj/effect/turf_decal/tile/blue{
dir = 8
},
-/turf/open/floor/plating,
-/area/crew_quarters/fitness/pool)
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
"azF" = (
/obj/effect/spawner/structure/window,
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
@@ -11545,12 +11611,11 @@
/turf/open/floor/plating,
/area/maintenance/fore)
"aAy" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 4
+/obj/item/kirbyplants{
+ icon_state = "plant-14"
},
-/obj/machinery/meter,
-/turf/closed/wall/mineral/wood,
-/area/crew_quarters/fitness/pool)
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
"aAz" = (
/obj/effect/turf_decal/tile/red{
dir = 8
@@ -12202,17 +12267,20 @@
/turf/open/floor/plating,
/area/maintenance/fore)
"aBM" = (
-/obj/machinery/power/apc{
- areastring = "/area/crew_quarters/abandoned_gambling_den";
- name = "Arcade APC";
- pixel_y = -26
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{
+/obj/effect/turf_decal/tile/blue{
dir = 4
},
-/turf/open/floor/plating,
-/area/maintenance/fore)
+/obj/machinery/camera{
+ c_tag = "Pool";
+ dir = 1
+ },
+/obj/structure/closet/secure_closet/personal,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/item/toy/poolnoodle/red,
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
"aBN" = (
/obj/structure/grille,
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
@@ -12453,12 +12521,16 @@
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet/fitness)
"aCq" = (
-/obj/structure/chair/stool,
-/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/structure/closet/secure_closet/personal,
+/obj/effect/turf_decal/tile/yellow{
dir = 4
},
-/turf/open/floor/wood,
-/area/crew_quarters/fitness/pool)
+/obj/item/toy/poolnoodle/blue,
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
"aCr" = (
/obj/structure/cable{
icon_state = "2-4"
@@ -12823,12 +12895,16 @@
/turf/open/floor/plasteel,
/area/hydroponics/lobby)
"aCZ" = (
-/obj/structure/chair/stool,
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+/obj/effect/turf_decal/tile/blue{
dir = 4
},
-/turf/open/floor/wood,
-/area/crew_quarters/fitness/pool)
+/obj/structure/closet/athletic_mixed,
+/obj/effect/turf_decal/tile/yellow{
+ dir = 8
+ },
+/obj/item/toy/poolnoodle/yellow,
+/turf/open/floor/plasteel/white,
+/area/crew_quarters/fitness/cogpool)
"aDa" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -13052,17 +13128,13 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/civilian)
"aDx" = (
-/obj/structure/chair/stool,
-/obj/machinery/camera{
- c_tag = "Pool - Sauna";
- dir = 8;
- pixel_y = -22
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/maintenance{
+ name = "Pool External Maintenance";
+ req_access_txt = "12"
},
-/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
- dir = 8
- },
-/turf/open/floor/wood,
-/area/crew_quarters/fitness/pool)
+/turf/open/floor/plating,
+/area/crew_quarters/fitness/cogpool)
"aDy" = (
/obj/effect/turf_decal/tile/green,
/obj/effect/turf_decal/tile/green{
@@ -13721,7 +13793,7 @@
pixel_x = -32
},
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aES" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
@@ -13775,7 +13847,7 @@
pixel_y = 32
},
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aEY" = (
/obj/machinery/portable_atmospherics/scrubber,
/obj/effect/turf_decal/bot,
@@ -13784,22 +13856,10 @@
},
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aEZ" = (
-/obj/machinery/portable_atmospherics/scrubber,
-/obj/effect/turf_decal/bot,
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/machinery/power/apc{
- areastring = "/area/maintenance/central";
- dir = 1;
- name = "Emergency Storage APC";
- pixel_y = 24
- },
-/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/turf/closed/wall/mineral/wood,
+/area/crew_quarters/fitness/cogpool)
"aFa" = (
/obj/structure/rack,
/obj/effect/turf_decal/bot,
@@ -13819,7 +13879,7 @@
pixel_y = 24
},
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aFb" = (
/obj/effect/turf_decal/tile/yellow{
dir = 1
@@ -13832,18 +13892,18 @@
icon_state = "1-8"
},
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aFc" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 4
+/obj/structure/mineral_door/woodrustic{
+ name = "Sauna"
},
-/turf/closed/wall/mineral/wood,
-/area/crew_quarters/fitness/pool)
+/turf/open/floor/wood,
+/area/crew_quarters/fitness/cogpool)
"aFd" = (
/obj/machinery/space_heater,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aFe" = (
/obj/machinery/photocopier,
/turf/open/floor/plasteel{
@@ -14207,7 +14267,7 @@
pixel_x = -24
},
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aFP" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/security/glass{
@@ -14226,14 +14286,14 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aFR" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
dir = 10
},
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aFS" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
@@ -14241,7 +14301,7 @@
},
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aFT" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
@@ -14274,7 +14334,7 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aFX" = (
/obj/machinery/computer/security/hos{
dir = 4
@@ -14328,7 +14388,7 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aGg" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -14376,7 +14436,7 @@
},
/obj/item/extinguisher,
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aGk" = (
/obj/effect/turf_decal/tile/yellow{
dir = 1
@@ -14596,7 +14656,7 @@
/obj/effect/turf_decal/bot,
/obj/item/clothing/glasses/meson,
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aGG" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
@@ -14612,11 +14672,9 @@
/turf/open/floor/plasteel,
/area/security/brig)
"aGH" = (
-/obj/machinery/holopad,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/obj/structure/sign/warning/fire,
+/turf/closed/wall/mineral/wood,
+/area/crew_quarters/fitness/cogpool)
"aGI" = (
/obj/structure/table,
/obj/effect/turf_decal/bot,
@@ -14683,7 +14741,7 @@
pixel_y = -1
},
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aGJ" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -14798,7 +14856,7 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aGV" = (
/obj/machinery/light{
dir = 4;
@@ -14918,7 +14976,7 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aHe" = (
/obj/structure/sign/poster/official/bless_this_spess{
pixel_y = -32
@@ -15003,7 +15061,7 @@
/obj/machinery/portable_atmospherics/canister/air,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aHn" = (
/obj/machinery/firealarm{
dir = 8;
@@ -15084,7 +15142,7 @@
/obj/effect/turf_decal/bot,
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aHx" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -15125,7 +15183,7 @@
},
/obj/item/extinguisher,
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aHC" = (
/obj/machinery/vending/cola/random,
/obj/effect/turf_decal/bot,
@@ -15197,8 +15255,8 @@
},
/area/chapel/main)
"aHL" = (
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/turf/open/floor/plating,
+/area/crew_quarters/fitness/cogpool)
"aHM" = (
/turf/open/floor/plasteel,
/area/bridge)
@@ -15270,20 +15328,13 @@
/turf/open/floor/plasteel,
/area/security/prison)
"aHU" = (
-/obj/structure/rack,
-/obj/item/clothing/suit/space/fragile,
-/obj/item/clothing/head/helmet/space/fragile,
-/obj/item/tank/internals/air,
-/obj/item/flashlight,
-/obj/item/reagent_containers/spray/cleaner,
-/obj/machinery/camera{
- c_tag = "Pool Maintenance";
- dir = 8;
- pixel_y = -22
+/obj/machinery/light/small{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/machinery/atmospherics/components/unary/thermomachine/heater/on,
/turf/open/floor/plating,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
"aHV" = (
/obj/structure/table,
/obj/item/clothing/suit/toggle/owlwings,
@@ -15389,17 +15440,12 @@
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aIf" = (
-/obj/structure/table/optable,
-/obj/machinery/light_switch{
- pixel_x = 24
+/obj/machinery/space_heater,
+/obj/structure/sign/poster/official/no_erp{
+ pixel_y = 32
},
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/item/reagent_containers/blood/random,
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/turf/open/floor/wood,
+/area/crew_quarters/fitness/cogpool)
"aIg" = (
/obj/structure/chair/office/dark{
dir = 1
@@ -15726,14 +15772,8 @@
/turf/open/floor/plasteel,
/area/tcommsat/computer)
"aIN" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/turf/open/floor/wood,
+/area/crew_quarters/fitness/cogpool)
"aIO" = (
/obj/structure/sign/directions/medical{
dir = 8;
@@ -16443,7 +16483,7 @@
"aKf" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aKg" = (
/turf/open/floor/plasteel/stairs/right,
/area/hallway/secondary/entry)
@@ -16474,9 +16514,13 @@
/turf/open/floor/plasteel,
/area/security/main)
"aKj" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/obj/machinery/light/small{
+ dir = 4;
+ light_color = "#d8b1b1"
+ },
+/obj/structure/bedsheetbin/towel,
+/turf/open/floor/wood,
+/area/crew_quarters/fitness/cogpool)
"aKk" = (
/obj/structure/chair/comfy/brown{
dir = 4
@@ -16499,7 +16543,7 @@
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aKn" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -16526,9 +16570,12 @@
/turf/open/floor/plasteel,
/area/security/brig)
"aKp" = (
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/obj/machinery/portable_atmospherics/pump,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/fitness/cogpool)
"aKq" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -16560,7 +16607,7 @@
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aKs" = (
/obj/structure/table/wood,
/obj/item/trash/plate,
@@ -16587,7 +16634,7 @@
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aKv" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
@@ -16630,7 +16677,7 @@
/area/security/brig)
"aKz" = (
/turf/closed/wall,
-/area/storage/emergency/generic)
+/area/storage/emergency)
"aKA" = (
/obj/structure/table/wood,
/obj/machinery/button/door{
@@ -17040,20 +17087,12 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/civilian)
"aLs" = (
-/obj/structure/sink{
- dir = 4;
- pixel_x = 11
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4
},
-/obj/item/radio/intercom{
- name = "Station Intercom (Common)";
- pixel_x = 26
- },
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/obj/machinery/meter,
+/turf/closed/wall/mineral/wood,
+/area/crew_quarters/fitness/cogpool)
"aLt" = (
/obj/machinery/light,
/obj/structure/disposalpipe/segment{
@@ -17162,14 +17201,12 @@
/turf/open/floor/plasteel/dark,
/area/bridge)
"aLF" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/external{
- name = "Pool Exterior Access";
- req_access_txt = "13"
+/obj/structure/chair/stool,
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
+ dir = 4
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/turf/open/floor/plating,
-/area/crew_quarters/fitness/pool)
+/turf/open/floor/wood,
+/area/crew_quarters/fitness/cogpool)
"aLG" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -17245,9 +17282,12 @@
/turf/open/floor/plasteel/dark,
/area/chapel/main)
"aLO" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/closed/wall/r_wall,
-/area/crew_quarters/fitness/pool)
+/obj/structure/chair/stool,
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/fitness/cogpool)
"aLP" = (
/obj/structure/window/reinforced{
dir = 1;
@@ -17361,8 +17401,17 @@
/turf/open/floor/carpet,
/area/security/courtroom)
"aMa" = (
-/turf/open/floor/plating/airless,
-/area/crew_quarters/fitness/pool)
+/obj/structure/chair/stool,
+/obj/machinery/camera{
+ c_tag = "Pool - Sauna";
+ dir = 8;
+ pixel_y = -22
+ },
+/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/crew_quarters/fitness/cogpool)
"aMb" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -17595,16 +17644,11 @@
},
/area/crew_quarters/bar)
"aMz" = (
-/obj/machinery/vending/medical,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+ dir = 4
},
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/turf/closed/wall/mineral/wood,
+/area/crew_quarters/fitness/cogpool)
"aMA" = (
/turf/closed/wall,
/area/janitor)
@@ -17692,16 +17736,20 @@
},
/area/chapel/main)
"aMK" = (
-/obj/structure/closet/secure_closet/medical1,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/structure/rack,
+/obj/item/clothing/suit/space/fragile,
+/obj/item/clothing/head/helmet/space/fragile,
+/obj/item/tank/internals/air,
+/obj/item/flashlight,
+/obj/item/reagent_containers/spray/cleaner,
+/obj/machinery/camera{
+ c_tag = "Pool Maintenance";
+ dir = 8;
+ pixel_y = -22
},
-/obj/item/clothing/mask/surgical,
-/obj/item/clothing/suit/apron/surgical,
-/obj/item/clothing/gloves/color/latex,
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plating,
+/area/crew_quarters/fitness/cogpool)
"aML" = (
/obj/structure/disposalpipe/segment,
/turf/closed/wall,
@@ -18075,14 +18123,14 @@
/turf/open/floor/plating,
/area/maintenance/department/chapel)
"aNx" = (
-/obj/structure/closet/secure_closet/medical2,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/external{
+ name = "Pool Exterior Access";
+ req_access_txt = "13"
},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/turf/open/floor/plating,
+/area/crew_quarters/fitness/cogpool)
"aNy" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
@@ -18150,25 +18198,9 @@
/turf/open/floor/plasteel,
/area/tcommsat/server)
"aND" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/item/surgical_drapes,
-/obj/item/scalpel,
-/obj/item/circular_saw{
- pixel_y = 16
- },
-/obj/item/hemostat,
-/obj/item/retractor,
-/obj/item/surgicaldrill,
-/obj/item/cautery,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1
- },
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall/r_wall,
+/area/crew_quarters/fitness/cogpool)
"aNE" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
dir = 9
@@ -18260,18 +18292,8 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/civilian)
"aNQ" = (
-/obj/machinery/disposal/bin{
- name = "Corpse Delivery"
- },
-/obj/machinery/light,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/structure/disposalpipe/trunk,
-/obj/effect/turf_decal/delivery/red,
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
+/turf/open/floor/plating/airless,
+/area/crew_quarters/fitness/cogpool)
"aNR" = (
/turf/closed/wall/r_wall,
/area/crew_quarters/heads/hop)
@@ -18364,20 +18386,6 @@
/turf/open/floor/plating,
/area/maintenance/department/eva)
"aOc" = (
-/obj/machinery/disposal/bin,
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/turf/open/floor/plasteel/white,
-/area/medical/medbay)
-"aOd" = (
/obj/structure/disposalpipe/segment{
dir = 6
},
@@ -18385,7 +18393,19 @@
icon_state = "0-4"
},
/turf/closed/wall,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
+"aOd" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/fitness/cogpool)
"aOe" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
@@ -18438,21 +18458,22 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/turf/open/floor/plating,
-/area/crew_quarters/fitness/pool)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/closed/wall/r_wall,
+/area/crew_quarters/fitness/cogpool)
"aOl" = (
+/obj/structure/grille,
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "0-4"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/closed/wall/r_wall,
-/area/crew_quarters/fitness/pool)
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plating,
+/area/crew_quarters/fitness/cogpool)
"aOm" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -18498,18 +18519,17 @@
/turf/open/floor/plasteel,
/area/bridge)
"aOq" = (
-/obj/structure/grille,
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable{
- icon_state = "0-4"
+ icon_state = "4-8"
},
-/obj/structure/cable{
- icon_state = "0-8"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 5
},
-/turf/open/floor/plating,
-/area/crew_quarters/fitness/pool)
+/turf/closed/wall/r_wall,
+/area/crew_quarters/fitness/cogpool)
"aOr" = (
/obj/effect/turf_decal/tile/blue{
dir = 1
@@ -18581,17 +18601,17 @@
/turf/open/floor/plasteel,
/area/security/courtroom)
"aOx" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+ dir = 8
+ },
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 5
- },
-/turf/closed/wall/r_wall,
-/area/crew_quarters/fitness/pool)
+/turf/open/floor/plating/airless,
+/area/crew_quarters/fitness/cogpool)
"aOy" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -18621,9 +18641,6 @@
/turf/closed/wall/r_wall,
/area/security/courtroom)
"aOC" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 8
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -18631,7 +18648,7 @@
icon_state = "4-8"
},
/turf/open/floor/plating/airless,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
"aOD" = (
/obj/machinery/door/airlock{
name = "Catering";
@@ -18643,14 +18660,9 @@
/turf/open/floor/plasteel/dark,
/area/crew_quarters/bar)
"aOE" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plating/airless,
-/area/crew_quarters/fitness/pool)
+/obj/structure/disposalpipe/segment,
+/turf/closed/wall/r_wall,
+/area/crew_quarters/fitness/cogpool)
"aOF" = (
/obj/item/toy/talking/owl,
/turf/open/floor/plating/asteroid,
@@ -18737,15 +18749,17 @@
/turf/open/floor/engine,
/area/engine/gravity_generator)
"aOQ" = (
-/obj/structure/disposalpipe/segment,
-/turf/closed/wall/r_wall,
-/area/crew_quarters/fitness/pool)
-"aOR" = (
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plating,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
+"aOR" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 5
+ },
+/turf/closed/wall/r_wall,
+/area/crew_quarters/fitness/cogpool)
"aOS" = (
/obj/machinery/door/firedoor,
/obj/structure/cable{
@@ -18755,22 +18769,22 @@
/area/hallway/primary/central)
"aOT" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 5
+ dir = 8
},
/turf/closed/wall/r_wall,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
"aOU" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 8
- },
-/turf/closed/wall/r_wall,
-/area/crew_quarters/fitness/pool)
-"aOV" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 8
},
/turf/closed/wall/r_wall/rust,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
+"aOV" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+ dir = 4
+ },
+/turf/open/floor/plating/airless,
+/area/crew_quarters/fitness/cogpool)
"aOW" = (
/obj/structure/closet/secure_closet/security/sec,
/obj/effect/turf_decal/bot,
@@ -18783,12 +18797,6 @@
/turf/open/floor/plasteel,
/area/security/brig)
"aOX" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 4
- },
-/turf/open/floor/plating/airless,
-/area/crew_quarters/fitness/pool)
-"aOY" = (
/obj/structure/cable{
icon_state = "1-2"
},
@@ -18800,16 +18808,19 @@
dir = 1
},
/turf/open/space/basic,
-/area/crew_quarters/fitness/pool)
+/area/crew_quarters/fitness/cogpool)
+"aOY" = (
+/obj/structure/lattice,
+/turf/closed/wall/r_wall,
+/area/crew_quarters/fitness/cogpool)
"aOZ" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel,
/area/bridge)
"aPa" = (
-/obj/structure/lattice,
/turf/closed/wall/r_wall,
-/area/crew_quarters/fitness/pool)
+/area/engine/substation)
"aPb" = (
/obj/structure/grille,
/turf/open/floor/plating,
@@ -19776,11 +19787,11 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/civilian)
"aRj" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/turf/closed/wall,
-/area/medical/medbay)
+/turf/closed/wall/r_wall,
+/area/engine/substation)
"aRk" = (
/obj/structure/disposalpipe/junction/yjunction,
/obj/structure/cable{
@@ -19955,7 +19966,7 @@
"aRF" = (
/obj/structure/disposalpipe/segment,
/turf/closed/wall/r_wall,
-/area/engine/storage_shared)
+/area/engine/substation)
"aRG" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/pipe/simple/supply/visible,
@@ -20668,9 +20679,11 @@
/turf/open/space/basic,
/area/space/nearstation)
"aTm" = (
-/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
/turf/open/floor/plating,
-/area/engine/supermatter)
+/area/engine/substation)
"aTn" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -20761,23 +20774,30 @@
/turf/open/floor/plasteel,
/area/bridge)
"aTv" = (
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
-"aTw" = (
-/obj/machinery/door/airlock/engineering{
- name = "Thermo-Electric Generator";
- req_one_access_txt = "10;24"
+/obj/structure/cable{
+ icon_state = "0-4"
},
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "0-8"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+/obj/machinery/power/smes{
+ charge = 5e+006
},
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/door/firedoor/heavy,
-/turf/open/floor/plasteel,
-/area/engine/supermatter)
+/turf/open/floor/plating,
+/area/engine/substation)
+"aTw" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/power/apc/highcap/fifteen_k{
+ areastring = "/area/engine/substation";
+ dir = 1;
+ name = "Electrical Substation APC";
+ pixel_y = 26
+ },
+/turf/open/floor/plating,
+/area/engine/substation)
"aTx" = (
/obj/structure/lattice,
/obj/structure/sign/warning{
@@ -20795,15 +20815,12 @@
/turf/open/space/basic,
/area/space/nearstation)
"aTz" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 5
+/obj/machinery/camera{
+ c_tag = "Electrical Substation";
+ dir = 1
},
/turf/open/floor/plating,
-/area/engine/supermatter)
+/area/engine/substation)
"aTA" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -21014,12 +21031,17 @@
/turf/open/floor/plasteel,
/area/security/courtroom)
"aTZ" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/obj/structure/cable{
- icon_state = "2-4"
+/obj/structure/disposalpipe/segment{
+ dir = 6
},
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/power/terminal{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/engine/substation)
"aUa" = (
/obj/machinery/light_switch{
pixel_x = 24
@@ -21029,11 +21051,11 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/civilian)
"aUb" = (
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/structure/disposalpipe/segment{
+ dir = 9
},
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/turf/open/floor/plating,
+/area/engine/substation)
"aUc" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -21047,32 +21069,24 @@
/turf/open/floor/plating,
/area/maintenance/port/central)
"aUd" = (
-/obj/machinery/light_switch{
- pixel_y = 24
- },
+/obj/structure/disposalpipe/segment,
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "1-2"
},
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/obj/machinery/door/airlock/engineering{
+ name = "Electrical Substation";
+ req_access_txt = "10"
+ },
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/engine/substation)
"aUe" = (
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/engine/teg)
"aUf" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/camera{
- c_tag = "Thermo-Electric Generator"
- },
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/turf/closed/wall/r_wall,
+/area/engine/teg)
"aUg" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -21155,25 +21169,34 @@
/turf/closed/wall/r_wall,
/area/crew_quarters/lounge/jazz)
"aUr" = (
-/obj/machinery/firealarm{
- pixel_y = 26
+/obj/machinery/door/airlock/engineering{
+ name = "Thermo-Electric Generator";
+ req_one_access_txt = "10;24"
},
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "1-2"
},
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/door/firedoor/heavy,
+/turf/open/floor/plasteel,
+/area/engine/teg)
"aUs" = (
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"aUt" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
- icon_state = "2-8"
+ icon_state = "1-4"
},
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 5
+ },
+/turf/open/floor/plating,
+/area/engine/teg)
"aUu" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -21452,11 +21475,12 @@
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
"aVb" = (
-/obj/machinery/atmospherics/components/binary/pump/on{
- dir = 8
+/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/obj/structure/cable{
+ icon_state = "2-4"
},
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
+/turf/open/floor/engine,
+/area/engine/teg)
"aVc" = (
/obj/effect/turf_decal/tile/red{
dir = 8
@@ -21486,12 +21510,11 @@
/turf/open/floor/plating,
/area/maintenance/port/central)
"aVf" = (
-/obj/machinery/atmospherics/components/binary/valve/digital{
- dir = 4;
- name = "generator to hot loop"
+/obj/structure/cable{
+ icon_state = "4-8"
},
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
"aVg" = (
/obj/machinery/computer/cryopod{
pixel_y = 28
@@ -21676,13 +21699,14 @@
/turf/open/floor/circuit/green,
/area/crew_quarters/cryopod)
"aVB" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible,
-/obj/machinery/meter,
+/obj/machinery/light_switch{
+ pixel_y = 24
+ },
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "4-8"
},
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
"aVC" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -22050,14 +22074,14 @@
/turf/open/floor/plating,
/area/hallway/primary/port/fore)
"aWs" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 4
+/obj/structure/cable{
+ icon_state = "1-8"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 9
+/obj/structure/cable{
+ icon_state = "1-4"
},
-/turf/open/floor/plasteel/dark,
-/area/engine/supermatter)
+/turf/open/floor/engine,
+/area/engine/teg)
"aWt" = (
/obj/machinery/light/small{
dir = 4
@@ -22319,14 +22343,14 @@
},
/area/crew_quarters/lounge/jazz)
"aWV" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 10
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+/obj/machinery/camera{
+ c_tag = "Thermo-Electric Generator"
},
-/turf/open/floor/plasteel/dark,
-/area/engine/supermatter)
+/turf/open/floor/engine,
+/area/engine/teg)
"aWW" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -22340,19 +22364,14 @@
/turf/open/floor/plating,
/area/maintenance/central)
"aWX" = (
-/obj/structure/closet/emcloset,
-/obj/effect/turf_decal/delivery,
+/obj/machinery/firealarm{
+ pixel_y = 26
+ },
/obj/structure/cable{
- icon_state = "0-4"
+ icon_state = "4-8"
},
-/obj/machinery/power/apc{
- areastring = "/area/medical";
- dir = 8;
- name = "Medical Booth APC";
- pixel_x = -24
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/civilian)
+/turf/open/floor/engine,
+/area/engine/teg)
"aWY" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
@@ -22424,11 +22443,12 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aXh" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/obj/structure/cable{
+ icon_state = "2-8"
},
-/turf/open/floor/plasteel/dark,
-/area/engine/supermatter)
+/turf/open/floor/engine,
+/area/engine/teg)
"aXi" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/turf/open/floor/plasteel,
@@ -22611,7 +22631,7 @@
name = "gas to hot loop"
},
/turf/open/floor/plasteel/dark,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"aXG" = (
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/tile/blue,
@@ -22683,14 +22703,11 @@
/turf/open/floor/plasteel,
/area/security/brig)
"aXP" = (
-/obj/machinery/atmospherics/pipe/simple/supply/visible{
- dir = 6
+/obj/machinery/atmospherics/components/binary/pump/on{
+ dir = 8
},
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/engine/supermatter)
+/turf/closed/wall/r_wall,
+/area/engine/teg)
"aXQ" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/transit_tube/horizontal,
@@ -22793,14 +22810,12 @@
/turf/open/floor/plasteel,
/area/tcommsat/computer)
"aYb" = (
-/obj/machinery/atmospherics/pipe/simple/supply/visible{
- dir = 4
+/obj/machinery/atmospherics/components/binary/valve/digital{
+ dir = 4;
+ name = "generator to hot loop"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/turf/open/floor/plasteel/dark,
-/area/engine/supermatter)
+/turf/open/floor/engine,
+/area/engine/teg)
"aYc" = (
/obj/effect/landmark/start/assistant,
/turf/open/floor/wood,
@@ -22838,20 +22853,22 @@
/turf/open/floor/plasteel,
/area/bridge)
"aYi" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/visible,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible,
/obj/machinery/meter,
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
"aYj" = (
-/obj/machinery/atmospherics/components/binary/valve/digital{
- dir = 4;
- name = "cold loop to generator"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+ dir = 4
},
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/turf/open/floor/plasteel/dark,
+/area/engine/teg)
"aYk" = (
/turf/open/floor/circuit/green,
/area/ai_monitored/nuke_storage)
@@ -23240,8 +23257,14 @@
},
/area/maintenance/department/eva)
"aZc" = (
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+ dir = 10
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/engine/teg)
"aZd" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command{
@@ -23271,11 +23294,11 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/nuke_storage)
"aZg" = (
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
},
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/turf/open/floor/plasteel/dark,
+/area/engine/teg)
"aZh" = (
/obj/structure/closet/crate,
/obj/machinery/light,
@@ -23424,12 +23447,14 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/nuke_storage)
"aZt" = (
-/obj/structure/window/reinforced/spawner/east,
+/obj/machinery/atmospherics/pipe/simple/supply/visible{
+ dir = 6
+ },
/obj/effect/turf_decal/stripes/line{
- dir = 8
+ dir = 1
},
/turf/open/floor/plasteel/dark,
-/area/engine/supermatter)
+/area/engine/teg)
"aZu" = (
/obj/machinery/blackbox_recorder,
/obj/effect/turf_decal/bot_white,
@@ -23878,10 +23903,14 @@
/turf/open/space/basic,
/area/space/nearstation)
"ban" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
-/turf/open/floor/plating,
-/area/engine/supermatter)
+/obj/machinery/atmospherics/pipe/simple/supply/visible{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/turf/open/floor/plasteel/dark,
+/area/engine/teg)
"bao" = (
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/stripes/white/full,
@@ -24150,15 +24179,20 @@
},
/area/lawoffice)
"baT" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/sign/warning/electricshock,
-/turf/open/floor/plating,
-/area/engine/supermatter)
+/obj/machinery/atmospherics/pipe/manifold/supply/visible,
+/obj/machinery/meter,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/engine,
+/area/engine/teg)
"baU" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/simple/supply/visible,
-/turf/open/floor/plating,
-/area/engine/supermatter)
+/obj/machinery/atmospherics/components/binary/valve/digital{
+ dir = 4;
+ name = "cold loop to generator"
+ },
+/turf/open/floor/engine,
+/area/engine/teg)
"baV" = (
/obj/structure/disposalpipe/trunk{
dir = 1
@@ -24282,12 +24316,8 @@
/turf/closed/wall,
/area/hallway/primary/aft)
"bbi" = (
-/obj/structure/window/reinforced/spawner/west,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/engine/supermatter)
+/turf/open/floor/engine,
+/area/engine/teg)
"bbj" = (
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/closed/wall/r_wall,
@@ -24368,11 +24398,8 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/structure/cable{
- icon_state = "2-4"
- },
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
"bbu" = (
/obj/structure/grille,
/obj/structure/cable,
@@ -24401,16 +24428,12 @@
/turf/open/floor/plasteel,
/area/quartermaster/office)
"bbx" = (
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/structure/window/reinforced/spawner/east,
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
},
-/obj/item/radio/intercom{
- dir = 8;
- name = "Station Intercom (Common)";
- pixel_x = 28
- },
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/turf/open/floor/plasteel/dark,
+/area/engine/teg)
"bby" = (
/obj/effect/turf_decal/tile/brown{
dir = 4
@@ -24422,11 +24445,10 @@
/turf/open/floor/plasteel,
/area/quartermaster/office)
"bbz" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
+/turf/open/floor/plating,
+/area/engine/teg)
"bbA" = (
/obj/effect/turf_decal/tile/purple{
dir = 8
@@ -24464,15 +24486,10 @@
/turf/open/floor/plasteel/dark,
/area/bridge)
"bbE" = (
-/obj/structure/window/reinforced/spawner/east,
-/obj/machinery/light{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/engine/supermatter)
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/sign/warning/electricshock,
+/turf/open/floor/plating,
+/area/engine/teg)
"bbF" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 6
@@ -24489,15 +24506,10 @@
/turf/open/floor/plasteel/dark,
/area/bridge)
"bbH" = (
-/obj/machinery/atmospherics/components/binary/circulator{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/atmospherics/pipe/simple/supply/visible,
+/turf/open/floor/plating,
+/area/engine/teg)
"bbI" = (
/obj/machinery/light,
/turf/open/floor/plasteel,
@@ -24630,16 +24642,12 @@
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"bbZ" = (
-/obj/machinery/power/generator,
+/obj/structure/window/reinforced/spawner/west,
/obj/effect/turf_decal/stripes/line{
- dir = 1
+ dir = 4
},
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/cable/yellow{
- icon_state = "0-2"
- },
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/turf/open/floor/plasteel/dark,
+/area/engine/teg)
"bca" = (
/turf/open/floor/engine/vacuum,
/area/engine/atmos)
@@ -24657,15 +24665,14 @@
/turf/closed/wall/r_wall,
/area/crew_quarters/lounge/jazz)
"bcd" = (
-/obj/machinery/atmospherics/components/binary/circulator/cold{
- dir = 8
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+/obj/structure/cable{
+ icon_state = "2-4"
},
-/obj/effect/turf_decal/stripes/line,
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
"bce" = (
/obj/structure/plasticflaps,
/obj/machinery/conveyor/auto{
@@ -24802,24 +24809,22 @@
/turf/open/floor/plasteel/dark,
/area/security/courtroom/jury)
"bcu" = (
-/obj/structure/window/reinforced/spawner/west,
-/obj/machinery/light{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/engine/supermatter)
-"bcv" = (
/obj/structure/cable{
- icon_state = "2-4"
+ icon_state = "4-8"
},
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/item/radio/intercom{
+ dir = 8;
+ name = "Station Intercom (Common)";
+ pixel_x = 28
},
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
+"bcv" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/closed/wall/r_wall,
+/area/engine/teg)
"bcw" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
@@ -24869,20 +24874,15 @@
/turf/open/floor/plasteel,
/area/gateway)
"bcD" = (
-/obj/structure/table/reinforced,
-/obj/item/analyzer,
-/obj/item/t_scanner,
-/obj/structure/cable{
- icon_state = "0-8"
+/obj/structure/window/reinforced/spawner/east,
+/obj/machinery/light{
+ dir = 4
},
-/obj/machinery/power/apc{
- areastring = "/area/engine/supermatter";
- dir = 4;
- name = "Thermo-Electric Generator APC";
- pixel_x = 24
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
},
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/turf/open/floor/plasteel/dark,
+/area/engine/teg)
"bcE" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
@@ -24971,11 +24971,15 @@
/turf/open/floor/plasteel,
/area/security/courtroom)
"bcO" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
-/obj/effect/turf_decal/delivery,
-/obj/structure/window/reinforced/spawner,
+/obj/machinery/atmospherics/components/binary/circulator{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
"bcP" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -25081,12 +25085,16 @@
/turf/open/floor/engine/vacuum,
/area/science/mixing)
"bdd" = (
-/obj/effect/turf_decal/delivery,
+/obj/machinery/power/generator,
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
/obj/structure/cable/yellow{
- icon_state = "1-2"
+ icon_state = "0-2"
},
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
"bde" = (
/obj/structure/sign/warning/vacuum/external{
pixel_y = 32
@@ -25102,12 +25110,15 @@
/turf/open/floor/plating,
/area/hallway/primary/central)
"bdh" = (
-/obj/machinery/atmospherics/pipe/simple/supply/visible,
-/obj/effect/turf_decal/delivery,
-/obj/item/extinguisher,
-/obj/structure/window/reinforced/spawner,
+/obj/machinery/atmospherics/components/binary/circulator/cold{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
"bdi" = (
/obj/structure/sign/warning/electricshock,
/turf/closed/wall/r_wall,
@@ -25135,13 +25146,15 @@
/turf/open/floor/plasteel,
/area/engine/storage)
"bdl" = (
-/obj/structure/table/reinforced,
-/obj/item/grenade/chem_grenade/smart_metal_foam{
- pixel_x = 4
+/obj/structure/window/reinforced/spawner/west,
+/obj/machinery/light{
+ dir = 8
},
-/obj/item/radio,
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/engine/teg)
"bdm" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -25418,11 +25431,14 @@
/turf/open/floor/plating,
/area/engine/engineering)
"bdP" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 10
+/obj/structure/cable{
+ icon_state = "2-4"
},
-/turf/open/floor/plasteel/dark,
-/area/engine/supermatter)
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/engine,
+/area/engine/teg)
"bdQ" = (
/obj/machinery/door/airlock/command{
name = "Bridge";
@@ -25467,11 +25483,20 @@
/turf/open/floor/plasteel,
/area/quartermaster/office)
"bdW" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
-/obj/structure/window/reinforced/spawner/east,
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plasteel/dark,
-/area/engine/supermatter)
+/obj/structure/table/reinforced,
+/obj/item/analyzer,
+/obj/item/t_scanner,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/power/apc{
+ areastring = "/area/engine/teg";
+ dir = 4;
+ name = "Thermo-Electric Generator APC";
+ pixel_x = 24
+ },
+/turf/open/floor/engine,
+/area/engine/teg)
"bdX" = (
/obj/structure/table/wood,
/obj/item/storage/box/donkpockets,
@@ -25481,11 +25506,11 @@
},
/area/chapel/main)
"bdY" = (
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel/stairs,
-/area/engine/supermatter)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
+/obj/effect/turf_decal/delivery,
+/obj/structure/window/reinforced/spawner,
+/turf/open/floor/engine,
+/area/engine/teg)
"bdZ" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -25542,11 +25567,12 @@
/turf/open/floor/plating/airless,
/area/science/test_area)
"bei" = (
-/obj/machinery/atmospherics/pipe/simple/supply/visible,
-/obj/structure/window/reinforced/spawner/west,
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plasteel/dark,
-/area/engine/supermatter)
+/obj/effect/turf_decal/delivery,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/turf/open/floor/engine,
+/area/engine/teg)
"bej" = (
/turf/open/floor/plasteel,
/area/quartermaster/sorting)
@@ -25567,11 +25593,12 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bem" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
-/turf/open/floor/plasteel/dark,
-/area/engine/supermatter)
+/obj/machinery/atmospherics/pipe/simple/supply/visible,
+/obj/effect/turf_decal/delivery,
+/obj/item/extinguisher,
+/obj/structure/window/reinforced/spawner,
+/turf/open/floor/engine,
+/area/engine/teg)
"ben" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -25601,23 +25628,24 @@
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/hor)
"beq" = (
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
- dir = 4
+/obj/structure/table/reinforced,
+/obj/item/grenade/chem_grenade/smart_metal_foam{
+ pixel_x = 4
},
+/obj/item/radio,
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
"ber" = (
/obj/effect/turf_decal/delivery,
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"bes" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
},
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
+/turf/open/floor/plasteel/dark,
+/area/engine/teg)
"bet" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
@@ -25985,11 +26013,11 @@
/turf/open/floor/plating,
/area/maintenance/department/security)
"bfn" = (
-/obj/machinery/atmospherics/components/binary/pump/on{
- dir = 4
- },
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
+/obj/structure/window/reinforced/spawner/east,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel/dark,
+/area/engine/teg)
"bfo" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 4
@@ -26069,12 +26097,11 @@
},
/area/gateway)
"bfv" = (
-/obj/machinery/atmospherics/components/binary/valve/digital{
- dir = 4;
- name = "hot loop to generator"
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
},
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/turf/open/floor/plasteel/stairs,
+/area/engine/teg)
"bfw" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
@@ -26095,15 +26122,11 @@
/turf/open/floor/plasteel/white,
/area/gateway)
"bfy" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 4
- },
-/obj/machinery/meter,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/obj/machinery/atmospherics/pipe/simple/supply/visible,
+/obj/structure/window/reinforced/spawner/west,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel/dark,
+/area/engine/teg)
"bfz" = (
/obj/structure/disposalpipe/segment,
/obj/effect/landmark/event_spawn,
@@ -26161,11 +26184,11 @@
/turf/open/floor/plating,
/area/quartermaster/sorting)
"bfF" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
- dir = 4
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
},
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/turf/open/floor/plasteel/dark,
+/area/engine/teg)
"bfG" = (
/obj/machinery/conveyor{
dir = 4;
@@ -26188,17 +26211,18 @@
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"bfI" = (
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/turf/open/floor/plating,
-/area/engine/storage_shared)
-"bfJ" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk{
dir = 4
},
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
+"bfJ" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/closed/wall/r_wall,
+/area/engine/teg)
"bfK" = (
/obj/structure/table/wood,
/obj/item/storage/fancy/candle_box{
@@ -26231,11 +26255,23 @@
},
/area/chapel/office)
"bfM" = (
-/obj/structure/cable/yellow{
- icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
+/obj/structure/table,
+/obj/machinery/light_switch{
+ pixel_x = 24
},
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/obj/item/clothing/ears/earmuffs,
+/obj/item/extinguisher{
+ pixel_x = -12;
+ pixel_y = -2
+ },
+/obj/machinery/camera{
+ c_tag = "Engineering - Hot Loop";
+ dir = 8;
+ pixel_y = -22
+ },
+/turf/open/floor/plasteel,
+/area/engine/teg/hotloop)
"bfN" = (
/obj/effect/decal/cleanable/cobweb,
/obj/effect/decal/cleanable/dirt,
@@ -26704,11 +26740,11 @@
/turf/open/floor/plasteel,
/area/quartermaster/warehouse)
"bgJ" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/visible{
- dir = 8
+/obj/machinery/atmospherics/components/binary/pump/on{
+ dir = 4
},
-/turf/open/floor/engine,
-/area/engine/supermatter)
+/turf/closed/wall/r_wall,
+/area/engine/teg)
"bgK" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -26764,11 +26800,12 @@
/turf/closed/wall,
/area/quartermaster/qm)
"bgR" = (
-/obj/machinery/atmospherics/pipe/simple/supply/visible{
- dir = 4
+/obj/machinery/atmospherics/components/binary/valve/digital{
+ dir = 4;
+ name = "hot loop to generator"
},
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
"bgS" = (
/obj/machinery/computer/bounty,
/obj/effect/turf_decal/tile/brown{
@@ -26820,7 +26857,7 @@
/turf/open/floor/plasteel,
/area/quartermaster/office)
"bha" = (
-/obj/machinery/atmospherics/pipe/simple/supply/visible{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4
},
/obj/machinery/meter,
@@ -26828,7 +26865,7 @@
icon_state = "1-2"
},
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
"bhb" = (
/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{
dir = 1
@@ -26836,12 +26873,11 @@
/turf/open/floor/plasteel,
/area/quartermaster/office)
"bhc" = (
-/obj/machinery/atmospherics/components/binary/valve/digital{
- dir = 4;
- name = "generator to cold loop"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+ dir = 4
},
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
"bhd" = (
/obj/effect/turf_decal/tile/brown{
dir = 4
@@ -27922,12 +27958,11 @@
/turf/open/floor/plating,
/area/maintenance/starboard/central)
"bjx" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
+ dir = 4
},
-/turf/open/floor/plating,
-/area/engine/supermatter)
+/turf/open/floor/engine,
+/area/engine/teg)
"bjy" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -28070,14 +28105,11 @@
/turf/open/floor/plasteel,
/area/storage/primary)
"bjL" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "1-8"
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
},
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
"bjM" = (
/obj/machinery/door/airlock/public/glass{
name = "Atmospherics Storage";
@@ -28265,11 +28297,11 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bkf" = (
-/obj/machinery/atmospherics/components/binary/valve/digital{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/supply/visible{
+ dir = 8
},
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
"bkg" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/mineral/stacking_unit_console{
@@ -28342,35 +28374,28 @@
/turf/open/floor/plasteel,
/area/science/circuit)
"bkp" = (
-/obj/machinery/light/small,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
-/turf/open/floor/engine,
-/area/engine/supermatter)
-"bkq" = (
-/obj/machinery/firealarm{
- dir = 1;
- pixel_y = -26
- },
-/obj/machinery/atmospherics/components/binary/valve/digital{
+/obj/machinery/atmospherics/pipe/simple/supply/visible{
dir = 4
},
/turf/open/floor/engine,
-/area/engine/supermatter)
-"bkr" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
- dir = 8
+/area/engine/teg)
+"bkq" = (
+/obj/machinery/atmospherics/pipe/simple/supply/visible{
+ dir = 4
},
+/obj/machinery/meter,
/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/item/radio/intercom{
- name = "Station Intercom (Common)";
- pixel_y = -29
+ icon_state = "1-2"
},
/turf/open/floor/engine,
-/area/engine/supermatter)
+/area/engine/teg)
+"bkr" = (
+/obj/machinery/atmospherics/components/binary/valve/digital{
+ dir = 4;
+ name = "generator to cold loop"
+ },
+/turf/open/floor/engine,
+/area/engine/teg)
"bks" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -28818,8 +28843,12 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"blp" = (
-/turf/closed/wall/r_wall,
-/area/hallway/secondary/exit)
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plating,
+/area/engine/teg)
"blq" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -29232,13 +29261,20 @@
},
/area/crew_quarters/heads/hor)
"bme" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/hallway/secondary/exit)
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/open/floor/engine,
+/area/engine/teg)
"bmf" = (
-/obj/structure/sign/departments/evac,
-/turf/closed/wall/r_wall,
-/area/hallway/secondary/exit)
+/obj/machinery/atmospherics/components/binary/valve/digital{
+ dir = 4
+ },
+/turf/open/floor/engine,
+/area/engine/teg)
"bmg" = (
/obj/effect/turf_decal/tile/green{
dir = 4
@@ -29641,16 +29677,12 @@
/turf/open/floor/plating,
/area/maintenance/disposal)
"bmT" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
-/obj/machinery/door/airlock/engineering/glass{
- name = "Thermo-Electric Generator";
- req_one_access_txt = "10;24"
+/obj/machinery/light/small,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/firedoor/heavy,
-/turf/open/floor/plasteel,
-/area/engine/supermatter)
+/turf/open/floor/engine,
+/area/engine/teg)
"bmU" = (
/obj/structure/table/wood,
/obj/machinery/light{
@@ -29852,12 +29884,15 @@
/turf/open/floor/plasteel,
/area/quartermaster/sorting)
"bni" = (
-/obj/structure/sign/warning/fire,
-/obj/structure/cable/yellow{
- icon_state = "1-2"
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = -26
},
-/turf/closed/wall/r_wall,
-/area/engine/supermatter)
+/obj/machinery/atmospherics/components/binary/valve/digital{
+ dir = 4
+ },
+/turf/open/floor/engine,
+/area/engine/teg)
"bnj" = (
/obj/structure/sign/warning/securearea{
desc = "A warning sign which reads 'BOMB RANGE";
@@ -29892,16 +29927,18 @@
/turf/closed/wall/r_wall,
/area/science/mixing)
"bnn" = (
-/obj/machinery/atmospherics/pipe/simple/supply/visible,
-/obj/machinery/door/airlock/engineering/glass{
- name = "Thermo-Electric Generator";
- req_one_access_txt = "10;24"
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+ dir = 8
},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/firedoor/heavy,
-/turf/open/floor/plasteel,
-/area/engine/supermatter)
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/item/radio/intercom{
+ name = "Station Intercom (Common)";
+ pixel_y = -29
+ },
+/turf/open/floor/engine,
+/area/engine/teg)
"bno" = (
/obj/structure/chair/comfy/brown{
dir = 8
@@ -29949,17 +29986,21 @@
/turf/closed/wall/r_wall,
/area/maintenance/department/eva)
"bnt" = (
-/obj/structure/cable{
- icon_state = "0-4"
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
},
+/obj/structure/disposalpipe/segment,
/obj/structure/cable{
icon_state = "0-8"
},
-/obj/machinery/power/smes{
- charge = 5e+006
+/obj/machinery/power/apc{
+ areastring = "/area/engine/teg/coldloop";
+ dir = 4;
+ name = "Cold Loop APC";
+ pixel_x = 24
},
-/turf/open/floor/plating,
-/area/engine/storage_shared)
+/turf/open/floor/plasteel,
+/area/engine/teg/coldloop)
"bnu" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -30119,9 +30160,16 @@
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"bnO" = (
-/obj/machinery/status_display,
-/turf/closed/wall/r_wall,
-/area/hallway/secondary/exit)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
+/obj/machinery/door/airlock/engineering/glass{
+ name = "Thermo-Electric Generator";
+ req_one_access_txt = "10;24"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/door/firedoor/heavy,
+/turf/open/floor/plasteel,
+/area/engine/teg)
"bnP" = (
/obj/effect/turf_decal/plaque{
icon_state = "L11"
@@ -30224,9 +30272,12 @@
/turf/open/floor/plasteel,
/area/security/checkpoint/supply)
"bnY" = (
-/obj/structure/flora/ausbushes/sunnybush,
-/turf/open/floor/grass,
-/area/hallway/secondary/exit)
+/obj/structure/sign/warning/fire,
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/turf/closed/wall/r_wall,
+/area/engine/teg)
"bnZ" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
@@ -30302,11 +30353,16 @@
/turf/open/floor/plasteel,
/area/science/server)
"bog" = (
-/obj/machinery/light{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/visible,
+/obj/machinery/door/airlock/engineering/glass{
+ name = "Thermo-Electric Generator";
+ req_one_access_txt = "10;24"
},
-/turf/open/floor/grass,
-/area/hallway/secondary/exit)
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/door/firedoor/heavy,
+/turf/open/floor/plasteel,
+/area/engine/teg)
"boh" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -30364,16 +30420,17 @@
/turf/open/floor/plasteel/dark,
/area/teleporter)
"bom" = (
-/obj/structure/flora/ausbushes/leafybush,
-/turf/open/floor/grass,
-/area/hallway/secondary/exit)
-"bon" = (
-/obj/machinery/vending/coffee,
-/obj/effect/turf_decal/tile/green{
+/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
dir = 4
},
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/turf/closed/wall/r_wall,
+/area/engine/atmos/aftair)
+"bon" = (
+/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{
+ dir = 1
+ },
+/turf/closed/wall/r_wall,
+/area/engine/atmos/aftair)
"boo" = (
/obj/effect/turf_decal/tile/blue{
dir = 1
@@ -30467,25 +30524,18 @@
/turf/open/floor/plating,
/area/engine/engineering)
"box" = (
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
+ dir = 10
+ },
+/turf/closed/wall/r_wall,
+/area/engine/atmos/aftair)
"boy" = (
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/turf/open/floor/plasteel/white/corner,
-/area/hallway/secondary/exit)
+/turf/closed/wall/r_wall,
+/area/engine/atmos/aftair)
"boz" = (
-/obj/machinery/vending/cigarette,
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/turf/open/floor/plasteel/white/corner{
- dir = 1
- },
-/area/hallway/secondary/exit)
+/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/turf/open/floor/plating,
+/area/engine/atmos/aftair)
"boA" = (
/turf/closed/wall,
/area/security/detectives_office)
@@ -30811,13 +30861,19 @@
/turf/open/floor/plasteel,
/area/science/server)
"bpi" = (
-/obj/structure/flora/junglebush/b,
-/turf/open/floor/grass,
-/area/hallway/secondary/exit)
+/obj/machinery/firealarm{
+ pixel_y = 26
+ },
+/obj/machinery/atmospherics/components/binary/valve/digital/on,
+/turf/open/floor/plating,
+/area/engine/atmos/aftair)
"bpj" = (
-/obj/structure/flora/junglebush,
-/turf/open/floor/grass,
-/area/hallway/secondary/exit)
+/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/obj/machinery/camera{
+ c_tag = "Aft Maintenance - Air Hookup"
+ },
+/turf/open/floor/plating,
+/area/engine/atmos/aftair)
"bpk" = (
/obj/effect/turf_decal/tile/brown{
dir = 4
@@ -31093,18 +31149,14 @@
/turf/open/floor/carpet/red,
/area/security/brig)
"bpT" = (
-/obj/structure/window/reinforced/spawner,
-/turf/open/floor/grass,
-/area/hallway/secondary/exit)
+/obj/machinery/atmospherics/components/binary/valve/digital/on,
+/turf/open/floor/plating,
+/area/engine/atmos/aftair)
"bpU" = (
-/obj/structure/chair{
- dir = 4
- },
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/turf/open/floor/plasteel/white/corner,
-/area/hallway/secondary/exit)
+/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/obj/machinery/portable_atmospherics/canister/air,
+/turf/open/floor/plating,
+/area/engine/atmos/aftair)
"bpV" = (
/obj/effect/turf_decal/tile/green{
dir = 8
@@ -31258,16 +31310,11 @@
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"bqp" = (
-/obj/structure/chair{
- dir = 8
+/obj/machinery/atmospherics/components/binary/valve/digital/on{
+ dir = 4
},
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/turf/open/floor/plasteel/white/corner{
- dir = 1
- },
-/area/hallway/secondary/exit)
+/turf/closed/wall/r_wall,
+/area/engine/atmos/aftair)
"bqq" = (
/obj/machinery/chem_master,
/obj/effect/turf_decal/stripes/line,
@@ -31466,33 +31513,17 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bqL" = (
-/obj/structure/chair{
+/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 4
},
-/obj/machinery/light_switch{
- pixel_x = -24
- },
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/turf/open/floor/plasteel/white/corner{
- dir = 1
- },
-/area/hallway/secondary/exit)
+/turf/open/floor/plating,
+/area/engine/atmos/aftair)
"bqM" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/green{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+ dir = 5
},
-/obj/item/storage/dice,
-/obj/item/toy/cards/deck,
-/turf/open/floor/plasteel/white/corner{
- dir = 1
- },
-/area/hallway/secondary/exit)
+/turf/open/floor/plating,
+/area/engine/atmos/aftair)
"bqN" = (
/obj/structure/table/glass,
/obj/effect/turf_decal/tile/yellow{
@@ -31550,16 +31581,12 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/lobby)
"bqU" = (
-/obj/structure/chair{
- dir = 8
- },
-/obj/effect/turf_decal/tile/green{
+/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 4
},
-/turf/open/floor/plasteel/white/corner{
- dir = 1
- },
-/area/hallway/secondary/exit)
+/obj/effect/landmark/event_spawn,
+/turf/open/floor/plating,
+/area/engine/atmos/aftair)
"bqV" = (
/obj/effect/turf_decal/tile/yellow{
dir = 8
@@ -31803,20 +31830,19 @@
/turf/open/floor/plating,
/area/engine/engineering)
"brv" = (
-/obj/machinery/disposal/bin,
-/obj/machinery/light{
- dir = 1
+/obj/machinery/portable_atmospherics/canister/air,
+/obj/machinery/atmospherics/pipe/simple/general/visible,
+/obj/structure/cable{
+ icon_state = "0-4"
},
-/obj/effect/turf_decal/tile/green{
- dir = 4
+/obj/machinery/power/apc{
+ areastring = "/area/engine/atmos/airaft";
+ dir = 8;
+ name = "Aft Air Hookup APC";
+ pixel_x = -24
},
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/turf/open/floor/plasteel/white/corner{
- dir = 1
- },
-/area/hallway/secondary/exit)
+/turf/open/floor/plating,
+/area/engine/atmos/aftair)
"brw" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -31986,16 +32012,11 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"brN" = (
-/obj/effect/turf_decal/tile/green{
- dir = 4
+/obj/structure/cable{
+ icon_state = "2-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plasteel/white/corner{
- dir = 1
- },
-/area/hallway/secondary/exit)
+/turf/open/floor/plating,
+/area/engine/atmos/aftair)
"brO" = (
/obj/machinery/firealarm{
dir = 1;
@@ -32876,28 +32897,15 @@
/turf/closed/wall/r_wall,
/area/hallway/secondary/civilian)
"btK" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/maintenance{
- name = "Aft Maintenance";
- req_access_txt = "12"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
- },
+/obj/machinery/light/small,
+/obj/machinery/space_heater,
+/obj/machinery/atmospherics/pipe/simple/general/visible,
/turf/open/floor/plating,
-/area/hallway/secondary/exit)
+/area/engine/atmos/aftair)
"btL" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/obj/machinery/space_heater,
+/turf/open/floor/plating,
+/area/engine/atmos/aftair)
"btM" = (
/obj/structure/table/wood,
/obj/item/paper_bin,
@@ -32925,15 +32933,10 @@
/turf/open/floor/plasteel,
/area/quartermaster/miningoffice)
"btO" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/obj/machinery/portable_atmospherics/canister/air,
+/obj/machinery/atmospherics/pipe/simple/general/visible,
+/turf/open/floor/plating,
+/area/engine/atmos/aftair)
"btP" = (
/obj/effect/landmark/event_spawn,
/turf/open/floor/plating,
@@ -33056,8 +33059,8 @@
/turf/closed/wall,
/area/maintenance/disposal)
"bui" = (
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/turf/closed/wall/r_wall,
+/area/hallway/secondary/exit/departure_lounge)
"buj" = (
/obj/structure/closet/crate,
/turf/open/floor/plating,
@@ -33094,11 +33097,9 @@
/turf/closed/wall/r_wall,
/area/ai_monitored/turret_protected/ai)
"buo" = (
-/obj/structure/chair{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/hallway/secondary/exit/departure_lounge)
"bup" = (
/obj/structure/cable{
icon_state = "0-4"
@@ -33417,18 +33418,9 @@
/turf/closed/wall,
/area/janitor)
"bvb" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/machinery/power/apc/highcap/fifteen_k{
- areastring = "/area/engine/storage_shared";
- dir = 1;
- name = "Electrical Substation APC";
- pixel_y = 26
- },
-/turf/open/floor/plating,
-/area/engine/storage_shared)
+/obj/structure/sign/departments/evac,
+/turf/closed/wall/r_wall,
+/area/hallway/secondary/exit/departure_lounge)
"bvc" = (
/obj/machinery/computer/cargo/request,
/obj/machinery/airalarm{
@@ -35374,14 +35366,14 @@
/turf/open/floor/plating,
/area/maintenance/disposal)
"bzq" = (
-/obj/machinery/light{
- dir = 8
- },
-/obj/structure/sign/warning/pods{
- pixel_x = -32
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
+ name = "Departures"
},
+/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"bzr" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 10
@@ -36158,9 +36150,14 @@
/turf/open/floor/plasteel/white,
/area/science/mixing)
"bAW" = (
-/obj/structure/sign/poster/official/get_your_legs,
-/turf/closed/wall,
-/area/hallway/secondary/exit)
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
+ name = "Departures"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"bAX" = (
/obj/structure/table/wood,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -36179,9 +36176,14 @@
},
/area/crew_quarters/heads/captain)
"bAY" = (
-/obj/machinery/status_display,
-/turf/closed/wall,
-/area/hallway/secondary/exit)
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/public/glass{
+ name = "Departures"
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"bAZ" = (
/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{
dir = 1
@@ -36190,9 +36192,9 @@
/turf/open/floor/carpet,
/area/chapel/main)
"bBa" = (
-/obj/structure/sign/poster/official/help_others,
-/turf/closed/wall,
-/area/hallway/secondary/exit)
+/obj/machinery/status_display,
+/turf/closed/wall/r_wall,
+/area/hallway/secondary/exit/departure_lounge)
"bBb" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
@@ -36205,16 +36207,9 @@
},
/area/maintenance/department/chapel)
"bBc" = (
-/obj/machinery/light{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/turf/open/floor/plasteel/white/corner{
- dir = 8
- },
-/area/hallway/secondary/exit)
+/obj/machinery/atmospherics/components/binary/valve/digital/on,
+/turf/closed/wall/r_wall,
+/area/engine/atmos/aftair)
"bBd" = (
/obj/structure/table,
/obj/item/reagent_containers/food/snacks/popcorn,
@@ -36224,15 +36219,16 @@
/turf/open/floor/wood,
/area/crew_quarters/fitness)
"bBe" = (
-/obj/machinery/light{
- dir = 4;
- light_color = "#c1caff"
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/atmos{
+ name = "Aft Air Hookup";
+ req_access_txt = "12;24"
},
-/obj/structure/sign/warning/pods{
- pixel_x = 32
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/turf/open/floor/plating,
+/area/engine/atmos/aftair)
"bBf" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -36295,14 +36291,9 @@
/turf/open/floor/plating,
/area/hallway/primary/aft)
"bBm" = (
-/obj/structure/chair,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/turf/open/floor/plasteel/white/corner{
- dir = 4
- },
-/area/hallway/secondary/exit)
+/obj/structure/sign/warning/nosmoking,
+/turf/closed/wall/r_wall,
+/area/engine/atmos/aftair)
"bBn" = (
/obj/machinery/door/airlock/engineering/glass{
name = "Thermo-Electric Generator Room";
@@ -36371,15 +36362,9 @@
/turf/closed/wall,
/area/router)
"bBw" = (
-/obj/structure/chair,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/plasteel/white/corner{
- dir = 4
- },
-/area/hallway/secondary/exit)
+/obj/structure/flora/ausbushes/sunnybush,
+/turf/open/floor/grass,
+/area/hallway/secondary/exit/departure_lounge)
"bBx" = (
/obj/structure/table,
/obj/item/storage/toolbox/electrical,
@@ -36515,11 +36500,11 @@
/turf/open/floor/plating,
/area/quartermaster/warehouse)
"bBM" = (
-/obj/effect/turf_decal/tile/red{
+/obj/machinery/light{
dir = 1
},
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/turf/open/floor/grass,
+/area/hallway/secondary/exit/departure_lounge)
"bBN" = (
/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix{
dir = 1
@@ -36623,8 +36608,9 @@
/turf/open/floor/plasteel,
/area/router/eva)
"bBZ" = (
-/turf/closed/wall,
-/area/hallway/secondary/exit)
+/obj/structure/flora/ausbushes/leafybush,
+/turf/open/floor/grass,
+/area/hallway/secondary/exit/departure_lounge)
"bCa" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -36850,11 +36836,12 @@
/turf/open/floor/plasteel,
/area/storage/primary)
"bCA" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
+/obj/machinery/vending/coffee,
+/obj/effect/turf_decal/tile/green{
dir = 4
},
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"bCB" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposaloutlet,
@@ -39216,11 +39203,14 @@
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"bHt" = (
-/obj/structure/chair{
+/obj/effect/turf_decal/tile/green{
dir = 8
},
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/hallway/secondary/exit/departure_lounge)
"bHu" = (
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
@@ -40074,8 +40064,9 @@
/turf/closed/wall/r_wall,
/area/science/server)
"bJo" = (
-/turf/open/floor/plasteel/white/corner,
-/area/hallway/secondary/exit)
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"bJp" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -40083,14 +40074,12 @@
/turf/open/floor/plating,
/area/maintenance/aft)
"bJq" = (
-/obj/structure/chair{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
+/obj/effect/turf_decal/tile/green{
+ dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel/white/corner,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"bJr" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
dir = 1
@@ -40318,11 +40307,14 @@
/turf/open/floor/plating,
/area/maintenance/solars/starboard/aft)
"bJR" = (
-/obj/effect/turf_decal/tile/red{
+/obj/machinery/vending/cigarette,
+/obj/effect/turf_decal/tile/green{
dir = 8
},
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/hallway/secondary/exit/departure_lounge)
"bJS" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -42166,32 +42158,17 @@
/turf/open/floor/plasteel/white,
/area/medical/virology)
"bNH" = (
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/machinery/light{
- dir = 4;
- light_color = "#c1caff"
- },
-/turf/open/floor/plasteel/white/corner,
-/area/hallway/secondary/exit)
+/obj/structure/flora/junglebush/b,
+/turf/open/floor/grass,
+/area/hallway/secondary/exit/departure_lounge)
"bNI" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/sign/departments/evac,
-/turf/open/floor/plating,
-/area/hallway/secondary/exit)
+/obj/structure/flora/junglebush,
+/turf/open/floor/grass,
+/area/hallway/secondary/exit/departure_lounge)
"bNJ" = (
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/machinery/light{
- dir = 8
- },
-/turf/open/floor/plasteel/cafeteria,
-/area/hallway/secondary/exit)
+/obj/structure/window/reinforced/spawner,
+/turf/open/floor/grass,
+/area/hallway/secondary/exit/departure_lounge)
"bNK" = (
/obj/machinery/power/solar{
id = "aftstarboard";
@@ -42237,19 +42214,19 @@
/turf/open/floor/plating,
/area/maintenance/solars/starboard/aft)
"bNQ" = (
-/obj/effect/turf_decal/tile/red{
+/obj/structure/window/reinforced/spawner,
+/obj/item/storage/backpack/snail,
+/turf/open/floor/grass,
+/area/hallway/secondary/exit/departure_lounge)
+"bNR" = (
+/obj/structure/chair{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/green{
dir = 4
},
/turf/open/floor/plasteel/white/corner,
-/area/hallway/secondary/exit)
-"bNR" = (
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/turf/open/floor/plasteel/white/corner{
- dir = 1
- },
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"bNS" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -42283,33 +42260,75 @@
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"bNW" = (
-/turf/open/floor/plasteel/stairs/left,
-/area/hallway/secondary/exit)
-"bNX" = (
-/obj/machinery/light{
- dir = 4;
- light_color = "#c1caff"
- },
-/turf/open/floor/plasteel/stairs/right,
-/area/hallway/secondary/exit)
-"bNY" = (
-/obj/machinery/light{
+/obj/structure/chair{
dir = 8
},
-/turf/open/floor/plasteel/stairs/left,
-/area/hallway/secondary/exit)
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/hallway/secondary/exit/departure_lounge)
+"bNX" = (
+/obj/structure/window/reinforced/spawner,
+/mob/living/simple_animal/kiwi,
+/turf/open/floor/grass,
+/area/hallway/secondary/exit/departure_lounge)
+"bNY" = (
+/obj/structure/chair{
+ dir = 4
+ },
+/obj/machinery/light_switch{
+ pixel_x = -24
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/hallway/secondary/exit/departure_lounge)
"bNZ" = (
-/turf/open/floor/plasteel/stairs/right,
-/area/hallway/secondary/exit)
+/obj/structure/table,
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/item/storage/dice,
+/obj/item/toy/cards/deck,
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/hallway/secondary/exit/departure_lounge)
"bOa" = (
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/obj/structure/chair{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/hallway/secondary/exit/departure_lounge)
"bOb" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/sign/warning/vacuum/external,
-/turf/open/floor/plating,
-/area/hallway/secondary/exit)
+/obj/machinery/disposal/bin,
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/hallway/secondary/exit/departure_lounge)
"bOc" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -42328,12 +42347,16 @@
/turf/open/space/basic,
/area/solar/starboard/aft)
"bOe" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/external/glass{
- name = "Departures Shuttle Dock"
+/obj/effect/turf_decal/tile/green{
+ dir = 4
},
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/hallway/secondary/exit/departure_lounge)
"bOf" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -42342,32 +42365,46 @@
/turf/open/space/basic,
/area/solar/starboard/aft)
"bOg" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white/corner{
dir = 1
},
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"bOh" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
-"bOi" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/structure/disposalpipe/segment{
dir = 9
},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
+"bOi" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"bOj" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 8
},
-/obj/machinery/light{
- dir = 8
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
},
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"bOk" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -42376,17 +42413,34 @@
/turf/open/space/basic,
/area/solar/starboard/aft)
"bOl" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 10
+/obj/machinery/computer/arcade,
+/obj/machinery/light{
+ dir = 1
},
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/hallway/secondary/exit/departure_lounge)
"bOm" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 6
+/obj/structure/chair{
+ dir = 4
},
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/hallway/secondary/exit/departure_lounge)
"bOn" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/maintenance{
@@ -42399,10 +42453,18 @@
/turf/open/floor/plating,
/area/crew_quarters/toilet/restrooms)
"bOo" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/sign/warning/docking,
-/turf/open/floor/plating,
-/area/hallway/secondary/exit)
+/obj/structure/table,
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/item/paicard,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/hallway/secondary/exit/departure_lounge)
"bOp" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -42994,75 +43056,73 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bPD" = (
-/obj/structure/table/glass,
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/camera{
- c_tag = "Escape Hall - Fore";
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
-"bPE" = (
-/obj/structure/table/glass,
-/obj/item/clipboard,
-/obj/item/storage/crayons,
-/obj/machinery/atmospherics/pipe/manifold/cyan/hidden,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
-"bPF" = (
-/obj/structure/table/glass,
-/obj/item/storage/fancy/cigarettes,
-/obj/item/lighter{
- pixel_x = 6
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
-"bPG" = (
/obj/structure/chair{
dir = 8
},
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/machinery/light_switch{
+ pixel_x = 24
+ },
+/obj/effect/turf_decal/tile/green{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 10
+ },
+/turf/open/floor/plasteel/cafeteria,
+/area/hallway/secondary/exit/departure_lounge)
+"bPE" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/maintenance{
+ name = "Aft Maintenance";
+ req_access_txt = "12"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/hallway/secondary/exit/departure_lounge)
+"bPF" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
},
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
+"bPG" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"bPH" = (
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
},
+/obj/machinery/holopad,
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"bPI" = (
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"bPJ" = (
/obj/machinery/atmospherics/pipe/manifold/orange/visible{
dir = 1
@@ -43110,18 +43170,19 @@
/turf/open/floor/plating,
/area/maintenance/aft)
"bPO" = (
-/obj/machinery/light{
- dir = 4;
- light_color = "#c1caff"
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/maintenance{
+ name = "Starboard Quarter Maintenance";
+ req_one_access_txt = "12;48"
},
-/obj/effect/turf_decal/tile/red,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plasteel/white/corner{
+/obj/structure/disposalpipe/segment{
dir = 4
},
-/area/hallway/secondary/exit)
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/hallway/secondary/exit/departure_lounge)
"bPP" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/disposalpipe/segment,
@@ -43160,13 +43221,19 @@
/turf/open/floor/plasteel/showroomfloor,
/area/medical/morgue)
"bPT" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/maintenance{
+ name = "Aft Maintenance";
+ req_access_txt = "12"
+ },
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "4-8"
},
-/turf/open/floor/plasteel/white/corner{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
},
-/area/hallway/secondary/exit)
+/turf/open/floor/plating,
+/area/hallway/secondary/exit/departure_lounge)
"bPU" = (
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment,
@@ -43268,10 +43335,13 @@
/area/medical/morgue)
"bQd" = (
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
},
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"bQe" = (
/obj/structure/lattice,
/obj/structure/grille/broken,
@@ -43396,16 +43466,25 @@
/area/engine/break_room)
"bQr" = (
/obj/structure/cable{
- icon_state = "1-4"
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+ dir = 1
},
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"bQs" = (
/obj/structure/cable{
icon_state = "4-8"
},
-/turf/open/floor/plasteel/white/corner,
-/area/hallway/secondary/exit)
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"bQt" = (
/obj/machinery/conveyor/auto{
dir = 5;
@@ -45371,9 +45450,17 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"bUx" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/obj/structure/chair{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
+ },
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"bUy" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
@@ -49393,11 +49480,17 @@
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"ccx" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
+/obj/structure/table/glass,
+/obj/item/reagent_containers/food/drinks/coffee,
+/obj/item/pen/blue,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+ dir = 8
},
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"ccy" = (
/obj/structure/plasticflaps,
/obj/machinery/conveyor/auto{
@@ -49533,11 +49626,16 @@
/turf/open/floor/plating,
/area/science/research)
"ccK" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+/obj/structure/table/glass,
+/obj/item/storage/toolbox/emergency,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 9
},
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"ccL" = (
/obj/effect/landmark/event_spawn,
/obj/machinery/light{
@@ -49703,9 +49801,21 @@
/turf/open/floor/plating,
/area/hallway/secondary/entry)
"cdd" = (
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plating,
-/area/hallway/secondary/exit)
+/obj/structure/table/glass,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/camera{
+ c_tag = "Escape Hall - Fore";
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cde" = (
/obj/machinery/light{
dir = 1
@@ -49798,11 +49908,15 @@
/turf/open/floor/plasteel,
/area/engine/break_room)
"cdn" = (
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
- dir = 4
+/obj/structure/table/glass,
+/obj/item/clipboard,
+/obj/item/storage/crayons,
+/obj/machinery/atmospherics/pipe/manifold/cyan/hidden,
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/turf/closed/wall/r_wall,
-/area/maintenance/aft/secondary)
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cdo" = (
/obj/structure/grille,
/obj/structure/disposalpipe/segment{
@@ -50122,7 +50236,7 @@
/area/router/eng)
"cdV" = (
/turf/closed/wall/r_wall,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cdW" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
@@ -50320,7 +50434,7 @@
icon_state = "1-2"
},
/turf/closed/wall/r_wall/rust,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cer" = (
/obj/structure/window/reinforced/spawner/east,
/obj/machinery/mass_driver{
@@ -50344,19 +50458,33 @@
icon_state = "1-2"
},
/turf/closed/wall/r_wall,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"ceu" = (
-/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden{
- dir = 1
+/obj/structure/table/glass,
+/obj/item/storage/fancy/cigarettes,
+/obj/item/lighter{
+ pixel_x = 6
},
-/turf/closed/wall/r_wall,
-/area/maintenance/aft/secondary)
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cev" = (
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
- dir = 10
+/obj/structure/chair{
+ dir = 8
},
-/turf/closed/wall/r_wall,
-/area/maintenance/aft/secondary)
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cew" = (
/obj/structure/window/reinforced/spawner/east,
/obj/machinery/conveyor/auto{
@@ -50367,8 +50495,14 @@
/turf/open/floor/plating,
/area/router/eng)
"cex" = (
-/turf/closed/wall/r_wall,
-/area/maintenance/aft/secondary)
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cey" = (
/obj/effect/turf_decal/tile/purple{
dir = 1
@@ -50571,7 +50705,7 @@
},
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/engine/vacuum,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"ceS" = (
/obj/structure/closet/crate,
/obj/effect/spawner/lootdrop/maintenance{
@@ -50657,7 +50791,7 @@
dir = 6
},
/turf/open/floor/engine/vacuum,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfb" = (
/obj/machinery/light{
dir = 8
@@ -50708,7 +50842,7 @@
dir = 10
},
/turf/open/floor/engine/vacuum,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfg" = (
/obj/structure/chair{
dir = 8
@@ -50746,32 +50880,53 @@
/turf/open/floor/plasteel,
/area/science/research)
"cfi" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/turf/open/floor/plating,
-/area/maintenance/aft/secondary)
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cfj" = (
-/obj/machinery/firealarm{
- pixel_y = 26
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/machinery/atmospherics/components/binary/valve/digital/on,
-/turf/open/floor/plating,
-/area/maintenance/aft/secondary)
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cfk" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/obj/machinery/camera{
- c_tag = "Aft Maintenance - Air Hookup"
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/maintenance{
+ name = "Starboard Quarter Maintenance";
+ req_one_access_txt = "12;48"
+ },
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
},
/turf/open/floor/plating,
-/area/maintenance/aft/secondary)
+/area/hallway/secondary/exit/departure_lounge)
"cfl" = (
-/obj/machinery/atmospherics/components/binary/valve/digital/on,
-/turf/open/floor/plating,
-/area/maintenance/aft/secondary)
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/structure/sign/warning/pods{
+ pixel_x = -32
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cfm" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/obj/machinery/portable_atmospherics/canister/air,
-/turf/open/floor/plating,
-/area/maintenance/aft/secondary)
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cfn" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -50784,13 +50939,13 @@
"cfo" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
/turf/open/floor/engine/vacuum,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfp" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/junction{
dir = 1
},
/turf/open/floor/engine/vacuum,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfq" = (
/obj/structure/lattice/catwalk,
/turf/open/floor/plating/airless,
@@ -50808,7 +50963,7 @@
},
/obj/machinery/door/firedoor/heavy,
/turf/open/floor/plating,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfs" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible,
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
@@ -50828,13 +50983,13 @@
dir = 4
},
/turf/open/floor/plating,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfu" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4
},
/turf/closed/wall/r_wall,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfv" = (
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 8
@@ -50869,12 +51024,8 @@
/turf/open/floor/plasteel,
/area/engine/storage)
"cfy" = (
-/obj/machinery/camera{
- c_tag = "Electrical Substation";
- dir = 1
- },
-/turf/open/floor/plating,
-/area/engine/storage_shared)
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cfz" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -50889,19 +51040,19 @@
dir = 5
},
/turf/open/floor/engine/vacuum,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfB" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 9
},
/turf/open/floor/engine/vacuum,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfC" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5
},
/turf/open/floor/engine/vacuum,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfD" = (
/obj/structure/lattice,
/obj/machinery/atmospherics/pipe/simple/supplymain/visible{
@@ -50915,13 +51066,13 @@
dir = 9
},
/turf/closed/wall/r_wall,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfF" = (
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plating,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfG" = (
/obj/machinery/door/airlock/highsecurity{
name = "Secure Tech Storage";
@@ -50938,7 +51089,7 @@
},
/obj/machinery/atmospherics/components/unary/outlet_injector/on,
/turf/open/floor/engine/vacuum,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfI" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -50950,13 +51101,13 @@
/obj/effect/decal/cleanable/ash,
/obj/effect/decal/remains/human,
/turf/open/floor/engine/vacuum,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfJ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/closed/wall/r_wall,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfK" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 10
@@ -50965,7 +51116,7 @@
icon_state = "1-2"
},
/turf/open/floor/plating,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfL" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -51091,7 +51242,7 @@
/obj/structure/window/plasma/reinforced/spawner,
/obj/structure/lattice,
/turf/open/space/basic,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cfX" = (
/obj/item/pipe,
/obj/structure/cable{
@@ -51139,7 +51290,7 @@
},
/obj/machinery/door/firedoor/heavy,
/turf/open/floor/plating,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cgc" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -51222,7 +51373,7 @@
},
/obj/machinery/meter,
/turf/closed/wall/r_wall,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cgj" = (
/obj/machinery/conveyor/auto{
id = "cargo"
@@ -51250,7 +51401,7 @@
name = "atmos mix to burn"
},
/turf/open/floor/plasteel/dark,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cgm" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
@@ -51276,7 +51427,7 @@
"cgo" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible,
/turf/open/floor/plasteel/dark,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cgp" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 10
@@ -51287,7 +51438,7 @@
pixel_y = 24
},
/turf/open/floor/plasteel/dark,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cgq" = (
/obj/structure/disposalpipe/segment,
/obj/effect/decal/cleanable/dirt,
@@ -51337,7 +51488,7 @@
light_color = "#ffc1c1"
},
/turf/open/floor/plasteel/dark,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cgv" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -51358,7 +51509,7 @@
icon_state = "1-2"
},
/turf/open/floor/plasteel/dark,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cgx" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -51418,7 +51569,7 @@
"cgD" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cgE" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/machinery/light{
@@ -51435,30 +51586,30 @@
/turf/open/floor/plasteel,
/area/science/research)
"cgG" = (
-/obj/machinery/atmospherics/components/binary/valve/digital/on{
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#c1caff"
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/white/corner{
dir = 4
},
-/turf/closed/wall/r_wall,
-/area/maintenance/aft/secondary)
+/area/hallway/secondary/exit/departure_lounge)
"cgH" = (
-/obj/machinery/atmospherics/pipe/manifold/general/visible{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/maintenance/aft/secondary)
+/obj/structure/sign/poster/official/get_your_legs,
+/turf/closed/wall,
+/area/hallway/secondary/exit/departure_lounge)
"cgI" = (
-/obj/machinery/atmospherics/pipe/simple/general/visible{
- dir = 5
- },
-/turf/open/floor/plating,
-/area/maintenance/aft/secondary)
+/obj/machinery/status_display,
+/turf/closed/wall,
+/area/hallway/secondary/exit/departure_lounge)
"cgJ" = (
-/obj/machinery/atmospherics/pipe/manifold/general/visible{
- dir = 4
- },
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/plating,
-/area/maintenance/aft/secondary)
+/obj/structure/sign/poster/official/help_others,
+/turf/closed/wall,
+/area/hallway/secondary/exit/departure_lounge)
"cgK" = (
/obj/effect/turf_decal/tile/purple{
dir = 8
@@ -51502,41 +51653,44 @@
/turf/open/floor/plasteel,
/area/science/research)
"cgN" = (
-/obj/machinery/portable_atmospherics/canister/air,
-/obj/machinery/atmospherics/pipe/simple/general/visible,
-/obj/structure/cable{
- icon_state = "0-4"
+/obj/machinery/light{
+ dir = 8
},
-/obj/machinery/power/apc{
- areastring = "/area/maintenance/aft/secondary";
- dir = 8;
- name = "Aft Air Hookup APC";
- pixel_x = -24
+/obj/effect/turf_decal/tile/red{
+ dir = 1
},
-/turf/open/floor/plating,
-/area/maintenance/aft/secondary)
+/turf/open/floor/plasteel/white/corner{
+ dir = 8
+ },
+/area/hallway/secondary/exit/departure_lounge)
"cgO" = (
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/turf/open/floor/plating,
-/area/maintenance/aft/secondary)
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cgP" = (
-/obj/machinery/light/small,
-/obj/machinery/space_heater,
-/obj/machinery/atmospherics/pipe/simple/general/visible,
-/turf/open/floor/plating,
-/area/maintenance/aft/secondary)
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#c1caff"
+ },
+/obj/structure/sign/warning/pods{
+ pixel_x = 32
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cgQ" = (
-/obj/machinery/space_heater,
-/turf/open/floor/plating,
-/area/maintenance/aft/secondary)
+/obj/structure/sign/poster/official/safety_internals{
+ pixel_x = -32
+ },
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/decal/cleanable/cobweb,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cgR" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 6
},
/turf/open/floor/plasteel/dark,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cgS" = (
/obj/machinery/atmospherics/components/trinary/mixer{
dir = 4;
@@ -51546,7 +51700,7 @@
target_pressure = 4500
},
/turf/open/floor/plasteel/dark,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cgT" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/disposalpipe/segment,
@@ -51559,12 +51713,15 @@
name = "manual mix to burn"
},
/turf/open/floor/plasteel/dark,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cgV" = (
-/obj/machinery/portable_atmospherics/canister/air,
-/obj/machinery/atmospherics/pipe/simple/general/visible,
-/turf/open/floor/plating,
-/area/maintenance/aft/secondary)
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/light/small{
+ dir = 1;
+ light_color = "#ffc1c1"
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cgW" = (
/obj/docking_port/stationary{
dir = 4;
@@ -51618,7 +51775,7 @@
icon_state = "2-4"
},
/turf/open/floor/plasteel/dark,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"chc" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -51662,7 +51819,7 @@
icon_state = "4-8"
},
/turf/open/floor/plasteel/dark,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"chh" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/turf/open/floor/plating,
@@ -51680,13 +51837,13 @@
icon_state = "1-8"
},
/turf/open/floor/plasteel/dark,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"chk" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 10
},
/turf/closed/wall/r_wall,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"chl" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -51744,22 +51901,22 @@
"chr" = (
/obj/machinery/atmospherics/components/binary/valve/digital,
/turf/open/floor/plasteel/dark,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"chs" = (
/turf/open/floor/plasteel/dark,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cht" = (
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plasteel/dark,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"chu" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 5
},
/turf/closed/wall/r_wall,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"chv" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -51800,7 +51957,7 @@
dir = 10
},
/turf/closed/wall/r_wall,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"chz" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
@@ -51811,20 +51968,20 @@
pixel_x = -28
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"chA" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"chB" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"chC" = (
/turf/closed/wall/r_wall/rust,
/area/space/nearstation)
@@ -51836,13 +51993,13 @@
dir = 1
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"chE" = (
/obj/machinery/atmospherics/pipe/simple/supply/visible{
dir = 5
},
/turf/closed/wall/r_wall,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"chF" = (
/obj/machinery/atmospherics/pipe/simple/supply/visible{
dir = 4
@@ -51852,7 +52009,7 @@
/obj/item/pipe_dispenser,
/obj/item/wrench,
/turf/open/floor/plasteel/dark,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"chG" = (
/obj/machinery/atmospherics/pipe/simple/supply/visible{
dir = 4
@@ -51862,7 +52019,7 @@
},
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel/dark,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"chH" = (
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 1
@@ -51876,7 +52033,7 @@
/obj/machinery/meter,
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel/dark,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"chJ" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -51898,7 +52055,7 @@
dir = 4
},
/turf/open/floor/plating,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"chL" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -51923,7 +52080,7 @@
},
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/closed/wall/r_wall,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"chO" = (
/obj/structure/table,
/obj/machinery/requests_console{
@@ -52049,7 +52206,7 @@
"chX" = (
/obj/structure/sign/warning/nosmoking,
/turf/closed/wall/r_wall,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"chY" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -52063,14 +52220,14 @@
/obj/item/grenade/chem_grenade/smart_metal_foam,
/obj/item/wrench,
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"chZ" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cia" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -52079,13 +52236,13 @@
icon_state = "1-2"
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cib" = (
/obj/effect/turf_decal/stripes/corner{
dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cic" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -52113,13 +52270,13 @@
},
/obj/item/analyzer,
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cie" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/closed/wall/r_wall,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cif" = (
/obj/machinery/light/small{
brightness = 3;
@@ -52247,7 +52404,7 @@
dir = 4
},
/turf/open/floor/plasteel/dark,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cis" = (
/obj/structure/sign/warning/vacuum{
pixel_y = -32
@@ -52332,7 +52489,7 @@
icon_state = "1-2"
},
/turf/open/floor/plasteel/dark,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"ciE" = (
/obj/effect/turf_decal/tile/red{
dir = 8
@@ -52376,7 +52533,7 @@
dir = 1
},
/turf/open/floor/plasteel/dark,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"ciI" = (
/turf/closed/wall/r_wall/rust,
/area/quartermaster/warehouse)
@@ -52536,17 +52693,17 @@
pixel_y = 1
},
/obj/machinery/power/apc{
- areastring = "/area/engine/teg_hot";
+ areastring = "/area/engine/teg/hotloop";
dir = 8;
name = "Hot Loop APC";
pixel_x = -24
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"ciZ" = (
/obj/machinery/atmospherics/components/binary/valve/digital,
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cja" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -52612,7 +52769,7 @@
dir = 6
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cji" = (
/obj/structure/fans/tiny,
/obj/structure/plasticflaps,
@@ -52683,7 +52840,7 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cjt" = (
/obj/structure/cable{
icon_state = "0-2"
@@ -52700,23 +52857,10 @@
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"cju" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
-/obj/structure/table,
-/obj/machinery/light_switch{
- pixel_x = 24
- },
-/obj/item/clothing/ears/earmuffs,
-/obj/item/extinguisher{
- pixel_x = -12;
- pixel_y = -2
- },
-/obj/machinery/camera{
- c_tag = "Engineering - Hot Loop";
- dir = 8;
- pixel_y = -22
- },
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/hallway/secondary/exit/departure_lounge)
"cjv" = (
/obj/structure/chair{
dir = 1
@@ -52843,7 +52987,7 @@
dir = 4
},
/turf/closed/wall/r_wall,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cjL" = (
/obj/machinery/atmospherics/pipe/simple/supply/visible{
dir = 4
@@ -52851,7 +52995,7 @@
/obj/machinery/portable_atmospherics/canister,
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel/dark,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cjM" = (
/obj/structure/table,
/obj/item/storage/box/lights/mixed,
@@ -52979,7 +53123,7 @@
icon_state = "1-2"
},
/turf/open/floor/plasteel/dark,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cjV" = (
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment,
@@ -53026,7 +53170,7 @@
},
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel/dark,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cjY" = (
/obj/machinery/computer/station_alert{
dir = 4
@@ -53083,9 +53227,17 @@
},
/area/science/robotics/lab)
"ckc" = (
-/obj/machinery/atmospherics/components/binary/valve/digital/on,
-/turf/closed/wall/r_wall,
-/area/maintenance/aft/secondary)
+/obj/machinery/door/airlock/external{
+ name = "Escape Pod"
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"ckd" = (
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel/white,
@@ -53098,16 +53250,9 @@
/turf/open/floor/wood,
/area/library)
"ckf" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/atmos{
- name = "Aft Air Hookup";
- req_access_txt = "12;24"
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/open/floor/plating,
-/area/maintenance/aft/secondary)
+/obj/effect/landmark/event_spawn,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"ckg" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -53161,7 +53306,7 @@
/area/space/station_ruins)
"ckm" = (
/turf/closed/wall/r_wall,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"ckn" = (
/obj/machinery/door/airlock/external/glass{
name = "External Solar Access";
@@ -53173,9 +53318,13 @@
/turf/open/floor/plating,
/area/maintenance/solars/starboard/aft)
"cko" = (
-/obj/structure/sign/warning/nosmoking,
-/turf/closed/wall/r_wall,
-/area/maintenance/aft/secondary)
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/white/corner{
+ dir = 4
+ },
+/area/hallway/secondary/exit/departure_lounge)
"ckp" = (
/obj/effect/turf_decal/tile/yellow{
dir = 8
@@ -53232,13 +53381,13 @@
icon_state = "1-2"
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cku" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"ckv" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/mining/glass{
@@ -53255,7 +53404,7 @@
},
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"ckx" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -53276,17 +53425,17 @@
"cky" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"ckz" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,
/obj/structure/table,
/obj/item/pipe_dispenser,
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"ckA" = (
/obj/structure/sign/warning/fire,
/turf/closed/wall/r_wall,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"ckB" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -53307,7 +53456,7 @@
},
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"ckC" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -53322,7 +53471,7 @@
name = "gas to cold loop"
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"ckD" = (
/obj/effect/turf_decal/tile/yellow{
dir = 8
@@ -53342,21 +53491,14 @@
/turf/open/floor/plasteel,
/area/security/checkpoint/supply)
"ckF" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/structure/chair,
+/obj/effect/turf_decal/tile/red{
dir = 1
},
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- icon_state = "0-8"
+/turf/open/floor/plasteel/white/corner{
+ dir = 4
},
-/obj/machinery/power/apc{
- areastring = "/area/engine/teg_cold";
- dir = 4;
- name = "Cold Loop APC";
- pixel_x = 24
- },
-/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/hallway/secondary/exit/departure_lounge)
"ckG" = (
/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
dir = 1
@@ -53391,7 +53533,7 @@
dir = 8
},
/turf/closed/wall/r_wall,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"ckK" = (
/obj/structure/closet/secure_closet/miner,
/obj/effect/turf_decal/tile/brown{
@@ -53925,17 +54067,15 @@
/turf/open/floor/circuit/telecomms/mainframe,
/area/tcommsat/server)
"clH" = (
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/machinery/power/terminal{
+/obj/structure/chair,
+/obj/effect/turf_decal/tile/red{
dir = 1
},
-/turf/open/floor/plating,
-/area/engine/storage_shared)
+/obj/effect/landmark/start/assistant,
+/turf/open/floor/plasteel/white/corner{
+ dir = 4
+ },
+/area/hallway/secondary/exit/departure_lounge)
"clI" = (
/obj/machinery/telecomms/bus/preset_four,
/turf/open/floor/circuit/telecomms/mainframe,
@@ -54052,36 +54192,17 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"clZ" = (
-/obj/machinery/airalarm{
- dir = 4;
- pixel_x = -22
- },
-/obj/structure/chair{
- dir = 4
- },
-/obj/machinery/camera{
- c_tag = "Escape Hall - Port";
- dir = 4
+/obj/effect/turf_decal/tile/red{
+ dir = 1
},
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"cma" = (
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = 26
- },
-/obj/structure/chair{
- dir = 8
- },
-/obj/machinery/camera{
- c_tag = "Escape Hall - Starboard";
- dir = 8;
- pixel_y = -22
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"cmb" = (
/obj/effect/turf_decal/tile/brown{
dir = 1
@@ -54135,7 +54256,7 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cmg" = (
/obj/structure/disposalpipe/junction{
dir = 4
@@ -54153,7 +54274,7 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cmh" = (
/obj/structure/sign/warning/radiation,
/turf/closed/wall/r_wall,
@@ -54277,33 +54398,17 @@
/turf/open/floor/engine,
/area/engine/gravity_generator)
"cmy" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/maintenance{
- name = "Starboard Quarter Maintenance";
- req_one_access_txt = "12;48"
+/obj/effect/turf_decal/stripes/line,
+/obj/item/crowbar,
+/obj/structure/sign/poster/official/safety_internals{
+ pixel_x = 32
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/hallway/secondary/exit)
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cmz" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/maintenance{
- name = "Starboard Quarter Maintenance";
- req_one_access_txt = "12;48"
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
+/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"cmA" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock{
@@ -54348,7 +54453,7 @@
dir = 5
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cmF" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
/turf/open/floor/mineral/titanium/blue,
@@ -54365,7 +54470,7 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cmH" = (
/obj/structure/plasticflaps,
/obj/structure/fans/tiny,
@@ -54540,10 +54645,8 @@
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"cmV" = (
-/obj/structure/window/reinforced/spawner,
-/obj/item/storage/backpack/snail,
-/turf/open/floor/grass,
-/area/hallway/secondary/exit)
+/turf/closed/wall,
+/area/hallway/secondary/exit/departure_lounge)
"cmW" = (
/obj/effect/turf_decal/tile/brown{
dir = 1
@@ -54563,10 +54666,19 @@
/turf/open/floor/plasteel,
/area/quartermaster/qm)
"cmX" = (
-/obj/structure/window/reinforced/spawner,
-/mob/living/simple_animal/kiwi,
-/turf/open/floor/grass,
-/area/hallway/secondary/exit)
+/obj/machinery/airalarm{
+ dir = 4;
+ pixel_x = -22
+ },
+/obj/structure/chair{
+ dir = 4
+ },
+/obj/machinery/camera{
+ c_tag = "Escape Hall - Port";
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cmY" = (
/obj/machinery/door/airlock/engineering{
name = "Hot Loop";
@@ -54584,7 +54696,7 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cmZ" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -54613,31 +54725,29 @@
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cnc" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
+/obj/structure/cable{
+ icon_state = "1-2"
},
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"cnd" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
-"cne" = (
-/obj/effect/turf_decal/stripes/line{
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
-/obj/machinery/light{
- dir = 4;
- light_color = "#c1caff"
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
+"cne" = (
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 4
},
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"cnf" = (
-/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+ dir = 9
+ },
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"cng" = (
/obj/machinery/holopad,
/turf/open/floor/plasteel,
@@ -54656,7 +54766,7 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cni" = (
/obj/machinery/atmospherics/components/binary/pump{
name = "Port to Fuel Pipe"
@@ -54722,7 +54832,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/manifold4w/orange/hidden,
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cnp" = (
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel,
@@ -54744,7 +54854,7 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cns" = (
/obj/machinery/firealarm{
dir = 8;
@@ -54756,7 +54866,7 @@
dir = 10
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cnt" = (
/obj/structure/fans/tiny,
/obj/structure/plasticflaps,
@@ -54801,7 +54911,7 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cny" = (
/obj/machinery/light{
dir = 4;
@@ -54885,19 +54995,26 @@
},
/area/maintenance/port/fore)
"cnG" = (
-/obj/machinery/door/airlock/external/glass{
- name = "Shuttle Maintenance Access"
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = 26
+ },
+/obj/structure/chair{
+ dir = 8
+ },
+/obj/machinery/camera{
+ c_tag = "Escape Hall - Starboard";
+ dir = 8;
+ pixel_y = -22
},
-/obj/structure/fans/tiny,
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"cnH" = (
-/obj/machinery/door/airlock/external/glass{
- name = "Departures Shuttle Dock"
+/obj/structure/chair{
+ dir = 4
},
-/obj/structure/fans/tiny,
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"cnI" = (
/turf/open/floor/plating{
icon_state = "platingdmg3"
@@ -54915,7 +55032,7 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cnL" = (
/obj/structure/closet/crate/science,
/obj/item/stack/sheet/metal/ten,
@@ -55110,25 +55227,20 @@
},
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cog" = (
-/obj/structure/disposalpipe/segment{
- dir = 9
+/obj/machinery/navbeacon{
+ codes_txt = "patrol;next_patrol=eng2";
+ location = "evac"
},
-/turf/open/floor/plating,
-/area/engine/storage_shared)
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"coh" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/structure/chair{
+ dir = 8
},
-/obj/machinery/door/airlock/engineering{
- name = "Electrical Substation";
- req_access_txt = "10"
- },
-/obj/structure/fans/tiny,
-/turf/open/floor/plating,
-/area/engine/storage_shared)
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"coi" = (
/obj/machinery/light,
/obj/structure/disposalpipe/segment{
@@ -55162,7 +55274,7 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"col" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/yellow{
@@ -55206,23 +55318,17 @@
/turf/open/floor/plating,
/area/crew_quarters/heads/chief)
"coq" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
- name = "Departures"
+/obj/structure/cable{
+ icon_state = "1-4"
},
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"cor" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
- name = "Departures"
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/turf/open/floor/plasteel/white/corner,
+/area/hallway/secondary/exit/departure_lounge)
"cos" = (
/obj/effect/turf_decal/tile/purple{
dir = 8
@@ -55295,13 +55401,22 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"coy" = (
-/obj/structure/sign/poster/official/safety_internals{
- pixel_x = -32
+/obj/structure/chair{
+ dir = 1
},
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/decal/cleanable/cobweb,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/power/apc/highcap/five_k{
+ areastring = "/area/hallway/secondary/exit/departure_lounge";
+ name = "Escape Shuttle Hallway APC";
+ pixel_y = -28
+ },
+/turf/open/floor/plasteel/white/corner,
+/area/hallway/secondary/exit/departure_lounge)
"coz" = (
/obj/structure/disposalpipe/junction{
dir = 8
@@ -55540,7 +55655,7 @@
},
/obj/machinery/meter,
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"coU" = (
/obj/machinery/computer/secure_data{
dir = 1
@@ -55623,7 +55738,7 @@
dir = 1
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cpb" = (
/obj/structure/sink{
dir = 4;
@@ -55738,7 +55853,7 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cpl" = (
/obj/machinery/newscaster{
pixel_x = 30
@@ -55783,7 +55898,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cpp" = (
/obj/structure/plasticflaps,
/obj/machinery/conveyor/auto{
@@ -55865,15 +55980,14 @@
/turf/open/floor/mineral/titanium/blue,
/area/hallway/primary/central)
"cpy" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/structure/chair{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
+/obj/effect/turf_decal/tile/red{
+ dir = 8
},
-/obj/machinery/holopad,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/turf/open/floor/plasteel/white/corner,
+/area/hallway/secondary/exit/departure_lounge)
"cpz" = (
/turf/closed/wall/r_wall,
/area/medical/virology)
@@ -55888,7 +56002,7 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cpB" = (
/obj/effect/landmark/carpspawn,
/turf/open/space/basic,
@@ -55931,7 +56045,7 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cpG" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -55994,7 +56108,7 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cpL" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 9
@@ -56004,7 +56118,7 @@
light_color = "#c1caff"
},
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cpM" = (
/obj/machinery/portable_atmospherics/canister/nitrogen,
/obj/effect/turf_decal/bot,
@@ -56064,14 +56178,14 @@
/obj/item/electronics/airlock,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cpS" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 5
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cpT" = (
/obj/machinery/atmospherics/components/binary/pump/on{
dir = 8
@@ -56079,7 +56193,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cpU" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -56088,7 +56202,7 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cpV" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -56108,7 +56222,7 @@
light_color = "#c1caff"
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cpW" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -56129,13 +56243,13 @@
},
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cpZ" = (
/obj/structure/table,
/obj/item/tank/internals/air,
/obj/item/clothing/mask/gas,
/turf/open/floor/plasteel/dark,
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cqa" = (
/obj/machinery/autolathe,
/obj/effect/turf_decal/delivery,
@@ -56144,7 +56258,7 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cqb" = (
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel/white,
@@ -56155,7 +56269,7 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cqd" = (
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
@@ -56252,12 +56366,18 @@
/turf/open/floor/plasteel,
/area/quartermaster/office)
"cql" = (
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=eng2";
- location = "evac"
+/obj/structure/chair{
+ dir = 1
},
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/item/radio/intercom{
+ name = "Station Intercom (Common)";
+ pixel_y = -29
+ },
+/turf/open/floor/plasteel/white/corner,
+/area/hallway/secondary/exit/departure_lounge)
"cqm" = (
/obj/structure/closet/secure_closet/medical1,
/obj/effect/turf_decal/tile/red{
@@ -56278,7 +56398,7 @@
dir = 5
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cqo" = (
/obj/effect/turf_decal/stripes/corner{
dir = 8
@@ -56291,7 +56411,7 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cqp" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -56303,7 +56423,7 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cqq" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering{
@@ -56319,7 +56439,7 @@
dir = 8
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cqr" = (
/obj/machinery/power/apc{
areastring = "/area/maintenance/starboard/central";
@@ -56452,7 +56572,7 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cqB" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/drinks/bottle/absinthe,
@@ -56467,11 +56587,11 @@
"cqC" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cqD" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cqE" = (
/obj/machinery/conveyor_switch{
id = "EngiCargoConveyer"
@@ -56483,7 +56603,7 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cqF" = (
/obj/effect/turf_decal/delivery,
/obj/effect/landmark/event_spawn,
@@ -56556,12 +56676,12 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cqM" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cqN" = (
/turf/closed/wall/rust,
/area/maintenance/department/security)
@@ -56570,7 +56690,7 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cqP" = (
/obj/structure/table,
/obj/effect/turf_decal/tile/red,
@@ -56621,22 +56741,14 @@
/turf/open/floor/plasteel,
/area/science/explab)
"cqT" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
-"cqU" = (
-/obj/machinery/door/airlock/external{
- name = "Escape Pod"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
+/obj/effect/turf_decal/tile/red{
dir = 8
},
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
+"cqU" = (
+/turf/open/floor/plasteel/white/corner,
+/area/hallway/secondary/exit/departure_lounge)
"cqV" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/door/firedoor,
@@ -56724,7 +56836,7 @@
id = "EngiCargoConveyer"
},
/turf/open/floor/plating,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"crc" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -56810,18 +56922,18 @@
/turf/open/floor/plasteel,
/area/engine/break_room)
"crj" = (
-/obj/structure/chair{
- dir = 1
+/obj/effect/turf_decal/tile/red{
+ dir = 4
},
/obj/effect/turf_decal/tile/red{
dir = 8
},
-/obj/item/radio/intercom{
- name = "Station Intercom (Common)";
- pixel_y = -29
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#c1caff"
},
/turf/open/floor/plasteel/white/corner,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"crk" = (
/obj/effect/landmark/event_spawn,
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden,
@@ -56857,7 +56969,7 @@
name = "Engineering Delivery Door"
},
/turf/open/floor/plating,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"crn" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters/preopen{
@@ -57197,13 +57309,10 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"crU" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/item/crowbar,
-/obj/structure/sign/poster/official/safety_internals{
- pixel_x = 32
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/sign/departments/evac,
+/turf/open/floor/plating,
+/area/hallway/secondary/exit/departure_lounge)
"crV" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/delivery,
@@ -57465,7 +57574,7 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"csr" = (
/obj/structure/table,
/obj/machinery/computer/libraryconsole/bookmanagement,
@@ -57487,7 +57596,7 @@
dir = 4
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cst" = (
/obj/machinery/portable_atmospherics/scrubber,
/obj/effect/decal/cleanable/dirt,
@@ -57495,7 +57604,7 @@
dir = 9
},
/turf/open/floor/plasteel,
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"csu" = (
/obj/effect/turf_decal/tile/yellow{
dir = 8
@@ -58121,13 +58230,14 @@
/turf/closed/wall,
/area/engine/workshop)
"ctH" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/light/small{
- dir = 1;
- light_color = "#ffc1c1"
+/obj/effect/turf_decal/tile/red{
+ dir = 8
},
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/plasteel/cafeteria,
+/area/hallway/secondary/exit/departure_lounge)
"ctI" = (
/obj/structure/table/reinforced,
/obj/item/paper_bin,
@@ -58280,22 +58390,11 @@
/turf/open/floor/plasteel/dark,
/area/science/xenobiology)
"ctV" = (
-/obj/structure/chair{
- dir = 1
- },
/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/machinery/power/apc/highcap/five_k{
- areastring = "/area/hallway/secondary/exit";
- name = "Escape Shuttle Hallway APC";
- pixel_y = -28
+ dir = 4
},
/turf/open/floor/plasteel/white/corner,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"ctW" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
@@ -59525,13 +59624,13 @@
/turf/open/floor/plasteel,
/area/quartermaster/sorting)
"cwd" = (
-/obj/machinery/door/firedoor,
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/effect/turf_decal/tile/red{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/turf/open/floor/plasteel/white/corner{
+ dir = 1
+ },
+/area/hallway/secondary/exit/departure_lounge)
"cwe" = (
/obj/structure/closet/secure_closet/exile,
/turf/open/floor/plasteel/white,
@@ -59663,10 +59762,8 @@
/turf/open/floor/plating,
/area/medical/virology)
"cwq" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/turf/open/floor/plasteel/stairs/left,
+/area/hallway/secondary/exit/departure_lounge)
"cwr" = (
/obj/effect/turf_decal/tile/yellow{
dir = 1
@@ -59894,9 +59991,12 @@
/turf/open/floor/mineral/titanium/blue,
/area/hallway/primary/central)
"cwV" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/science/misc_lab)
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#c1caff"
+ },
+/turf/open/floor/plasteel/stairs/right,
+/area/hallway/secondary/exit/departure_lounge)
"cwW" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/delivery,
@@ -60739,14 +60839,11 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"cyD" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/public/glass{
- name = "Departures"
+/obj/machinery/light{
+ dir = 8
},
-/obj/effect/turf_decal/delivery,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/turf/open/floor/plasteel/stairs/left,
+/area/hallway/secondary/exit/departure_lounge)
"cyE" = (
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel/white,
@@ -60779,14 +60876,8 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"cyJ" = (
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plasteel/white/corner{
- dir = 1
- },
-/area/hallway/secondary/exit)
+/turf/open/floor/plasteel/stairs/right,
+/area/hallway/secondary/exit/departure_lounge)
"cyK" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
@@ -60889,103 +60980,53 @@
/turf/open/floor/plating,
/area/maintenance/aft)
"cyV" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/machinery/door/firedoor,
+/obj/structure/cable{
+ icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
- dir = 8
- },
-/turf/open/floor/plasteel/white/corner{
- dir = 1
- },
-/area/hallway/secondary/exit)
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel/dark,
+/area/science/observatory)
"cyW" = (
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/turf/open/floor/plasteel/dark,
+/area/science/observatory)
"cyX" = (
-/obj/effect/turf_decal/tile/green{
- dir = 4
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/science/observatory)
+"cyY" = (
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
+"cyZ" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/sign/warning/vacuum/external,
+/turf/open/floor/plating,
+/area/hallway/secondary/exit/departure_lounge)
+"cza" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel/dark,
+/area/science/observatory)
+"czb" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
+/turf/open/floor/plasteel/dark,
+/area/science/observatory)
+"czc" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/external/glass{
+ name = "Departures Shuttle Dock"
},
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
-"cyY" = (
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
- },
-/turf/open/floor/plasteel/white/corner{
- dir = 1
- },
-/area/hallway/secondary/exit)
-"cyZ" = (
-/obj/machinery/computer/arcade,
-/obj/machinery/light{
- dir = 1
- },
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
- },
-/turf/open/floor/plasteel/white/corner{
- dir = 1
- },
-/area/hallway/secondary/exit)
-"cza" = (
-/obj/structure/chair{
- dir = 4
- },
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
- },
-/turf/open/floor/plasteel/white/corner{
- dir = 1
- },
-/area/hallway/secondary/exit)
-"czb" = (
-/obj/structure/table,
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/obj/item/paicard,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
- },
-/turf/open/floor/plasteel/white/corner{
- dir = 1
- },
-/area/hallway/secondary/exit)
-"czc" = (
-/obj/structure/chair{
- dir = 8
- },
-/obj/machinery/light_switch{
- pixel_x = 24
- },
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 10
- },
-/turf/open/floor/plasteel/cafeteria,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"czd" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -60997,15 +61038,8 @@
/turf/open/floor/plating,
/area/maintenance/aft)
"cze" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/turf/closed/wall/r_wall,
+/area/science/observatory)
"czf" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -61080,94 +61114,72 @@
/turf/open/floor/plating,
/area/maintenance/aft)
"czl" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/maintenance{
- name = "Aft Maintenance";
- req_access_txt = "12"
- },
/obj/structure/cable{
- icon_state = "4-8"
+ icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/hallway/secondary/exit)
-"czm" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
-"czn" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
-"czo" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
-"czp" = (
-/obj/structure/chair{
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
dir = 4
},
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/machinery/firealarm{
+ dir = 4;
+ pixel_x = -28
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel/dark,
+/area/science/observatory)
+"czm" = (
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
dir = 8
},
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
-"czq" = (
-/obj/structure/table/glass,
-/obj/item/reagent_containers/food/drinks/coffee,
-/obj/item/pen/blue,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
-"czr" = (
-/obj/structure/table/glass,
-/obj/item/storage/toolbox/emergency,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
+/turf/open/floor/plasteel/dark,
+/area/science/observatory)
+"czn" = (
+/obj/effect/turf_decal/stripes/line{
dir = 9
},
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
-"czs" = (
-/obj/structure/cable{
- icon_state = "4-8"
+/area/hallway/secondary/exit/departure_lounge)
+"czo" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
+"czp" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
+"czq" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plasteel/dark,
+/area/science/observatory)
+"czr" = (
+/obj/machinery/door/airlock/external/glass{
+ name = "Shuttle Maintenance Access"
+ },
+/obj/structure/fans/tiny,
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
+"czs" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"czt" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -61219,11 +61231,15 @@
/turf/open/floor/plasteel/showroomfloor,
/area/medical/morgue)
"czy" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 1
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#c1caff"
},
/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
+/area/hallway/secondary/exit/departure_lounge)
"czz" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/command/glass{
@@ -62183,13 +62199,14 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/zone2)
"cBl" = (
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
},
-/obj/effect/turf_decal/tile/neutral,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cBm" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -62242,12 +62259,11 @@
/turf/open/floor/plasteel,
/area/crew_quarters/bar)
"cBr" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cBs" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 6
@@ -63931,24 +63947,10 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/zone2)
"cEj" = (
-/turf/closed/wall/r_wall,
-/area/science/misc_lab)
-"cEk" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/machinery/firealarm{
+/obj/machinery/light{
dir = 4;
- pixel_x = -28
+ light_color = "#e8eaff"
},
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
-"cEl" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -63957,7 +63959,19 @@
},
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
+"cEk" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
+"cEl" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cEm" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
@@ -64330,16 +64344,10 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/zone2)
"cEN" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/sign/warning/docking,
+/turf/open/floor/plating,
+/area/hallway/secondary/exit/departure_lounge)
"cEO" = (
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment,
@@ -64629,19 +64637,12 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"cFl" = (
-/obj/machinery/light{
- dir = 4;
- light_color = "#e8eaff"
+/obj/machinery/door/airlock/external/glass{
+ name = "Departures Shuttle Dock"
},
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
-/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/obj/structure/fans/tiny,
+/turf/open/floor/plasteel,
+/area/hallway/secondary/exit/departure_lounge)
"cFm" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -64651,7 +64652,7 @@
},
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cFn" = (
/obj/structure/closet/l3closet,
/obj/structure/disposalpipe/segment,
@@ -64680,7 +64681,7 @@
},
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cFq" = (
/obj/machinery/door/firedoor,
/obj/structure/cable{
@@ -64692,7 +64693,7 @@
req_access_txt = "47"
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cFr" = (
/obj/effect/turf_decal/tile/blue{
dir = 1
@@ -64785,19 +64786,19 @@
req_access_txt = "47"
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cFx" = (
/obj/structure/cable{
icon_state = "0-4"
},
/obj/machinery/power/apc{
- areastring = "/area/science/misc_lab";
+ areastring = "/area/science/observatory";
dir = 1;
name = "Research Observatory APC";
pixel_y = 24
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cFy" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -64807,11 +64808,11 @@
},
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cFz" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cFA" = (
/obj/structure/table,
/obj/item/storage/box/beakers{
@@ -65230,7 +65231,7 @@
pixel_y = 24
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cGj" = (
/obj/machinery/camera{
c_tag = "Research - Observatory";
@@ -65241,11 +65242,11 @@
pixel_x = -28
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cGk" = (
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cGl" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -65256,7 +65257,7 @@
/obj/effect/turf_decal/tile/neutral,
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cGm" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -65264,20 +65265,20 @@
/obj/effect/turf_decal/tile/neutral,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cGn" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cGo" = (
/obj/machinery/light/small{
dir = 4;
light_color = "#d8b1b1"
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cGp" = (
/obj/structure/sign/departments/xenobio{
pixel_x = -32;
@@ -65294,7 +65295,7 @@
dir = 1
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cGq" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -65350,7 +65351,7 @@
dir = 8
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cGv" = (
/obj/effect/turf_decal/stripes/line,
/obj/structure/cable{
@@ -65997,20 +65998,20 @@
dir = 8
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cHL" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 8
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cHM" = (
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 8
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cHN" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -66020,7 +66021,7 @@
dir = 8
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cHO" = (
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 8
@@ -66880,7 +66881,7 @@
dir = 4
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cJm" = (
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
@@ -66903,7 +66904,7 @@
dir = 1
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cJp" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -66912,7 +66913,7 @@
dir = 1
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cJq" = (
/obj/machinery/atmospherics/pipe/simple/supplymain/visible,
/obj/structure/cable{
@@ -66964,7 +66965,7 @@
/area/engine/atmos)
"cJv" = (
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cJw" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -66983,7 +66984,7 @@
dir = 1
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cJx" = (
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/pipe/manifold/supplymain/visible{
@@ -67018,7 +67019,7 @@
dir = 1
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cJB" = (
/obj/machinery/light,
/obj/structure/cable{
@@ -67031,7 +67032,7 @@
dir = 1
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cJC" = (
/obj/machinery/door/airlock/engineering{
name = "Gravity Generator";
@@ -67125,14 +67126,14 @@
dir = 1
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cJL" = (
/obj/machinery/door/firedoor,
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cJM" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -67144,7 +67145,7 @@
icon_state = "4-8"
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cJO" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -67154,7 +67155,7 @@
},
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cJP" = (
/obj/structure/chair/comfy/black,
/obj/structure/cable{
@@ -67164,12 +67165,12 @@
dir = 1
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cJQ" = (
/obj/structure/chair/comfy/black,
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cJR" = (
/obj/effect/turf_decal/bot,
/obj/machinery/portable_atmospherics/canister/oxygen,
@@ -67418,7 +67419,7 @@
dir = 4
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cKs" = (
/obj/effect/turf_decal/tile/neutral{
dir = 4
@@ -67427,17 +67428,17 @@
dir = 1
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cKt" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cKu" = (
/obj/machinery/light/small,
/turf/open/floor/plasteel/dark,
-/area/science/misc_lab)
+/area/science/observatory)
"cKv" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering/glass{
@@ -68866,7 +68867,7 @@
/turf/open/floor/plating{
icon_state = "panelscorched"
},
-/area/engine/teg_hot)
+/area/engine/teg/hotloop)
"cNL" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/on{
dir = 8
@@ -68874,7 +68875,7 @@
/turf/open/floor/plating{
icon_state = "panelscorched"
},
-/area/engine/teg_cold)
+/area/engine/teg/coldloop)
"cNM" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/rack,
@@ -69117,10 +69118,6 @@
/obj/structure/table,
/turf/open/floor/plating/airless,
/area/quartermaster/miningdock/airless/no_grav)
-"cOw" = (
-/obj/effect/landmark/event_spawn,
-/turf/open/floor/plasteel,
-/area/hallway/secondary/exit)
"cOx" = (
/obj/effect/turf_decal/delivery,
/obj/structure/disposalpipe/segment{
@@ -91617,10 +91614,10 @@ aaa
aaa
aaa
aaU
-cwV
+cyX
cGp
cJw
-cwV
+cyX
aaU
aaU
aaU
@@ -91874,10 +91871,10 @@ aaa
aaa
aaa
aaU
-cwV
+cyX
cGu
cJA
-cwV
+cyX
aaU
aaa
aaU
@@ -92131,10 +92128,10 @@ aaa
aaa
aaa
aaU
-cwV
+cyX
cGu
cJB
-cwV
+cyX
aaU
aaa
aaU
@@ -92388,10 +92385,10 @@ aaa
aaa
aaa
aaU
-cwV
+cyX
cGu
cJA
-cwV
+cyX
aaU
aaa
aaU
@@ -92645,10 +92642,10 @@ aaa
aaa
aaa
aaU
-cwV
+cyX
cGu
cJA
-cwV
+cyX
aaU
aaa
aaU
@@ -92902,10 +92899,10 @@ aaa
aaa
aaa
aaU
-cwV
+cyX
cHK
cJK
-cwV
+cyX
aaU
aaa
aaU
@@ -93158,12 +93155,12 @@ cav
aaa
aaa
aaU
-cwV
-cEj
+cyX
+cze
cHL
cJL
-cEj
-cwV
+cze
+cyX
aaU
aaU
aaa
@@ -93414,14 +93411,14 @@ cav
aaU
aaU
aaU
-cwV
-cwV
+cyX
+cyX
cGj
cHM
cJN
cJv
-cwV
-cwV
+cyX
+cyX
aaU
aaa
aaa
@@ -93666,19 +93663,19 @@ cHA
cHG
cav
cav
-cEj
-cEj
-cEj
-cEj
-cEj
-cEj
+cze
+cze
+cze
+cze
+cze
+cze
cFx
cGk
cHN
cJO
cKr
cKu
-cEj
+cze
aaU
aaa
aaa
@@ -93921,12 +93918,12 @@ cHu
cHw
cHB
cHH
-cwd
-cBl
-cEk
-cEN
-cEN
-cEN
+cyV
+cza
+czl
+czq
+czq
+czq
cFm
cFq
cFy
@@ -93935,7 +93932,7 @@ cJl
cJP
cKs
cJv
-cwV
+cyX
aaU
aaa
aaa
@@ -94178,12 +94175,12 @@ cHv
caG
cHC
cHI
-cwq
-cBr
-cEl
-cEl
-cFl
-cEl
+cyW
+czb
+czm
+czm
+cEj
+czm
cFp
cFw
cFz
@@ -94192,7 +94189,7 @@ cJo
cJQ
cKs
cJv
-cwV
+cyX
aaU
aaa
aaa
@@ -94435,21 +94432,21 @@ bsM
cuY
bIk
bIk
-cwV
-cwV
-cwV
-cwV
-cwV
-cwV
-cwV
-cEj
+cyX
+cyX
+cyX
+cyX
+cyX
+cyX
+cyX
+cze
cGi
cGn
cJp
cJp
cKt
cKu
-cEj
+cze
aaU
aaa
aaa
@@ -94699,14 +94696,14 @@ aaU
aaU
aaU
aaU
-cwV
-cwV
+cyX
+cyX
cGo
cJv
cJv
cGo
-cwV
-cwV
+cyX
+cyX
aaU
aaa
aaa
@@ -94957,12 +94954,12 @@ aaa
aaa
aaa
aaU
-cwV
-cEj
-cwV
-cwV
-cEj
-cwV
+cyX
+cze
+cyX
+cyX
+cze
+cyX
aaU
aaU
aaa
@@ -101239,7 +101236,7 @@ aaa
aaa
aaa
abp
-akN
+aaa
aTd
aaa
abp
@@ -103584,28 +103581,28 @@ auZ
aBL
bnH
axh
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abF
+abF
+abF
+abF
+abF
+abF
+abF
+abF
bID
aHu
aGr
-apm
-apy
-apy
-apy
-apz
-apz
-apy
-auN
-apy
-apy
-apm
+aof
+aog
+aog
+aog
+aoL
+aoL
+aog
+avU
+aog
+aog
+aof
ayK
aFU
aJV
@@ -103840,29 +103837,29 @@ awc
axx
ayN
aAA
-aBM
-abF
-acz
-agc
-alZ
-agc
-anI
-anT
aab
+abJ
+acz
+aej
+agC
+aej
+alZ
+anq
+abF
bID
aHu
aGr
-apy
-aqO
-arY
-asw
-asN
-asw
-auD
-auY
-avI
-awa
+aog
apm
+aqU
+asa
+asK
+asa
+avC
+avV
+ayo
+aBM
+aof
ayK
aGp
aKZ
@@ -104098,28 +104095,28 @@ aeY
aBN
awN
awN
-aab
+abF
acA
acA
acA
acA
acA
acA
-aog
+anL
bNp
aFC
aFF
-apz
-aqP
-asa
-asx
-asB
-asB
-asB
-avc
-avK
-awe
-apm
+aoL
+apy
+arB
+asi
+ast
+ast
+ast
+awa
+azg
+aCq
+aof
azh
ayK
aFU
@@ -104355,28 +104352,28 @@ aeY
aCk
aeY
aeY
-aab
+abF
+acK
+aeI
+aci
adc
-agC
-acf
-adL
acA
acA
-aoL
+anP
bRF
aFC
aFF
+aoL
apz
-aqS
-asa
-asB
-asB
-asB
-asB
-avl
-avI
-awW
-apm
+arB
+ast
+ast
+ast
+ast
+awe
+ayo
+aCZ
+aof
axQ
ayY
ayK
@@ -104612,34 +104609,34 @@ akS
aCo
aor
aeY
-abJ
-adL
+abZ
+adc
acA
-acf
-anE
-anL
-anL
-aoU
+aci
+akN
+ang
+ang
+anT
ccg
aFC
ago
-apy
-aqT
-asa
-asC
-asB
-asB
-asB
-avA
-avQ
-apy
-apy
-apm
-apm
-apm
-aOd
-aOQ
-aOQ
+aog
+apB
+arB
+asv
+ast
+ast
+ast
+aws
+azo
+aog
+aog
+aof
+aof
+aof
+aOc
+aOE
+aOE
aPd
aPd
aPN
@@ -104869,34 +104866,34 @@ akU
aCp
aor
aeY
-abZ
-aej
+acf
+adL
acA
acA
acA
acA
acA
-aog
+anL
bRF
aFC
aFF
-apz
+aoL
+apG
arB
-asa
-asB
-asB
-asS
-asB
-avl
-avI
-awX
-axR
-axR
-axR
-aLF
-aOk
-aOR
-aOY
+ast
+ast
+atb
+ast
+awe
+ayo
+aDx
+aHL
+aHL
+aHL
+aNx
+aOd
+aOQ
+aOX
aQJ
aQJ
aQJ
@@ -105126,34 +105123,34 @@ akV
aqv
aor
aeY
-acf
-aeI
+aci
+adR
+agc
agT
-anq
-agT
-anP
-aof
-aab
+agc
+anh
+anE
+abF
ccq
aFC
aFF
-apz
-arF
-asa
-asB
-asB
-asB
-asB
-avC
-avQ
-apy
-axV
-azE
+aoL
+aqc
+arB
+ast
+ast
+ast
+ast
+awA
+azo
+aog
aHU
-aLO
-aOl
-aOT
-aPa
+aKp
+aMK
+aND
+aOk
+aOR
+aOY
aaU
aaU
aaU
@@ -105383,33 +105380,33 @@ aeY
aeY
aeY
aeY
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abF
+abF
+abF
+abF
+abF
+abF
+abF
+abF
ccz
aHv
aFF
-apy
-arN
-asa
-asB
-asB
-asB
-asB
-avE
-avU
-axg
-axg
-aAy
-axg
-apm
-aOq
-aOU
+aog
+aqn
+arB
+ast
+ast
+ast
+ast
+awW
+azE
+aEZ
+aEZ
+aLs
+aEZ
+aof
+aOl
+aOT
aaU
bQe
aye
@@ -105651,22 +105648,22 @@ aff
cfe
aIk
aIU
-apB
-arO
-asa
-asB
-asB
-asU
-asB
-avE
+aoU
+aqO
+arB
+ast
+ast
auC
-axg
-ayb
-aCq
-axg
-apm
-aOq
-aOU
+ast
+awW
+auN
+aEZ
+aIf
+aLF
+aEZ
+aof
+aOl
+aOT
aaU
aye
aaU
@@ -105908,22 +105905,22 @@ ahz
bRF
aEu
aJc
-apG
-arP
-asi
-asD
-asD
-atb
-asD
-avH
-auC
-axt
-ayn
-aCZ
-axg
-apm
-aOq
-aOU
+apd
+aqP
+arF
+asw
+asw
+auD
+asw
+awX
+auN
+aFc
+aIN
+aLO
+aEZ
+aof
+aOl
+aOT
aaU
aye
aaU
@@ -106165,22 +106162,22 @@ bGw
chQ
cAV
aJc
-apy
-arQ
-asv
-asK
-asR
-auC
-auC
-asv
-avV
-axM
-ayo
-aDx
-axg
-apm
-aOq
-aOV
+aog
+aqS
+arN
+asx
+asM
+auN
+auN
+arN
+aAy
+aGH
+aKj
+aMa
+aEZ
+aof
+aOl
+aOU
aaU
aye
aaU
@@ -106247,9 +106244,9 @@ bum
cyU
czd
czj
-blp
-blp
-bme
+bui
+bui
+buo
bxj
bxj
bxj
@@ -106422,22 +106419,22 @@ ahz
aAj
cAW
aJC
-apy
-arV
-apy
-apy
-apy
-apz
-apz
-apy
-apy
-axg
-axg
-aFc
-axg
-apm
-aOq
-aOU
+aog
+aqT
+aog
+aog
+aog
+aoL
+aoL
+aog
+aog
+aEZ
+aEZ
+aMz
+aEZ
+aof
+aOl
+aOT
aaU
bQe
aye
@@ -106504,9 +106501,9 @@ bsZ
bxj
byU
czk
-blp
-coy
-cdd
+bui
+cgQ
+cmz
aYp
aaa
aaa
@@ -106692,9 +106689,9 @@ aaU
aaU
cuA
cuy
-aLO
-aOx
-aOU
+aND
+aOq
+aOT
aaU
aaa
aaa
@@ -106761,9 +106758,9 @@ aaU
bxj
byU
czk
-blp
-ctH
-cdd
+bui
+cgV
+cmz
csc
aaa
aaa
@@ -106949,9 +106946,9 @@ aaa
aaa
aaa
aaU
-aMa
-aOC
-aOX
+aNQ
+aOx
+aOV
aaU
aaa
aaa
@@ -107018,9 +107015,9 @@ aaU
bxj
byU
czk
-blp
-cqT
-cdd
+bui
+cju
+cmz
aYp
aaa
aaa
@@ -107206,9 +107203,9 @@ aaa
aaa
aaa
aaU
-aMa
-aOE
-aOX
+aNQ
+aOC
+aOV
aaU
aaa
aaa
@@ -107244,7 +107241,7 @@ chj
aXF
chD
cid
-cju
+bfM
ckz
cmG
coT
@@ -107272,15 +107269,15 @@ aaa
aaU
aaU
aaU
-blp
-btK
-czl
-blp
-cqU
-bBZ
-bme
-bme
-bme
+bui
+bPE
+bPT
+bui
+ckc
+cmV
+buo
+buo
+buo
aaa
aaa
aaa
@@ -107526,19 +107523,19 @@ bzY
aaU
aaa
aaa
-blp
-bme
-bme
-blp
-btL
-czm
-bzq
bui
-clZ
buo
buo
-bme
-bme
+bui
+bPF
+bQd
+cfl
+cfy
+cmX
+cnH
+cnH
+buo
+buo
aaa
aaa
aaa
@@ -107783,28 +107780,28 @@ bBl
aaU
aaa
aaa
-bme
-bnY
-bpT
-bqL
-btL
-czn
-czy
-bui
-bui
-bui
-bui
-bui
-bme
-bme
-bme
-bme
-bme
-bme
-bme
-cnG
-bme
-bOo
+buo
+bBw
+bNJ
+bNY
+bPF
+bQr
+cfm
+cfy
+cfy
+cfy
+cfy
+cfy
+buo
+buo
+buo
+buo
+buo
+buo
+buo
+czr
+buo
+cEN
aaa
aaa
aaa
@@ -108009,14 +108006,14 @@ aQB
aQT
aSf
aTj
-aTm
-aVb
-aTv
-aTv
-aTv
-aTv
-bfn
-bjx
+aUe
+aXP
+aUf
+aUf
+aUf
+aUf
+bgJ
+blp
bmK
bov
bqR
@@ -108040,28 +108037,28 @@ bBl
aaU
aaU
aaU
-bme
-bog
-cmV
-bqM
-btL
-czm
-bui
-cOw
-bui
-bui
-bui
-bui
-bui
-bui
-bui
-bNW
-bOa
-bOe
-bOi
-cnd
-bOl
-cnH
+buo
+bBM
+bNQ
+bNZ
+bPF
+bQd
+cfy
+ckf
+cfy
+cfy
+cfy
+cfy
+cfy
+cfy
+cfy
+cwq
+cyY
+czc
+czn
+czs
+cEk
+cFl
aaa
aaa
aaa
@@ -108265,16 +108262,16 @@ ceX
aQC
aQX
aSr
-aTm
-aTm
-aVf
-aZc
-aZc
-aZc
-aZc
-bfv
-bjx
-aTm
+aUe
+aUe
+aYb
+bbi
+bbi
+bbi
+bbi
+bgR
+blp
+aUe
bow
bqS
aQC
@@ -108297,28 +108294,28 @@ bIo
aaU
cNK
aaU
-bme
-bom
-bpT
-bqU
-btL
-czo
-bPO
-bPT
-bQd
-bQd
-bQr
-bJo
-bNQ
-bNQ
-bNQ
-bNX
+buo
+bBZ
+bNJ
bOa
-bOe
-bOg
-bui
-cnf
-bme
+bPF
+bQs
+cgG
+cko
+cnc
+cnc
+coq
+cqU
+ctV
+ctV
+ctV
+cwV
+cyY
+czc
+czo
+cfy
+cma
+buo
aaa
aaa
aaa
@@ -108522,16 +108519,16 @@ ceK
aQC
aRc
aSz
-aTv
-aTZ
-aVB
-aZg
-aZg
-aZg
-aZg
-bfy
-bjL
-aTv
+aUf
+aVb
+aYi
+bbt
+bbt
+bbt
+bbt
+bha
+bme
+aUf
bow
brb
bAR
@@ -108554,28 +108551,28 @@ bBl
aaU
bIm
aaU
-blp
-bme
-bme
-brv
-btL
-czp
-bAW
-bBm
bui
-bui
-bQs
-bNH
-bme
-bme
-bme
-bme
+buo
+buo
bOb
-bme
-bOh
-cne
-bOm
-cnH
+bPF
+bUx
+cgH
+ckF
+cfy
+cfy
+cor
+crj
+buo
+buo
+buo
+buo
+cyZ
+buo
+czp
+czy
+cEl
+cFl
aaa
aaa
aaa
@@ -108752,10 +108749,10 @@ bka
bmV
bka
bps
-ang
-ang
-ang
-ang
+aPa
+aPa
+aPa
+aPa
cuB
aWj
aaU
@@ -108779,16 +108776,16 @@ aPP
aPP
aRp
aSE
-aTv
-aUb
-aWs
-aZt
-bbE
-aZt
-bdP
-bfF
-bkf
-aTv
+aUf
+aVf
+aYj
+bbx
+bcD
+bbx
+bes
+bhc
+bmf
+aUf
boB
bru
bAT
@@ -108811,28 +108808,28 @@ bzr
byT
cfc
bcT
-bmf
-bon
-bpU
-brN
-btL
-czq
-bme
-bBm
+bvb
+bCA
+bNR
+bOe
+bPF
+ccx
+buo
+ckF
+cfy
+cfy
+coy
bui
-bui
-ctV
-blp
-bme
+buo
aaU
aaU
aaU
aaU
-bme
-bme
-bme
-bme
-bme
+buo
+buo
+buo
+buo
+buo
aaa
aaa
aaa
@@ -109009,10 +109006,10 @@ bka
bnb
boV
bpt
-apd
-bfI
-cfy
-ang
+aRj
+aTm
+aTz
+aPa
cuC
cuD
cuD
@@ -109036,16 +109033,16 @@ aQu
aQI
aRr
aSG
-aTv
-aUd
-aWV
-ban
-bbH
+aUf
+aVB
+aZc
+bbz
bcO
-bdW
-bfJ
-bfJ
-bmT
+bdY
+bfn
+bjx
+bjx
+bnO
boD
brz
bBn
@@ -109068,18 +109065,18 @@ cyr
cyx
cyr
cyr
-cyD
-cyJ
-cyJ
-cyV
-cze
-czr
-bme
-bBm
-bui
-bui
-bJq
-bme
+bzq
+bHt
+bHt
+bOg
+bPG
+ccK
+buo
+ckF
+cfy
+cfy
+cpy
+buo
aaa
aaa
aaa
@@ -109266,10 +109263,10 @@ bms
bnd
boX
bpH
-ang
-bnt
-clH
-coh
+aPa
+aTv
+aTZ
+aUd
aRu
aSv
aSy
@@ -109293,16 +109290,16 @@ aQx
aQP
aQP
aQP
-aTw
-aUe
-aXh
-baT
-bbZ
+aUr
+aWs
+aZg
+bbE
bdd
-bdY
-bfM
-bkp
-bni
+bei
+bfv
+bjL
+bmT
+bnY
boE
brO
bBo
@@ -109325,18 +109322,18 @@ cys
baN
baN
baN
-coq
-box
-box
-cyW
+bAW
+bJo
+bJo
+bOh
+bPH
+cdd
+cgI
+clH
+cnd
+cog
cpy
-bPD
-bAY
-bBw
-bCA
-cql
-bJq
-bNI
+crU
aaa
aaa
aaa
@@ -109524,9 +109521,9 @@ bno
boZ
bpJ
aRF
-bvb
-cog
-ang
+aTw
+aUb
+aPa
aRX
aSw
aSM
@@ -109550,16 +109547,16 @@ aQu
aQQ
aRG
aSH
-aTv
aUf
-aXP
-baU
-bcd
+aWV
+aZt
+bbH
bdh
-bei
-bgJ
-bgJ
-bnn
+bem
+bfy
+bkf
+bkf
+bog
boF
bsx
bBn
@@ -109582,18 +109579,18 @@ bzI
bHn
bzI
bzI
-cor
-boy
-boy
-cyX
-btO
-bPE
-bme
-bBm
-ccx
-bui
+bAY
bJq
-bme
+bJq
+bOi
+bPI
+cdn
+buo
+ckF
+cne
+cfy
+cpy
+buo
aaa
aaa
aaa
@@ -109780,10 +109777,10 @@ bka
bnw
bka
brA
-ang
-ang
-ang
-ang
+aPa
+aPa
+aPa
+aPa
aaU
aaU
aaU
@@ -109807,16 +109804,16 @@ atF
atF
aRJ
aSK
-aTv
-aUr
-aYb
-bbi
-bcu
-bbi
-bem
-bgR
-bkq
-aTv
+aUf
+aWX
+ban
+bbZ
+bdl
+bbZ
+bfF
+bkp
+bni
+aUf
bpa
btk
bBE
@@ -109839,28 +109836,28 @@ bzU
bzV
cuo
bcT
-bnO
-boz
-bqp
-cyY
-btL
+bBa
+bJR
+bNW
+bOj
bPF
-bme
-bBm
-ccx
+ceu
+buo
+ckF
+cne
+cfy
+cql
bui
-crj
-blp
-bme
+buo
aaU
aaU
aaU
aaU
-bme
-bme
-bme
-bme
-bme
+buo
+buo
+buo
+buo
+buo
aaa
aaa
aaa
@@ -110064,16 +110061,16 @@ cmu
atF
aRL
aSL
-aTv
-aUt
-aYi
+aUf
+aXh
+baT
+bcd
+bdP
bbt
-bcv
-aZg
-aZg
-bha
-bkr
-aTv
+bbt
+bkq
+bnn
+aUf
bpb
bvv
bBO
@@ -110096,28 +110093,28 @@ bIp
aaU
bIx
aaU
-blp
-bme
-bme
-cyZ
-btL
-bPG
-bBa
-bBm
-ccx
bui
-bJR
-bNJ
-bme
-bme
-bme
-bme
-bOb
-bme
-bOi
-bOj
+buo
+buo
bOl
-cnH
+bPF
+cev
+cgJ
+ckF
+cne
+cfy
+cqT
+ctH
+buo
+buo
+buo
+buo
+cyZ
+buo
+czn
+cBl
+cEk
+cFl
cnE
aaa
aaa
@@ -110281,11 +110278,11 @@ aRT
cBS
cBU
cBY
-aqU
-acK
-acK
-acK
-aqU
+asB
+arP
+arP
+arP
+asB
aaa
aaa
aVs
@@ -110321,16 +110318,16 @@ cJG
cJI
aRR
aST
-aTz
-aTm
-aYj
-bbx
-bcD
-bdl
+aUt
+aUe
+baU
+bcu
+bdW
beq
-bhc
-bjx
-aTm
+bfI
+bkr
+blp
+aUe
bpe
bvY
bBR
@@ -110353,28 +110350,28 @@ bQR
aaU
cNL
aaU
-bme
-bpi
-cmX
-cza
-btL
-bPH
-bBc
-bBM
-ccx
-bui
-bui
-bJR
-bNR
-bNR
-bNR
-bNY
-bOa
-bOe
-bOg
-bui
-cnf
-bme
+buo
+bNH
+bNX
+bOm
+bPF
+cex
+cgN
+clZ
+cne
+cfy
+cfy
+cqT
+cwd
+cwd
+cwd
+cyD
+cyY
+czc
+czo
+cfy
+cma
+buo
aaa
aaa
aaa
@@ -110538,11 +110535,11 @@ aXn
cBM
bDY
bEd
-aqU
-awA
-aIN
-aMz
-acK
+asB
+auR
+avE
+axg
+arP
aaa
aaa
aaa
@@ -110579,14 +110576,14 @@ atF
aRV
aRV
aTC
-aTm
-aVb
-bbz
-aTv
-aTv
-bes
-bfn
-bjx
+aUe
+aXP
+bcv
+aUf
+aUf
+bfJ
+bgJ
+blp
bny
bpb
bqS
@@ -110610,28 +110607,28 @@ bIp
aaU
aaU
aaU
-bme
-bog
-bpT
-czb
-btL
-bPI
-bUx
-bUx
-ccK
-cOw
-bui
-bui
-bui
-bui
-bui
-bNZ
-bOa
-bOe
-bOh
-cnc
-bOm
-cnH
+buo
+bBM
+bNJ
+bOo
+bPF
+cfi
+cgO
+cgO
+cnf
+ckf
+cfy
+cfy
+cfy
+cfy
+cfy
+cyJ
+cyY
+czc
+czp
+cBr
+cEl
+cFl
aaa
aaa
aaa
@@ -110793,12 +110790,12 @@ aql
aCe
aYK
aDr
-aci
-aqU
-aqU
-azg
-aHL
-aMK
+arO
+asB
+asB
+auY
+avw
+axt
anK
anK
aHA
@@ -110867,28 +110864,28 @@ bIp
aaU
aaa
aaa
-bme
-bpj
-bpT
-czc
-cze
-czs
-czy
-bui
-bui
-bui
-bui
-bui
-bme
-bme
-bme
-bme
-bme
-bme
-bme
-cnG
-bme
-bOo
+buo
+bNI
+bNJ
+bPD
+bPG
+cfj
+cfm
+cfy
+cfy
+cfy
+cfy
+cfy
+buo
+buo
+buo
+buo
+buo
+buo
+buo
+czr
+buo
+cEN
aaa
aaa
aaa
@@ -111050,12 +111047,12 @@ aka
aLU
aNE
aRd
-acK
-arX
-asM
-azo
-aKj
-aNx
+arP
+asC
+asN
+avc
+avH
+axM
aTo
aTt
aTJ
@@ -111124,19 +111121,19 @@ bUn
aaU
aaa
aaa
-blp
-bme
-bme
-blp
-btL
-bPH
-bBe
bui
-cma
-bHt
-bHt
-bme
-bme
+buo
+buo
+bui
+bPF
+cex
+cgP
+cfy
+cnG
+coh
+coh
+buo
+buo
aaa
aaa
aaa
@@ -111307,12 +111304,12 @@ aKf
aMb
aPl
aRf
-adR
-ast
-auR
-aGH
-aKp
-aND
+arQ
+asD
+asR
+avl
+avI
+axR
aTr
arH
aVa
@@ -111384,15 +111381,15 @@ aaa
aaU
aaU
aaU
-blp
-cmy
-cmz
-blp
-cqU
-blp
-bme
-bme
-bme
+bui
+bPO
+cfk
+bui
+ckc
+bui
+buo
+buo
+buo
aaa
aaa
aaa
@@ -111564,12 +111561,12 @@ aKf
aMb
aPx
aLj
-anh
+arV
asG
+asS
avw
-aHL
-aHL
-aNQ
+avw
+axV
aHx
asc
aWn
@@ -111644,9 +111641,9 @@ aaU
bxw
bza
bMQ
-blp
-cnf
-cdd
+bui
+cma
+cmz
aYp
aaa
aaa
@@ -111821,12 +111818,12 @@ aKm
aMc
aPx
aRg
-aqc
+arX
asI
-aws
-aIf
-aLs
-aOc
+asU
+avA
+avK
+ayb
aHz
btb
aWn
@@ -111871,7 +111868,7 @@ cLZ
chI
ciH
cjX
-ckF
+bnt
cns
cpo
cpT
@@ -111901,9 +111898,9 @@ bpP
cro
bza
bMQ
-blp
-ctH
-cdd
+bui
+cgV
+cmz
csc
aaa
aaa
@@ -112071,19 +112068,19 @@ arv
aub
azS
aBG
-aEZ
+anI
aFS
aHd
aKr
aMf
aPy
aRi
-aqn
-aqU
-aci
-aci
-aci
-aRj
+arY
+asB
+arO
+arO
+arO
+ayn
aHy
bDc
aWw
@@ -112158,9 +112155,9 @@ bYe
bHL
bYt
bYD
-blp
-crU
-cdd
+bui
+cmy
+cmz
aYp
aaa
aaa
@@ -112339,7 +112336,7 @@ aPx
aTN
avm
aVH
-aWX
+avQ
aZF
anK
aHz
@@ -112405,20 +112402,20 @@ bie
bZl
cqQ
bqD
-cdn
-cex
-cgG
-cex
-cex
+bom
+boy
+bqp
+boy
+boy
btz
cOe
btB
btB
btA
-blp
-blp
-blp
-blp
+bui
+bui
+bui
+bui
aaU
aaU
aaU
@@ -112662,11 +112659,11 @@ bdH
bWO
cqR
bqE
-cdn
-cfi
-cgH
-cgN
-ckc
+bom
+boz
+bqL
+brv
+bBc
btA
bMQ
bta
@@ -112919,11 +112916,11 @@ cvN
bjm
bXX
bqD
-ceu
-cfj
-cgI
-cgO
-ckf
+bon
+bpi
+bqM
+brN
+bBe
bLZ
bNt
bta
@@ -113176,11 +113173,11 @@ bdI
cNx
bXX
bqD
-cdn
-cfk
-cgJ
-cgP
-ckc
+bom
+bpj
+bqU
+btK
+bBc
btB
bNV
bta
@@ -113433,11 +113430,11 @@ cIC
bjm
bXX
bqD
-cev
-cfl
-cgI
-cgQ
-cko
+box
+bpT
+bqM
+btL
+bBm
btC
bPm
bta
@@ -113690,11 +113687,11 @@ bBU
bnN
crc
buw
-cex
-cfm
-cgH
-cgV
-ckc
+boy
+bpU
+bqL
+btO
+bBc
btD
bPm
bxH
@@ -113947,11 +113944,11 @@ bgf
bez
cxB
bhf
-cex
-cex
-cex
-cex
-cex
+boy
+boy
+boy
+boy
+boy
btz
bPn
btE
diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm
index 51a5fb3ece..a084f2ae34 100644
--- a/code/__DEFINES/dcs/signals.dm
+++ b/code/__DEFINES/dcs/signals.dm
@@ -136,11 +136,15 @@
#define COMSIG_ATOM_ATTACK_HAND "atom_attack_hand" //from base of atom/attack_hand(): (mob/user)
#define COMSIG_ATOM_ATTACK_PAW "atom_attack_paw" //from base of atom/attack_paw(): (mob/user)
#define COMPONENT_NO_ATTACK_HAND 1 //works on all 3.
+/////////////////
+
//This signal return value bitflags can be found in __DEFINES/misc.dm
#define COMSIG_ATOM_INTERCEPT_Z_FALL "movable_intercept_z_impact" //called for each movable in a turf contents on /turf/zImpact(): (atom/movable/A, levels)
-
-/////////////////
+/// Called from orbit component: (atom/movable/orbiter, radius, clockwise, rotation_speed, rotation_segments, pre_rotation)
+#define COMSIG_ATOM_ORBIT_BEGIN "atom_orbit_begin"
+/// Called from orbit component: (atom/movable/orbiter, refreshing)
+#define COMSIG_ATOM_ORBIT_END "atom_orbit_end"
#define COMSIG_ENTER_AREA "enter_area" //from base of area/Entered(): (/area)
#define COMSIG_EXIT_AREA "exit_area" //from base of area/Exited(): (/area)
@@ -536,3 +540,7 @@
#define COMSIG_XENO_TURF_CLICK_SHIFT "xeno_turf_click_shift" //from turf ShiftClickOn(): (/mob)
#define COMSIG_XENO_TURF_CLICK_CTRL "xeno_turf_click_alt" //from turf AltClickOn(): (/mob)
#define COMSIG_XENO_MONKEY_CLICK_CTRL "xeno_monkey_click_ctrl" //from monkey CtrlClickOn(): (/mob)
+
+// twitch plays
+/// Returns direction: (wipe_votes)
+#define COMSIG_TWITCH_PLAYS_MOVEMENT_DATA "twitch_plays_movement_data"
diff --git a/code/__HELPERS/custom_holoforms.dm b/code/__HELPERS/custom_holoforms.dm
index 34b31cc1c7..2733a97e14 100644
--- a/code/__HELPERS/custom_holoforms.dm
+++ b/code/__HELPERS/custom_holoforms.dm
@@ -72,3 +72,11 @@
ASSERT(target_prefs)
//In the future, maybe add custom path allowances a la admin create outfit but for now..
return generate_custom_holoform_from_prefs(target_prefs, null, null, TRUE, TRUE)
+
+//Errors go to user.
+/proc/generate_custom_holoform_from_prefs_safe(datum/preferences/prefs, mob/user)
+ if(user)
+ if(user.client.prefs.last_custom_holoform > world.time - CUSTOM_HOLOFORM_DELAY)
+ to_chat(user, "You are attempting to set your custom holoform too fast!")
+ return
+ return generate_custom_holoform_from_prefs(prefs, null, null, TRUE, TRUE)
diff --git a/code/datums/components/orbiter.dm b/code/datums/components/orbiter.dm
index 53373de6d7..49b19f767c 100644
--- a/code/datums/components/orbiter.dm
+++ b/code/datums/components/orbiter.dm
@@ -54,6 +54,7 @@
move_react()
/datum/component/orbiter/proc/begin_orbit(atom/movable/orbiter, radius, clockwise, rotation_speed, rotation_segments, pre_rotation)
+ SEND_SIGNAL(parent, COMSIG_ATOM_ORBIT_BEGIN, orbiter, radius, clockwise, rotation_speed, rotation_segments, pre_rotation)
if(orbiter.orbiting)
if(orbiter.orbiting == src)
orbiter.orbiting.end_orbit(orbiter, TRUE)
@@ -87,6 +88,7 @@
/datum/component/orbiter/proc/end_orbit(atom/movable/orbiter, refreshing=FALSE)
if(!orbiters[orbiter])
return
+ SEND_SIGNAL(parent, COMSIG_ATOM_ORBIT_END, orbiter, refreshing)
UnregisterSignal(orbiter, COMSIG_MOVABLE_MOVED)
orbiter.SpinAnimation(0, 0)
if(istype(orbiters[orbiter],/matrix)) //This is ugly.
diff --git a/code/datums/components/riding.dm b/code/datums/components/riding.dm
index 973ca7463e..03f3820a9b 100644
--- a/code/datums/components/riding.dm
+++ b/code/datums/components/riding.dm
@@ -133,7 +133,7 @@
//KEYS
/datum/component/riding/proc/keycheck(mob/user)
- return !keytype || user.is_holding_item_of_type(keytype)
+ return !keytype || user?.is_holding_item_of_type(keytype)
//BUCKLE HOOKS
/datum/component/riding/proc/restore_position(mob/living/buckled_mob)
@@ -153,7 +153,7 @@
/datum/component/riding/proc/handle_ride(mob/user, direction)
var/atom/movable/AM = parent
- if(user.incapacitated())
+ if(user && user.incapacitated())
Unbuckle(user)
return
if(world.time < last_vehicle_move + ((last_move_diagonal? 2 : 1) * vehicle_move_delay))
diff --git a/code/datums/components/twitch_plays.dm b/code/datums/components/twitch_plays.dm
new file mode 100644
index 0000000000..aadbd58b4b
--- /dev/null
+++ b/code/datums/components/twitch_plays.dm
@@ -0,0 +1,104 @@
+/**
+ * Observers voting on things through orbiting
+ */
+/datum/component/twitch_plays
+ /// Observers
+ var/list/mob/players = list()
+
+/datum/component/twitch_plays/Initialize(...)
+ . = ..()
+ if(!isatom(parent))
+ return COMPONENT_INCOMPATIBLE
+ RegisterSignal(parent, COMSIG_ATOM_ORBIT_BEGIN, .proc/on_start_orbit)
+ RegisterSignal(parent, COMSIG_ATOM_ORBIT_END, .proc/on_end_orbit)
+
+/datum/component/twitch_plays/Destroy(force, silent)
+ for(var/i in players)
+ DetachPlayer(i)
+ return ..()
+
+/datum/component/twitch_plays/proc/on_start_orbit(datum/source, atom/movable/orbiter)
+ if(!isobserver(orbiter))
+ return
+ AttachPlayer(orbiter)
+
+/datum/component/twitch_plays/proc/on_end_orbit(datum/source, atom/movable/orbiter)
+ if(!(orbiter in players))
+ return
+ DetachPlayer(orbiter)
+
+/datum/component/twitch_plays/proc/AttachPlayer(mob/dead/observer)
+ players |= observer
+ RegisterSignal(observer, COMSIG_PARENT_QDELETING, .proc/on_end_orbit)
+
+/datum/component/twitch_plays/proc/DetachPlayer(mob/dead/observer)
+ players -= observer
+ UnregisterSignal(observer, COMSIG_PARENT_QDELETING)
+
+/// Simple movement one
+/datum/component/twitch_plays/simple_movement
+ /// Movement votes by observer
+ var/list/votes = list()
+ /// Allow diagonals
+ var/allow_diagonal = FALSE
+
+/datum/component/twitch_plays/simple_movement/Initialize(...)
+ . = ..()
+ if(. & COMPONENT_INCOMPATIBLE)
+ return
+ RegisterSignal(parent, COMSIG_TWITCH_PLAYS_MOVEMENT_DATA, .proc/fetch_data)
+
+/datum/component/twitch_plays/simple_movement/AttachPlayer(mob/dead/observer)
+ . = ..()
+ RegisterSignal(observer, COMSIG_MOVABLE_PRE_MOVE, .proc/pre_move)
+
+/datum/component/twitch_plays/simple_movement/DetachPlayer(mob/dead/observer)
+ . = ..()
+ UnregisterSignal(observer, COMSIG_MOVABLE_PRE_MOVE)
+
+/datum/component/twitch_plays/simple_movement/proc/pre_move(datum/source, turf/newLoc)
+ if(get_dist(newLoc, parent) > 1) // they're trying to escape orbit
+ return
+ . = COMPONENT_MOVABLE_BLOCK_PRE_MOVE
+ var/dir = get_dir(parent, newLoc)
+ if(!dir)
+ return
+ if(allow_diagonal || !((dir - 1) & dir))
+ votes[source] = dir
+ else // pick one or the other
+ votes[source] = prob(50)? (dir & ~(dir - 1)) : (dir & (dir - 1))
+
+/datum/component/twitch_plays/simple_movement/proc/fetch_data(datum/source, wipe_votes)
+ if(!votes.len)
+ return
+ var/list/total = list(TEXT_NORTH, TEXT_SOUTH, TEXT_EAST, TEXT_WEST)
+ for(var/i in votes)
+ total[num2text(votes[i])] += 1
+ . = text2num(pickweight(total, 0))
+ if(wipe_votes)
+ votes.len = 0
+
+/datum/component/twitch_plays/simple_movement/auto
+ var/move_delay = 2
+ var/last_move = 0
+
+/datum/component/twitch_plays/simple_movement/auto/Initialize(...)
+ if(!ismovable(parent))
+ return COMPONENT_INCOMPATIBLE
+ . = ..()
+ if(. & COMPONENT_INCOMPATIBLE)
+ return
+ START_PROCESSING(SSfastprocess, src)
+
+/datum/component/twitch_plays/simple_movement/auto/Destroy(force, silent)
+ STOP_PROCESSING(SSfastprocess, src)
+ return ..()
+
+/datum/component/twitch_plays/simple_movement/auto/process()
+ var/dir = fetch_data(null, TRUE)
+ if(!dir)
+ return
+ if(world.time < (last_move + move_delay))
+ return
+ last_move = world.time
+ step(parent, dir)
diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm
index 8af80dc6b8..5881c76827 100644
--- a/code/datums/martial/sleeping_carp.dm
+++ b/code/datums/martial/sleeping_carp.dm
@@ -7,6 +7,7 @@
id = MARTIALART_SLEEPINGCARP
allow_temp_override = FALSE
help_verb = /mob/living/carbon/human/proc/sleeping_carp_help
+ block_parry_data = /datum/block_parry_data/sleeping_carp
pugilist = TRUE
/datum/martial_art/the_sleeping_carp/proc/check_streak(mob/living/carbon/human/A, mob/living/carbon/human/D)
diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm
index 5310b24202..1eec1ba7fd 100644
--- a/code/game/area/Space_Station_13_areas.dm
+++ b/code/game/area/Space_Station_13_areas.dm
@@ -325,10 +325,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Service Hallway"
icon_state = "hall_service"
-/area/hallway/secondary/civilian
- name = "Civilian Wing"
- icon_state = "hallFS"
-
//Command
@@ -469,6 +465,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "yellow"
nightshift_public_area = NIGHTSHIFT_AREA_RECREATION
+/area/crew_quarters/arcade
+ name = "Arcade"
+ icon_state = "abandoned_g_den"
+ nightshift_public_area = NIGHTSHIFT_AREA_RECREATION
+
/area/crew_quarters/fitness
name = "Fitness Room"
icon_state = "fitness"
@@ -479,6 +480,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "fitness"
nightshift_public_area = NIGHTSHIFT_AREA_RECREATION
+/area/crew_quarters/fitness/pool
+ name = "Pool Area"
+ icon_state = "pool"
+
/area/crew_quarters/cafeteria
name = "Cafeteria"
icon_state = "cafeteria"
@@ -765,6 +770,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "medbay3"
ambientsounds = MEDICAL
+/area/medical/clinic
+ name = "Clinic"
+ icon_state = "medbay3"
+ ambientsounds = MEDICAL
+
/area/medical/abandoned
name = "Abandoned Medbay"
icon_state = "medbay3"
@@ -1036,10 +1046,19 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "janitor"
flags_1 = NONE
+/area/janitor/aux
+ name = "Auxiliary Custodial Closet"
+ icon_state = "janitor"
+ flags_1 = NONE
+
/area/hydroponics
name = "Hydroponics"
icon_state = "hydro"
+/area/hydroponics/lobby
+ name = "Hydroponics Lobby"
+ icon_state = "hydro"
+
/area/hydroponics/garden
name = "Garden"
icon_state = "garden"
@@ -1058,6 +1077,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Science Division"
icon_state = "toxlab"
+/area/science/observatory
+ name = "Research Observatory"
+ icon_state = "toxmisc"
+
/area/science/lab
name = "Research and Development"
icon_state = "toxlab"
@@ -1186,6 +1209,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
icon_state = "storage"
clockwork_warp_allowed = FALSE
+/area/storage/emergency
+ name = "Emergency Storage"
+ icon_state = "emergencystorage"
+
/area/storage/emergency/starboard
name = "Starboard Emergency Storage"
icon_state = "emergencystorage"
@@ -1395,100 +1422,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Telecommunications Satellite Lounge"
icon_state = "tcomsatlounge"
-/area/crew_quarters/fitness/pool
- name = "Pool Area"
- icon_state = "pool"
-
-/area/crew_quarters/dorms/blue
- name = "Blue Dorms"
- icon_state = "Sleep"
- nightshift_public_area = NIGHTSHIFT_AREA_NONE
-
-/area/crew_quarters/dorms/purple
- name = "Purple Dorms"
- icon_state = "Sleep"
- nightshift_public_area = NIGHTSHIFT_AREA_NONE
-
-/area/crew_quarters/lounge/jazz
- name = "Jazz Lounge"
- icon_state = "yellow"
- ambientsounds = list('sound/ambience/ambidet1.ogg','sound/ambience/ambidet2.ogg')
- nightshift_public_area = NIGHTSHIFT_AREA_RECREATION
-
-
-/area/crew_quarters/fitness/recreation
- name = "Recreation Area"
- icon_state = "fitness"
- nightshift_public_area = NIGHTSHIFT_AREA_RECREATION
-
-/area/crew_quarters/fitness/cogpool
- name = "Pool"
- icon_state = "fitness"
- clockwork_warp_fail = "Pool's closed."
- nightshift_public_area = NIGHTSHIFT_AREA_RECREATION
-
-/area/crew_quarters/barbershop
- name = "Barbershop"
- icon_state = "blue"
- nightshift_public_area = NIGHTSHIFT_AREA_RECREATION
-
-/area/crew_quarters/observatory
- name = "Observatory"
- icon_state = "Sleep"
-
-//Engineering
-
-/area/engine/teg_hot
- name = "Hot Loop"
- icon_state = "red"
-
-/area/engine/teg_cold
- name = "Cold Loop"
- icon_state = "blue"
-
-/area/engine/workshop
- name = "Engineering Workshop"
- icon_state = "engine"
-
-/area/security/courtroom/jury
- name = "Jury Room"
- icon_state = "courtroom"
-
-/area/quartermaster/miningdock/airless
- name = "Mining Dock"
- icon_state = "mining"
- has_gravity = STANDARD_GRAVITY
- valid_territory = FALSE
- outdoors = TRUE
- ambientsounds = SPACE
- blob_allowed = FALSE //While part of the station, what good will it do you?
-
-/area/quartermaster/miningdock/airless/no_grav
- name = "Mining Dock"
- icon_state = "mining"
- dynamic_lighting = DYNAMIC_LIGHTING_IFSTARLIGHT
- power_light = FALSE
- power_equip = FALSE
- power_environ = FALSE
- valid_territory = FALSE
- outdoors = TRUE
- ambientsounds = SPACE
- blob_allowed = FALSE //While part of the station, what good will it do you?
-
-/area/janitor/aux
- name = "Auxiliary Custodial Closet"
- icon_state = "janitor"
- flags_1 = NONE
-
-/area/hydroponics/lobby
- name = "Hydroponics Lobby"
- icon_state = "hydro"
-
-//Storage
-
-/area/storage/emergency/generic
- name = "Emergency Storage"
- icon_state = "emergencystorage"
//Construction
@@ -1545,10 +1478,99 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Storage Wing"
icon_state = "storage_wing"
-//Routers
+//Areas that predominantly only apply to CogStation
+
+/area/crew_quarters/dorms/blue
+ name = "Blue Dorms"
+ icon_state = "Sleep"
+ nightshift_public_area = NIGHTSHIFT_AREA_NONE
+
+/area/crew_quarters/dorms/purple
+ name = "Purple Dorms"
+ icon_state = "Sleep"
+ nightshift_public_area = NIGHTSHIFT_AREA_NONE
+
+/area/crew_quarters/lounge/jazz
+ name = "Jazz Lounge"
+ icon_state = "yellow"
+ ambientsounds = list('sound/ambience/ambidet1.ogg','sound/ambience/ambidet2.ogg')
+ nightshift_public_area = NIGHTSHIFT_AREA_RECREATION
+
+/area/crew_quarters/fitness/cogpool
+ name = "Pool"
+ icon_state = "fitness"
+ clockwork_warp_fail = "Pool's closed."
+ nightshift_public_area = NIGHTSHIFT_AREA_RECREATION
+
+/area/crew_quarters/barbershop
+ name = "Barbershop"
+ icon_state = "blue"
+ nightshift_public_area = NIGHTSHIFT_AREA_RECREATION
+
+/area/crew_quarters/observatory
+ name = "Observatory"
+ icon_state = "Sleep"
+
+/area/hallway/secondary/civilian
+ name = "Civilian Wing"
+ icon_state = "hallFS"
+
+/area/engine/atmos/aftair
+ name = "Aft Air Hookup"
+ icon_state = "atmos"
+ flags_1 = NONE
+
+/area/engine/teg
+ name = "Thermo-Electric Generator"
+ icon_state = "engine"
+
+/area/engine/teg/hotloop
+ name = "Hot Loop"
+ icon_state = "red"
+
+/area/engine/teg/coldloop
+ name = "Cold Loop"
+ icon_state = "blue"
+
+/area/engine/workshop
+ name = "Engineering Workshop"
+ icon_state = "engine"
+
+/area/engine/substation
+ name = "Electrical Substation"
+ icon_state = "engine"
+
+/area/security/courtroom/jury
+ name = "Jury Room"
+ icon_state = "courtroom"
+
+/area/quartermaster/miningdock/airless
+ name = "Mining Dock"
+ icon_state = "mining"
+ has_gravity = STANDARD_GRAVITY
+ valid_territory = FALSE
+ outdoors = TRUE
+ ambientsounds = SPACE
+ blob_allowed = FALSE //While part of the station, what good will it do you?
+
+/area/quartermaster/miningdock/airless/no_grav
+ name = "Mining Dock"
+ icon_state = "mining"
+ dynamic_lighting = DYNAMIC_LIGHTING_IFSTARLIGHT
+ power_light = FALSE
+ power_equip = FALSE
+ power_environ = FALSE
+ valid_territory = FALSE
+ outdoors = TRUE
+ ambientsounds = SPACE
+ blob_allowed = FALSE //While part of the station, what good will it do you?
+
+
+
+//Routers (currently exclusive to CogStation)
/area/router
- name = "Router"
+ name = "Routing Depot"
icon_state = "yellow"
ambientsounds = ENGINEERING
diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm
index c6484b051c..056902801f 100644
--- a/code/game/machinery/spaceheater.dm
+++ b/code/game/machinery/spaceheater.dm
@@ -18,7 +18,7 @@
var/mode = HEATER_MODE_STANDBY
var/setMode = "auto" // Anything other than "heat" or "cool" is considered auto.
var/targetTemperature = T20C
- var/heatingPower = 40000
+ var/heatingPower = 10000
var/efficiency = 20000
var/temperatureTolerance = 1
var/settableTemperatureMedian = 30 + T0C
@@ -74,46 +74,55 @@
if(cell && cell.charge > 0)
var/turf/L = loc
- if(!istype(L))
- if(mode != HEATER_MODE_STANDBY)
- mode = HEATER_MODE_STANDBY
- update_icon()
- return
+ PerformHeating(L)
- var/datum/gas_mixture/env = L.return_air()
+ for(var/direction in GLOB.alldirs)
+ L=get_step(src,direction)
+ if(!locate(/turf/closed) in L) // we don't want to heat walls and cause jank
+ PerformHeating(L)
- var/newMode = HEATER_MODE_STANDBY
- if(setMode != HEATER_MODE_COOL && env.return_temperature() < targetTemperature - temperatureTolerance)
- newMode = HEATER_MODE_HEAT
- else if(setMode != HEATER_MODE_HEAT && env.return_temperature() > targetTemperature + temperatureTolerance)
- newMode = HEATER_MODE_COOL
-
- if(mode != newMode)
- mode = newMode
- update_icon()
-
- if(mode == HEATER_MODE_STANDBY)
- return
-
- var/heat_capacity = env.heat_capacity()
- var/requiredPower = abs(env.return_temperature() - targetTemperature) * heat_capacity
- requiredPower = min(requiredPower, heatingPower)
-
- if(requiredPower < 1)
- return
-
- var/deltaTemperature = requiredPower / heat_capacity
- if(mode == HEATER_MODE_COOL)
- deltaTemperature *= -1
- if(deltaTemperature)
- env.set_temperature(env.return_temperature() + deltaTemperature)
- air_update_turf()
- cell.use(requiredPower / efficiency)
else
on = FALSE
update_icon()
return PROCESS_KILL
+/obj/machinery/space_heater/proc/PerformHeating(turf/L)
+ if(!istype(L))
+ if(mode != HEATER_MODE_STANDBY)
+ mode = HEATER_MODE_STANDBY
+ update_icon()
+ return
+
+ var/datum/gas_mixture/env = L.return_air()
+
+ var/newMode = HEATER_MODE_STANDBY
+ if(setMode != HEATER_MODE_COOL && env.return_temperature() < targetTemperature - temperatureTolerance)
+ newMode = HEATER_MODE_HEAT
+ else if(setMode != HEATER_MODE_HEAT && env.return_temperature() > targetTemperature + temperatureTolerance)
+ newMode = HEATER_MODE_COOL
+
+ if(mode != newMode)
+ mode = newMode
+ update_icon()
+
+ if(mode == HEATER_MODE_STANDBY)
+ return
+
+ var/heat_capacity = env.heat_capacity()
+ var/requiredPower = abs(env.return_temperature() - targetTemperature) * heat_capacity
+ requiredPower = min(requiredPower, heatingPower)
+
+ if(requiredPower < 1)
+ return
+
+ var/deltaTemperature = requiredPower / heat_capacity
+ if(mode == HEATER_MODE_COOL)
+ deltaTemperature *= -1
+ if(deltaTemperature)
+ env.set_temperature(env.return_temperature() + deltaTemperature)
+ air_update_turf()
+ cell.use(requiredPower / efficiency)
+
/obj/machinery/space_heater/RefreshParts()
var/laser = 2
var/cap = 1
@@ -122,7 +131,7 @@
for(var/obj/item/stock_parts/capacitor/M in component_parts)
cap += M.rating
- heatingPower = laser * 40000
+ heatingPower = laser * 10000
settableTemperatureRange = cap * 30
efficiency = (cap + 1) * 10000
diff --git a/code/game/objects/items/credit_holochip.dm b/code/game/objects/items/credit_holochip.dm
index 21cfd1fbad..b7f7f5f2d1 100644
--- a/code/game/objects/items/credit_holochip.dm
+++ b/code/game/objects/items/credit_holochip.dm
@@ -80,6 +80,17 @@
to_chat(user, "You insert the credits into [src].")
update_icon()
qdel(H)
+ if(istype(I, /obj/item/card/id))
+ var/obj/item/card/id/ID = I
+ if(!ID.registered_account)
+ to_chat(user, "[ID] doesn't have a linked account to deposit into!")
+ return
+ for(var/obj/item/holochip/money in src.loc.contents)
+ ID.attackby(money, user)
+ for(var/obj/item/stack/spacecash/money in src.loc.contents)
+ ID.attackby(money, user)
+ for(var/obj/item/coin/money in src.loc.contents)
+ ID.attackby(money, user)
/obj/item/holochip/AltClick(mob/user)
if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
diff --git a/code/game/objects/items/stacks/cash.dm b/code/game/objects/items/stacks/cash.dm
index 954950f5e6..e2036835ce 100644
--- a/code/game/objects/items/stacks/cash.dm
+++ b/code/game/objects/items/stacks/cash.dm
@@ -33,6 +33,20 @@
. = ..()
update_desc()
+/obj/item/stack/spacecash/attackby(obj/item/W, mob/user, params)
+ . = ..()
+ if(istype(W, /obj/item/card/id))
+ var/obj/item/card/id/ID = W
+ if(!ID.registered_account)
+ to_chat(user, "[ID] doesn't have a linked account to deposit into!")
+ return
+ for(var/obj/item/holochip/money in src.loc.contents)
+ ID.attackby(money, user)
+ for(var/obj/item/stack/spacecash/money in src.loc.contents)
+ ID.attackby(money, user)
+ for(var/obj/item/coin/money in src.loc.contents)
+ ID.attackby(money, user)
+
/obj/item/stack/spacecash/c1
icon_state = "spacecash"
singular_name = "one credit bill"
diff --git a/code/modules/antagonists/changeling/powers/fakedeath.dm b/code/modules/antagonists/changeling/powers/fakedeath.dm
index da626bcf1c..08dc85efbf 100644
--- a/code/modules/antagonists/changeling/powers/fakedeath.dm
+++ b/code/modules/antagonists/changeling/powers/fakedeath.dm
@@ -16,7 +16,7 @@
if(user.stat != DEAD)
user.emote("deathgasp")
user.tod = STATION_TIME_TIMESTAMP("hh:mm:ss", world.time)
- user.fakedeath("changeling") //play dead
+ user.fakedeath("changeling", TRUE) //play dead
user.update_stat()
addtimer(CALLBACK(src, .proc/ready_to_regenerate, user), LING_FAKEDEATH_TIME, TIMER_UNIQUE)
diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm
index 574ebf66a1..5b6a7648c8 100644
--- a/code/modules/antagonists/changeling/powers/mutations.dm
+++ b/code/modules/antagonists/changeling/powers/mutations.dm
@@ -21,6 +21,7 @@
chemical_cost = 1000
dna_cost = -1
+ var/recharge_slowdown = 0
var/silent = FALSE
var/weapon_type
var/weapon_name_simple
@@ -37,6 +38,8 @@
if(!silent)
playsound(user, 'sound/effects/blobattack.ogg', 30, 1)
user.visible_message("With a sickening crunch, [user] reforms [user.p_their()] [weapon_name_simple] into an arm!", "We assimilate the [weapon_name_simple] back into our body.", "You need one length of cable to attach a string to the coin!")
return
+ else if(istype(W, /obj/item/card/id))
+ var/obj/item/card/id/ID = W
+ if(!ID.registered_account)
+ to_chat(user, "[ID] doesn't have a linked account to deposit into!")
+ return
+ for(var/obj/item/holochip/money in src.loc.contents)
+ ID.attackby(money, user)
+ for(var/obj/item/stack/spacecash/money in src.loc.contents)
+ ID.attackby(money, user)
+ for(var/obj/item/coin/money in src.loc.contents)
+ ID.attackby(money, user)
else
..()
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 9493d11792..dc53f9487f 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -380,6 +380,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
/mob/dead/observer/Move(NewLoc, direct)
+ if (SEND_SIGNAL(src, COMSIG_MOVABLE_PRE_MOVE, NewLoc) & COMPONENT_MOVABLE_BLOCK_PRE_MOVE)
+ return
if(updatedir)
setDir(direct)//only update dir if we actually need it, so overlays won't spin on base sprites that don't have directions of their own
var/oldloc = loc
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 837b4f73cf..3015d1edc3 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -190,6 +190,11 @@
message = "chimes."
sound = 'sound/machines/chime.ogg'
+/datum/emote/sound/human/squeak
+ key = "squeak"
+ message = "squeaks."
+ sound = 'sound/effects/mousesqueek.ogg'
+
//rock paper scissors emote handling
/mob/living/carbon/human/proc/beginRockPaperScissors(var/chosen_move)
GLOB.rockpaperscissors_players[src] = list(chosen_move, ROCKPAPERSCISSORS_NOT_DECIDED)
diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
index 988bf81f57..803d3ec245 100644
--- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
@@ -7,7 +7,7 @@
species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,WINGCOLOR,HAS_FLESH)
mutantlungs = /obj/item/organ/lungs/slime
mutant_heart = /obj/item/organ/heart/slime
- mutant_bodyparts = list("mcolor" = "FFFFFF", "mam_tail" = "None", "mam_ears" = "None", "mam_snouts" = "None", "taur" = "None", "deco_wings" = "None")
+ mutant_bodyparts = list("mcolor" = "FFFFFF", "mam_tail" = "None", "mam_ears" = "None", "mam_snouts" = "None", "taur" = "None", "deco_wings" = "None", "legs" = "Plantigrade")
inherent_traits = list(TRAIT_TOXINLOVER)
meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime
gib_types = list(/obj/effect/gibspawner/slime, /obj/effect/gibspawner/slime/bodypartless)
@@ -406,7 +406,7 @@
default_color = "00FFFF"
species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR)
inherent_traits = list(TRAIT_TOXINLOVER)
- mutant_bodyparts = list("mcolor" = "FFFFFF", "mcolor2" = "FFFFFF","mcolor3" = "FFFFFF", "mam_tail" = "None", "mam_ears" = "None", "mam_body_markings" = "Plain", "mam_snouts" = "None", "taur" = "None")
+ mutant_bodyparts = list("mcolor" = "FFFFFF", "mcolor2" = "FFFFFF","mcolor3" = "FFFFFF", "mam_tail" = "None", "mam_ears" = "None", "mam_body_markings" = "Plain", "mam_snouts" = "None", "taur" = "None", "legs" = "Plantigrade")
say_mod = "says"
hair_color = "mutcolor"
hair_alpha = 160 //a notch brighter so it blends better.
diff --git a/code/modules/mob/living/silicon/custom_holoform.dm b/code/modules/mob/living/silicon/custom_holoform.dm
index e4f7f6780b..e7070e4576 100644
--- a/code/modules/mob/living/silicon/custom_holoform.dm
+++ b/code/modules/mob/living/silicon/custom_holoform.dm
@@ -1,3 +1,30 @@
+/mob/living/silicon/verb/clear_custom_holoform()
+ set name = "Clear Custom Holoform"
+ set desc = "Clear your current custom holoform"
+ set category = "OOC"
+ if(!client.prefs)
+ to_chat(src, "No preferences datum on your client, contact an admin/coder!")
+ return
+ client.prefs.custom_holoform_icon = null
+ client.prefs.cached_holoform_icons = null
+ to_chat(src, "Holoform removed.")
+
+/mob/living/silicon/verb/set_custom_holoform()
+ set name = "Set Custom Holoform"
+ set desc = "Set your custom holoform using your current preferences slot and a specified set of gear."
+ if(!client.prefs)
+ to_chat(src, "No preferences datum on your client, contact an admin/coder!")
+ return
+ if(client.prefs.last_custom_holoform > world.time - CUSTOM_HOLOFORM_DELAY)
+ to_chat(src, "You are attempting to change custom holoforms too fast!")
+
+ var/icon/new_holoform = user_interface_custom_holoform(client)
+ if(new_holoform)
+ client.prefs.custom_holoform_icon = new_holoform
+ client.prefs.cached_holoform_icons = null
+ client.prefs.last_custom_holoform = world.time
+ to_chat(src, "Holoform set.")
+
/mob/living/silicon/proc/attempt_set_custom_holoform()
if(!client.prefs)
to_chat(src, "No preferences datum on your client, contact an admin/coder!")
diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm
index ae045dbd26..012515d0e9 100644
--- a/code/modules/mob/living/simple_animal/guardian/guardian.dm
+++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm
@@ -9,6 +9,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
real_name = "Guardian Spirit"
desc = "A mysterious being that stands by its charge, ever vigilant."
speak_emote = list("hisses")
+ rad_flags = RAD_NO_CONTAMINATE | RAD_PROTECT_CONTENTS
gender = NEUTER
mob_biotypes = NONE
bubble_icon = "guardian"
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index deb18de42c..6e02944885 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -1042,123 +1042,151 @@
icon_state = "kea-flap"
icon_living = "kea-flap"
icon_dead = "kea-dead"
+ icon_sit = "kea_sit"
+
+/mob/living/simple_animal/parrot/eclectusr
+ name = "Eclectus"
+ icon_state = "eclectusr-flap"
+ icon_living = "eclectusr-flap"
+ icon_dead = "eclectusr-dead"
+ icon_sit = "electusr_sit"
/mob/living/simple_animal/parrot/eclectus
name = "Eclectus"
icon_state = "eclectus-flap"
icon_living = "eclectus-flap"
icon_dead = "eclectus-dead"
+ icon_sit = "electus_sit"
/mob/living/simple_animal/parrot/eclectusf
name = "Eclectus"
icon_state = "eclectusf-flap"
icon_living = "eclectusf-flap"
icon_dead = "eclectusf-dead"
+ icon_sit = "electusf_sit"
/mob/living/simple_animal/parrot/greybird
name = "Grey Bird"
icon_state = "agrey-flap"
icon_living = "agrey-flap"
icon_dead = "agrey-dead"
+ icon_sit = "agrey_sit"
/mob/living/simple_animal/parrot/blue_caique
name = "Blue Caique "
icon_state = "bcaique-flap"
icon_living = "bcaique-flap"
icon_dead = "bcaique-dead"
+ icon_sit = "bcaique_sit"
/mob/living/simple_animal/parrot/white_caique
name = "White caique"
icon_state = "wcaique-flap"
icon_living = "wcaique-flap"
icon_dead = "wcaique-dead"
+ icon_sit = "wcaique_sit"
/mob/living/simple_animal/parrot/green_budgerigar
name = "Green Budgerigar"
icon_state = "gbudge-flap"
icon_living = "gbudge-flap"
icon_dead = "gbudge-dead"
+ icon_sit = "gbudge_sit"
/mob/living/simple_animal/parrot/blue_Budgerigar
name = "Blue Budgerigar"
icon_state = "bbudge-flap"
icon_living = "bbudge-flap"
icon_dead = "bbudge-dead"
+ icon_sit = "bbudge_sit"
/mob/living/simple_animal/parrot/bluegreen_Budgerigar
name = "Bluegreen Budgerigar"
icon_state = "bgbudge-flap"
icon_living = "bgbudge-flap"
icon_dead = "bgbudge-dead"
+ icon_sit = "bgbudge_sit"
/mob/living/simple_animal/parrot/commonblackbird
name = "Black Bird"
icon_state = "commonblackbird"
icon_living = "commonblackbird"
icon_dead = "commonblackbird-dead"
+ icon_sit = "commonblackbird_sit"
/mob/living/simple_animal/parrot/azuretit
name = "Azure Tit"
icon_state = "azuretit"
icon_living = "azuretit"
icon_dead = "azuretit-dead"
+ icon_sit = "azuretit_sit"
/mob/living/simple_animal/parrot/europeanrobin
name = "European Robin"
icon_state = "europeanrobin"
icon_living = "europeanrobin"
icon_dead = "europeanrobin-dead"
+ icon_sit = "europeanrobin_sit"
/mob/living/simple_animal/parrot/goldcrest
name = "Goldcrest"
icon_state = "goldcrest"
icon_living = "goldcrest"
icon_dead = "goldcrest-dead"
+ icon_sit = "goldencrest_sit"
/mob/living/simple_animal/parrot/ringneckdove
name = "Ringneck Dove"
icon_state = "ringneckdove"
icon_living = "ringneckdove"
icon_dead = "ringneckdove-dead"
+ icon_sit = "ringneckdove_sit"
/mob/living/simple_animal/parrot/cockatiel
name = "Cockatiel"
icon_state = "tiel-flap"
icon_living = "tiel-flap"
icon_dead = "tiel-dead"
+ icon_sit = "tiel_sit"
/mob/living/simple_animal/parrot/white_cockatiel
name = "White Cockatiel"
icon_state = "wtiel-flap"
icon_living = "wtiel-flap"
icon_dead = "wtiel-dead"
+ icon_sit = "wtiel_sit"
/mob/living/simple_animal/parrot/yellowish_cockatiel
name = "Yellowish Cockatiel"
icon_state = "luttiel-flap"
icon_living = "luttiel-flap"
icon_dead = "luttiel-dead"
+ icon_sit = "luttiel_sit"
/mob/living/simple_animal/parrot/grey_cockatiel
name = "Grey Cockatiel"
icon_state = "blutiel-flap"
icon_living = "blutiel-flap"
icon_dead = "blutiel-dead"
+ icon_sit = "blutiel_sit"
/mob/living/simple_animal/parrot/too
name = "Too"
icon_state = "too-flap"
icon_living = "too-flap"
icon_dead = "too-dead"
+ icon_sit = "too_sit"
/mob/living/simple_animal/parrot/hooded_too
name = "Utoo"
icon_state = "utoo-flap"
icon_living = "utoo-flap"
icon_dead = "utoo-dead"
+ icon_sit = "utoo_sit"
/mob/living/simple_animal/parrot/pink_too
name = "Mtoo"
icon_state = "mtoo-flap"
icon_living = "mtoo-flap"
- icon_dead = "mtoo-dead"
\ No newline at end of file
+ icon_dead = "mtoo-dead"
+ icon_sit = "mtoo_sit"
\ No newline at end of file
diff --git a/code/modules/mob/say_vr.dm b/code/modules/mob/say_vr.dm
index 658d7e5874..c5c53dc876 100644
--- a/code/modules/mob/say_vr.dm
+++ b/code/modules/mob/say_vr.dm
@@ -148,8 +148,8 @@ proc/get_top_level_mob(var/mob/S)
var/safety = 25
for(var/obj/structure/table/T in range(user, 1))
processing |= T
- for(var/i in processing)
- var/obj/structure/table/T = i
+ for(var/i = 1; i <= processing.len; ++i)
+ var/obj/structure/table/T = processing[i]
if(safety-- <= 0)
to_chat(user, "Table scan aborted early, some people might have not received the message (max 25)")
break
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index ec6002f496..7ab50884e0 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -633,7 +633,7 @@
value = REAGENT_VALUE_RARE
/datum/reagent/medicine/sal_acid
- name = "Salicyclic Acid"
+ name = "Salicylic Acid"
description = "Stimulates the healing of severe bruises. Extremely rapidly heals severe bruising and slowly heals minor ones. Overdose will worsen existing bruising."
reagent_state = LIQUID
color = "#D2D2D2"
diff --git a/code/modules/reagents/chemistry/recipes/medicine.dm b/code/modules/reagents/chemistry/recipes/medicine.dm
index bf7b94483e..d4d66af240 100644
--- a/code/modules/reagents/chemistry/recipes/medicine.dm
+++ b/code/modules/reagents/chemistry/recipes/medicine.dm
@@ -155,7 +155,7 @@
required_reagents = list(/datum/reagent/medicine/pen_acid = 1, /datum/reagent/toxin/slimejelly = 1)
/datum/chemical_reaction/sal_acid
- name = "Salicyclic Acid"
+ name = "Salicylic Acid"
id = /datum/reagent/medicine/sal_acid
results = list(/datum/reagent/medicine/sal_acid = 5)
required_reagents = list(/datum/reagent/sodium = 1, /datum/reagent/phenol = 1, /datum/reagent/carbon = 1, /datum/reagent/oxygen = 1, /datum/reagent/toxin/acid = 1)
diff --git a/code/modules/vehicles/cars/clowncar.dm b/code/modules/vehicles/cars/clowncar.dm
index 7a7886e999..655ca21b93 100644
--- a/code/modules/vehicles/cars/clowncar.dm
+++ b/code/modules/vehicles/cars/clowncar.dm
@@ -18,14 +18,12 @@
. = ..()
initialize_controller_action_type(/datum/action/vehicle/sealed/horn/clowncar, VEHICLE_CONTROL_DRIVE)
-
/obj/vehicle/sealed/car/clowncar/driver_move(mob/user, direction) //Prevent it from moving onto space
if(isspaceturf(get_step(src, direction)))
return FALSE
else
return ..()
-
/obj/vehicle/sealed/car/clowncar/auto_assign_occupant_flags(mob/M)
if(ishuman(M))
var/mob/living/carbon/human/H = M
@@ -138,3 +136,24 @@
/obj/vehicle/sealed/car/clowncar/proc/StopDroppingOil()
droppingoil = FALSE
+
+/obj/vehicle/sealed/car/clowncar/twitch_plays
+ key_type = null
+
+/obj/vehicle/sealed/car/clowncar/twitch_plays/Initialize()
+ . = ..()
+ AddComponent(/datum/component/twitch_plays/simple_movement)
+ START_PROCESSING(SSfastprocess, src)
+ GLOB.poi_list |= src
+ notify_ghosts("Twitch Plays: Clown Car")
+
+/obj/vehicle/sealed/car/clowncar/twitch_plays/Destroy()
+ STOP_PROCESSING(SSfastprocess, src)
+ GLOB.poi_list -= src
+ return ..()
+
+/obj/vehicle/sealed/car/clowncar/twitch_plays/process()
+ var/dir = SEND_SIGNAL(src, COMSIG_TWITCH_PLAYS_MOVEMENT_DATA, TRUE)
+ if(!dir)
+ return
+ driver_move(null, dir)
diff --git a/code/modules/vehicles/wheelchair.dm b/code/modules/vehicles/wheelchair.dm
index 137242c547..a81dff37ad 100644
--- a/code/modules/vehicles/wheelchair.dm
+++ b/code/modules/vehicles/wheelchair.dm
@@ -10,6 +10,7 @@
canmove = TRUE
density = FALSE //Thought I couldn't fix this one easily, phew
arms_required = 1
+ var/override_movespeed = FALSE
/obj/vehicle/ridden/wheelchair/Initialize()
. = ..()
@@ -42,10 +43,11 @@
canmove = FALSE
addtimer(VARSET_CALLBACK(src, canmove, TRUE), 20)
return FALSE
- var/datum/component/riding/D = GetComponent(/datum/component/riding)
- //1.5 (movespeed as of this change) multiplied by 6.7 gets ABOUT 10 (rounded), the old constant for the wheelchair that gets divided by how many arms they have
- //if that made no sense this simply makes the wheelchair speed change along with movement speed delay
- D.vehicle_move_delay = round((CONFIG_GET(number/movedelay/run_delay) * 4) / min(user.get_num_arms(), 2), world.tick_lag)
+ if(!override_movespeed)
+ var/datum/component/riding/D = GetComponent(/datum/component/riding)
+ //1.5 (movespeed as of this change) multiplied by 6.7 gets ABOUT 10 (rounded), the old constant for the wheelchair that gets divided by how many arms they have
+ //if that made no sense this simply makes the wheelchair speed change along with movement speed delay
+ D.vehicle_move_delay = round((CONFIG_GET(number/movedelay/run_delay) * 4) / min(user.get_num_arms(), 2), world.tick_lag)
return ..()
/obj/vehicle/ridden/wheelchair/Moved()
diff --git a/code/modules/vore/eating/belly_obj.dm b/code/modules/vore/eating/belly_obj.dm
index a367abb098..7f8aed83ef 100644
--- a/code/modules/vore/eating/belly_obj.dm
+++ b/code/modules/vore/eating/belly_obj.dm
@@ -14,6 +14,7 @@
/obj/belly
name = "belly" // Name of this location
desc = "It's a belly! You're in it!" // Flavor text description of inside sight/sound/smells/feels.
+ rad_flags = RAD_NO_CONTAMINATE | RAD_PROTECT_CONTENTS
var/vore_sound = "Gulp" // Sound when ingesting someone
var/vore_verb = "ingest" // Verb for eating with this in messages
var/release_sound = "Splatter" // Sound for letting someone out.
diff --git a/html/changelogs/AutoChangeLog-pr-13867.yml b/html/changelogs/AutoChangeLog-pr-13867.yml
new file mode 100644
index 0000000000..dd1e44e64c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13867.yml
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes:
+ - balance: "Zeolites now only generate 1/5 the heat when reacting and don't require a catalyst."
diff --git a/html/changelogs/AutoChangeLog-pr-13885.yml b/html/changelogs/AutoChangeLog-pr-13885.yml
new file mode 100644
index 0000000000..88c23d30f1
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13885.yml
@@ -0,0 +1,4 @@
+author: "raspy-on-osu"
+delete-after: True
+changes:
+ - tweak: "space heater heating range and power"
diff --git a/html/changelogs/AutoChangeLog-pr-13892.yml b/html/changelogs/AutoChangeLog-pr-13892.yml
new file mode 100644
index 0000000000..976b395826
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13892.yml
@@ -0,0 +1,4 @@
+author: "silicons"
+delete-after: True
+changes:
+ - balance: "changeling combat mutations rebalanced. most of them take chemicals to upkeep now."
diff --git a/html/changelogs/AutoChangeLog-pr-13902.yml b/html/changelogs/AutoChangeLog-pr-13902.yml
new file mode 100644
index 0000000000..ca548d816f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13902.yml
@@ -0,0 +1,4 @@
+author: "timothyteakettle"
+delete-after: True
+changes:
+ - rscadd: "avian/digitigrade legs have been added for slimes"
diff --git a/html/changelogs/AutoChangeLog-pr-13903.yml b/html/changelogs/AutoChangeLog-pr-13903.yml
new file mode 100644
index 0000000000..fd66c4b0c6
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13903.yml
@@ -0,0 +1,4 @@
+author: "DeltaFire15"
+delete-after: True
+changes:
+ - bugfix: "Changelings no longer double-deathgasp when activating the regen stasis ability while not dead."
diff --git a/html/changelogs/AutoChangeLog-pr-13905.yml b/html/changelogs/AutoChangeLog-pr-13905.yml
new file mode 100644
index 0000000000..16b464bc20
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13905.yml
@@ -0,0 +1,4 @@
+author: "zeroisthebiggay"
+delete-after: True
+changes:
+ - imageadd: "cool codex cicatrix inhands"
diff --git a/html/changelogs/AutoChangeLog-pr-13909.yml b/html/changelogs/AutoChangeLog-pr-13909.yml
new file mode 100644
index 0000000000..e4f0f1e401
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13909.yml
@@ -0,0 +1,4 @@
+author: "silicons"
+delete-after: True
+changes:
+ - rscadd: "Twitch Plays: Clown Car"
diff --git a/html/changelogs/AutoChangeLog-pr-13911.yml b/html/changelogs/AutoChangeLog-pr-13911.yml
new file mode 100644
index 0000000000..9e96103b2b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13911.yml
@@ -0,0 +1,4 @@
+author: "raspy-on-osu"
+delete-after: True
+changes:
+ - spellcheck: "salicylic acid"
diff --git a/html/changelogs/AutoChangeLog-pr-13913.yml b/html/changelogs/AutoChangeLog-pr-13913.yml
new file mode 100644
index 0000000000..a25e054a6f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13913.yml
@@ -0,0 +1,4 @@
+author: "keronshb"
+delete-after: True
+changes:
+ - bugfix: "Fixes the parry data for scarp"
diff --git a/html/changelogs/AutoChangeLog-pr-13914.yml b/html/changelogs/AutoChangeLog-pr-13914.yml
new file mode 100644
index 0000000000..b9efe2a893
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13914.yml
@@ -0,0 +1,6 @@
+author: "EmeraldSundisk"
+delete-after: True
+changes:
+ - rscadd: "Adds a few new area designations primarily for CogStation, incorporates them into said map"
+ - tweak: "Reorganizes some area designations for ease of use, along with renaming the central \"Router\" to \"Routing Depot\""
+ - bugfix: "Fixes an incorrectly designated area in CogStation"
diff --git a/html/changelogs/AutoChangeLog-pr-13915.yml b/html/changelogs/AutoChangeLog-pr-13915.yml
new file mode 100644
index 0000000000..2853dcb9ad
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13915.yml
@@ -0,0 +1,4 @@
+author: "Xantholne"
+delete-after: True
+changes:
+ - bugfix: "Fixed new birds changing back to basic parrot when sitting"
diff --git a/html/changelogs/AutoChangeLog-pr-13916.yml b/html/changelogs/AutoChangeLog-pr-13916.yml
new file mode 100644
index 0000000000..0ec04707a5
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13916.yml
@@ -0,0 +1,4 @@
+author: "timothyteakettle"
+delete-after: True
+changes:
+ - rscadd: "re-adds the holoform verb for people who want to use it over going through the char list"
diff --git a/html/changelogs/AutoChangeLog-pr-13917.yml b/html/changelogs/AutoChangeLog-pr-13917.yml
new file mode 100644
index 0000000000..5eabd640f7
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13917.yml
@@ -0,0 +1,4 @@
+author: "timothyteakettle"
+delete-after: True
+changes:
+ - rscadd: "*squeak"
diff --git a/html/changelogs/AutoChangeLog-pr-13924.yml b/html/changelogs/AutoChangeLog-pr-13924.yml
new file mode 100644
index 0000000000..71092c567d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13924.yml
@@ -0,0 +1,4 @@
+author: "SandPoot"
+delete-after: True
+changes:
+ - tweak: "You can attack a pile of money on the floor with your id to put it all in quickly."
diff --git a/html/changelogs/AutoChangeLog-pr-13926.yml b/html/changelogs/AutoChangeLog-pr-13926.yml
new file mode 100644
index 0000000000..4e92bacdb4
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13926.yml
@@ -0,0 +1,4 @@
+author: "MrJWhit"
+delete-after: True
+changes:
+ - rscdel: "Removes the screen flashing on climax."
diff --git a/html/changelogs/AutoChangeLog-pr-13930.yml b/html/changelogs/AutoChangeLog-pr-13930.yml
new file mode 100644
index 0000000000..282f3fa30a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-13930.yml
@@ -0,0 +1,4 @@
+author: "MrJWhit"
+delete-after: True
+changes:
+ - tweak: "Small fixes on security on boxstation"
diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi
index cdb57e0e1d..8db32b304b 100644
Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ
diff --git a/icons/mob/human_parts_greyscale.dmi b/icons/mob/human_parts_greyscale.dmi
index 3b97c3b38b..13f66fc2a4 100644
Binary files a/icons/mob/human_parts_greyscale.dmi and b/icons/mob/human_parts_greyscale.dmi differ
diff --git a/icons/mob/inhands/misc/books_lefthand.dmi b/icons/mob/inhands/misc/books_lefthand.dmi
index 71d06d345a..df662a413b 100644
Binary files a/icons/mob/inhands/misc/books_lefthand.dmi and b/icons/mob/inhands/misc/books_lefthand.dmi differ
diff --git a/icons/mob/inhands/misc/books_righthand.dmi b/icons/mob/inhands/misc/books_righthand.dmi
index 906f47bfe9..afa4a7a5fb 100644
Binary files a/icons/mob/inhands/misc/books_righthand.dmi and b/icons/mob/inhands/misc/books_righthand.dmi differ
diff --git a/icons/obj/eldritch.dmi b/icons/obj/eldritch.dmi
index 294deda628..646b12e734 100644
Binary files a/icons/obj/eldritch.dmi and b/icons/obj/eldritch.dmi differ
diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
index bbecd2f6f4..21f525088c 100644
--- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
@@ -593,7 +593,6 @@
id = /datum/reagent/fermi/zeolites
results = list(/datum/reagent/fermi/zeolites = 5) //We make a lot! - But it's now somewhat dangerous, and needs a bit of gold to catalyze the reaction
required_reagents = list(/datum/reagent/medicine/potass_iodide = 1, /datum/reagent/aluminium = 1, /datum/reagent/silicon = 1, /datum/reagent/oxygen = 1)
- required_catalysts = list(/datum/reagent/gold = 5)
//FermiChem vars:
OptimalTempMin = 500
OptimalTempMax = 750
@@ -604,7 +603,7 @@
//CatalystFact = 0
CurveSharpT = 1.5
CurveSharppH = 3
- ThermicConstant = 5
+ ThermicConstant = 1
HIonRelease = -0.15
RateUpLim = 4
PurityMin = 0.5 //Good luck!
diff --git a/tgstation.dme b/tgstation.dme
index 07eefc79ef..2b00eb6b98 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -492,6 +492,7 @@
#include "code\datums\components\swarming.dm"
#include "code\datums\components\tackle.dm"
#include "code\datums\components\thermite.dm"
+#include "code\datums\components\twitch_plays.dm"
#include "code\datums\components\twohanded.dm"
#include "code\datums\components\uplink.dm"
#include "code\datums\components\virtual_reality.dm"