diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_nt.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_nt.dmm
index a1661f6fd1c..c614f565197 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_nt.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_nt.dmm
@@ -3116,7 +3116,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/kirbyplants/large,
+/obj/machinery/atmospherics/refill_station/oxygen,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkfull"
@@ -3193,8 +3193,8 @@
/turf/simulated/floor/plasteel,
/area/mine/outpost/mechbay)
"rn" = (
-/obj/machinery/atmospherics/portable/canister/oxygen,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/refill_station/oxygen,
/turf/simulated/floor/plasteel{
icon_state = "yellowsiding";
dir = 10
@@ -3465,10 +3465,10 @@
},
/area/mine/outpost/hallway/west)
"sU" = (
-/obj/item/kirbyplants/large,
/obj/structure/sign/nanotrasen{
pixel_y = 32
},
+/obj/machinery/atmospherics/refill_station/plasma,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkyellowcorners"
@@ -3649,7 +3649,7 @@
/turf/simulated/floor/plating,
/area/mine/outpost/quartermaster)
"tU" = (
-/obj/machinery/newscaster/directional/north,
+/obj/machinery/atmospherics/refill_station/plasma,
/turf/simulated/floor/plasteel{
icon_state = "yellowsiding";
dir = 1
@@ -5946,6 +5946,7 @@
/area/mine/laborcamp)
"GJ" = (
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/newscaster/directional/east,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "yellowsiding"
@@ -5955,6 +5956,7 @@
/obj/effect/turf_decal/stripes/corner{
dir = 8
},
+/obj/machinery/atmospherics/refill_station/nitrogen,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkyellowcorners"
@@ -7592,6 +7594,14 @@
},
/turf/simulated/floor/catwalk,
/area/mine/laborcamp)
+"PC" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/refill_station/nitrogen,
+/turf/simulated/floor/plasteel{
+ icon_state = "yellowsiding";
+ dir = 8
+ },
+/area/mine/laborcamp)
"PG" = (
/obj/structure/lattice/catwalk/mining,
/obj/structure/railing/corner{
@@ -12399,7 +12409,7 @@ Td
EH
us
HQ
-nl
+PC
hn
Nh
lT
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm
index 8280c2b1f60..91fc320b5fa 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm
@@ -1616,6 +1616,10 @@
icon_state = "dark"
},
/area/ruin/unpowered/syndicate_space_base/main)
+"iM" = (
+/obj/machinery/atmospherics/refill_station/oxygen,
+/turf/simulated/floor/plating,
+/area/ruin/unpowered/syndicate_space_base/engineering)
"iQ" = (
/obj/structure/chair/office/dark{
dir = 4
@@ -1835,6 +1839,10 @@
},
/turf/simulated/floor/plating,
/area/ruin/unpowered/syndicate_space_base/atmos)
+"kz" = (
+/obj/machinery/atmospherics/refill_station/plasma,
+/turf/simulated/floor/plating,
+/area/ruin/unpowered/syndicate_space_base/engineering)
"kB" = (
/obj/effect/mob_spawn/human/alive/spacebase_syndicate{
dir = 1
@@ -2859,6 +2867,10 @@
/obj/machinery/light,
/turf/simulated/floor/plating/asteroid/ancient,
/area/ruin/unpowered/syndicate_space_base/cave)
+"qr" = (
+/obj/machinery/atmospherics/refill_station/nitrogen,
+/turf/simulated/floor/plating,
+/area/ruin/unpowered/syndicate_space_base/engineering)
"qs" = (
/obj/machinery/light,
/obj/machinery/porta_turret/syndicate/exterior,
@@ -9910,7 +9922,7 @@ OQ
BZ
qF
PA
-qF
+qr
Ao
tG
kE
@@ -10193,7 +10205,7 @@ iW
eW
iW
tG
-qF
+kz
Fl
nE
Mp
@@ -10347,7 +10359,7 @@ tG
tG
tG
XH
-qF
+iM
qF
LF
tG
diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm
index fb631f33c43..e21503b6ca3 100644
--- a/_maps/map_files/generic/centcomm.dmm
+++ b/_maps/map_files/generic/centcomm.dmm
@@ -8342,10 +8342,7 @@
/turf/simulated/floor/engine,
/area/admin)
"DS" = (
-/obj/structure/extinguisher_cabinet{
- pixel_y = -32
- },
-/obj/item/kirbyplants/large,
+/obj/machinery/atmospherics/refill_station/plasma,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "vault"
@@ -11277,7 +11274,7 @@
/turf/simulated/floor/plasteel,
/area/centcom/evac)
"Nz" = (
-/obj/structure/filingcabinet/security,
+/obj/machinery/atmospherics/refill_station/oxygen,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "vault"
@@ -13313,6 +13310,15 @@
icon_state = "dark"
},
/area/ghost_bar)
+"US" = (
+/obj/structure/extinguisher_cabinet{
+ pixel_y = -32
+ },
+/turf/simulated/floor/plasteel{
+ dir = 10;
+ icon_state = "vault"
+ },
+/area/centcom/specops)
"UT" = (
/obj/machinery/economy/vending/cola/free,
/turf/simulated/floor/plasteel{
@@ -14765,6 +14771,13 @@
icon_state = "darkred"
},
/area/centcom/specops)
+"ZE" = (
+/obj/machinery/atmospherics/refill_station/nitrogen,
+/turf/simulated/floor/plasteel{
+ dir = 5;
+ icon_state = "vault"
+ },
+/area/centcom/specops)
"ZF" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/door/poddoor/multi_tile/impassable/four_tile_ver{
@@ -34065,7 +34078,7 @@ Ji
Ra
Xz
RD
-Of
+ZE
Ra
Ra
Ra
@@ -35356,7 +35369,7 @@ uX
uX
uX
cC
-Xz
+US
Zr
NZ
ic
diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm
index dfdbe5db03e..4bf32b780e7 100644
--- a/_maps/map_files/stations/boxstation.dmm
+++ b/_maps/map_files/stations/boxstation.dmm
@@ -6290,8 +6290,9 @@
/area/station/security/processing)
"axu" = (
/obj/machinery/newscaster/directional/south,
+/obj/machinery/atmospherics/refill_station/oxygen,
/turf/simulated/floor/plasteel{
- icon_state = "redcorner"
+ icon_state = "white"
},
/area/station/security/lobby)
"axw" = (
@@ -9308,9 +9309,8 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"aHc" = (
-/obj/structure/rack,
-/obj/item/tank/internals/emergency_oxygen/engi,
-/turf/simulated/floor/plating,
+/obj/machinery/atmospherics/refill_station/nitrogen,
+/turf/simulated/floor/catwalk,
/area/station/maintenance/fsmaint)
"aHd" = (
/obj/item/toy/crayon/white,
@@ -9666,9 +9666,8 @@
/turf/simulated/floor/carpet/arcade,
/area/station/public/arcade)
"aIv" = (
-/obj/structure/rack,
-/obj/item/tank/internals/air,
-/turf/simulated/floor/plating,
+/obj/machinery/atmospherics/refill_station/plasma,
+/turf/simulated/floor/catwalk,
/area/station/maintenance/fsmaint)
"aIw" = (
/obj/machinery/camera{
@@ -10003,8 +10002,13 @@
/turf/simulated/wall/r_wall,
/area/station/maintenance/solar_maintenance/fore_starboard)
"aJI" = (
-/obj/structure/closet/emcloset,
-/turf/simulated/floor/plating,
+/obj/machinery/atmospherics/unary/portables_connector{
+ dir = 8
+ },
+/obj/machinery/atmospherics/portable/canister/air{
+ filled = 0.1
+ },
+/turf/simulated/floor/catwalk,
/area/station/maintenance/fsmaint)
"aJJ" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -11060,11 +11064,12 @@
/obj/structure/sign/vacuum/external{
pixel_y = 32
},
-/obj/machinery/atmospherics/unary/portables_connector{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
},
-/obj/machinery/atmospherics/portable/canister/air{
- filled = 0.1
+/obj/item/tank/internals/emergency_oxygen/engi,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 4
},
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
@@ -11457,6 +11462,9 @@
/area/station/legal/courtroom/gallery)
"aOC" = (
/obj/machinery/light/small,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 8
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"aOD" = (
@@ -18219,11 +18227,13 @@
/turf/simulated/floor/plating,
/area/station/hallway/secondary/exit)
"bjS" = (
-/obj/structure/closet/emcloset,
/obj/effect/turf_decal/stripes/line{
dir = 5
},
-/turf/simulated/floor/plasteel,
+/obj/machinery/atmospherics/refill_station/oxygen,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/station/hallway/secondary/entry)
"bjT" = (
/obj/structure/closet/emcloset,
@@ -19938,8 +19948,9 @@
/area/station/service/kitchen)
"boP" = (
/obj/machinery/light,
+/obj/machinery/atmospherics/refill_station/plasma,
/turf/simulated/floor/plasteel{
- icon_state = "arrival"
+ icon_state = "white"
},
/area/station/hallway/secondary/entry)
"boQ" = (
@@ -36052,10 +36063,9 @@
/area/station/maintenance/aft)
"cAo" = (
/obj/machinery/alarm/directional/south,
-/obj/structure/table,
-/obj/item/book/manual/wiki/sop_engineering,
+/obj/machinery/atmospherics/refill_station/nitrogen,
/turf/simulated/floor/plasteel{
- icon_state = "yellowcorner"
+ icon_state = "white"
},
/area/station/hallway/primary/aft/south)
"cAp" = (
@@ -39483,6 +39493,7 @@
/obj/machinery/light,
/obj/structure/table,
/obj/item/storage/toolbox/mechanical,
+/obj/item/book/manual/wiki/sop_engineering,
/turf/simulated/floor/plasteel{
icon_state = "yellowcorner"
},
@@ -49226,6 +49237,13 @@
},
/turf/simulated/floor/engine,
/area/station/engineering/control)
+"emv" = (
+/obj/machinery/atmospherics/unary/portables_connector{
+ dir = 4
+ },
+/obj/machinery/atmospherics/portable/canister/air,
+/turf/simulated/floor/catwalk,
+/area/station/maintenance/apmaint)
"emy" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/poddoor{
@@ -52135,11 +52153,19 @@
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/station/engineering/smes)
+"fJI" = (
+/obj/structure/grille/broken,
+/obj/item/stack/rods,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/white/line,
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/apmaint)
"fJK" = (
/obj/structure/rack{
dir = 1
},
/obj/effect/spawner/random/cobweb/left/frequent,
+/obj/item/tank/internals/emergency_oxygen/empty,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"fJX" = (
@@ -55303,6 +55329,14 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/engineering/tech_storage)
+"hsF" = (
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "arrival"
+ },
+/area/station/hallway/secondary/entry)
"hsH" = (
/obj/structure/table,
/obj/item/paper_bin{
@@ -55817,7 +55851,10 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plating,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel,
/area/station/maintenance/apmaint)
"hHh" = (
/obj/structure/cable{
@@ -58153,6 +58190,18 @@
icon_state = "cautioncorner"
},
/area/station/maintenance/asmaint2)
+"iVQ" = (
+/obj/structure/sign/vacuum/external{
+ pixel_y = 32
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/refill_station/nitrogen,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/hallway/secondary/entry)
"iWm" = (
/obj/effect/spawner/window/reinforced/polarized/grilled{
id = "CE"
@@ -59885,6 +59934,12 @@
icon_state = "dark"
},
/area/station/science/server)
+"jSi" = (
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/fsmaint)
"jSq" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -62464,6 +62519,11 @@
icon_state = "white"
},
/area/station/science/genetics)
+"lfQ" = (
+/obj/machinery/atmospherics/refill_station/nitrogen,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel,
+/area/station/security/permabrig)
"lgS" = (
/obj/structure/closet/secure_closet/brig,
/turf/simulated/floor/plasteel{
@@ -63343,6 +63403,12 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
+"lEh" = (
+/obj/machinery/atmospherics/refill_station/plasma,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/hallway/primary/aft/south)
"lEy" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -63956,6 +64022,12 @@
/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel,
/area/station/science/lobby)
+"lRI" = (
+/obj/machinery/atmospherics/refill_station/nitrogen,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/hallway/secondary/exit)
"lSg" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/effect/spawner/random/cobweb/right/frequent,
@@ -64682,6 +64754,12 @@
},
/turf/simulated/floor/plasteel,
/area/station/supply/qm)
+"mkV" = (
+/obj/machinery/atmospherics/refill_station/oxygen,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/hallway/secondary/exit)
"mlv" = (
/obj/machinery/light/small,
/obj/structure/closet,
@@ -65523,6 +65601,12 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint2)
+"mKz" = (
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/fsmaint)
"mKG" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 4
@@ -66434,6 +66518,9 @@
/obj/structure/disposalpipe/segment/corner{
dir = 1
},
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 8
+ },
/turf/simulated/floor/plasteel,
/area/station/maintenance/apmaint)
"npb" = (
@@ -70923,11 +71010,10 @@
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"pAp" = (
-/obj/item/kirbyplants/large,
-/turf/simulated/floor/plasteel{
- icon_state = "yellowcorner"
- },
-/area/station/hallway/primary/aft/south)
+/obj/machinery/atmospherics/refill_station/plasma,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel,
+/area/station/security/permabrig)
"pAJ" = (
/obj/structure/flora/tree/jungle,
/turf/simulated/floor/grass/jungle/no_creep,
@@ -71249,6 +71335,11 @@
icon_state = "purple"
},
/area/station/maintenance/asmaint2)
+"pLB" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/white/line,
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/apmaint)
"pLR" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
@@ -73261,6 +73352,12 @@
},
/turf/simulated/floor/engine,
/area/station/maintenance/incinerator)
+"qFl" = (
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/apmaint)
"qFw" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -74159,11 +74256,8 @@
},
/area/station/medical/medbay)
"rcY" = (
-/obj/machinery/atmospherics/unary/portables_connector{
- dir = 4
- },
-/obj/machinery/atmospherics/portable/canister/air,
-/turf/simulated/floor/plating,
+/obj/machinery/atmospherics/refill_station/oxygen,
+/turf/simulated/floor/catwalk,
/area/station/maintenance/apmaint)
"rcZ" = (
/obj/item/storage/toolbox/emergency,
@@ -74271,6 +74365,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
+"rge" = (
+/obj/machinery/atmospherics/refill_station/oxygen,
+/turf/simulated/floor/catwalk,
+/area/station/maintenance/fsmaint)
"rgq" = (
/obj/structure/chair/comfy/black{
dir = 8
@@ -74951,6 +75049,10 @@
"rzF" = (
/turf/simulated/floor/plasteel,
/area/station/science/rnd)
+"rzL" = (
+/obj/machinery/atmospherics/refill_station/plasma,
+/turf/simulated/floor/catwalk,
+/area/station/maintenance/apmaint)
"rzO" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical/glass,
@@ -75201,10 +75303,10 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/west)
"rFe" = (
-/obj/structure/chair/sofa/bench{
- dir = 4
+/obj/machinery/atmospherics/refill_station/plasma,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
},
-/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"rFx" = (
/obj/structure/table,
@@ -76250,6 +76352,10 @@
icon_state = "freezerfloor"
},
/area/station/maintenance/apmaint)
+"sjG" = (
+/obj/machinery/atmospherics/refill_station/nitrogen,
+/turf/simulated/floor/catwalk,
+/area/station/maintenance/apmaint)
"sjK" = (
/obj/structure/disposalpipe/segment/corner{
dir = 2
@@ -77360,6 +77466,12 @@
icon_state = "whitegreen"
},
/area/station/medical/virology)
+"sPB" = (
+/obj/machinery/atmospherics/refill_station/oxygen,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/hallway/primary/aft/south)
"sPF" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
@@ -78531,6 +78643,12 @@
/obj/machinery/door/firedoor,
/turf/simulated/floor/plating,
/area/station/maintenance/turbine)
+"tAE" = (
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel,
+/area/station/hallway/secondary/entry)
"tAH" = (
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/simulated/floor/plating/airless,
@@ -97029,7 +97147,7 @@ aVV
apx
apx
apx
-blB
+iVQ
boP
aLd
aaa
@@ -97286,8 +97404,8 @@ aVX
aRU
aOQ
aRU
-aSf
-boL
+tAE
+hsF
apx
aaa
aaa
@@ -101175,6 +101293,7 @@ gzN
cgQ
cgQ
cgQ
+cgQ
aaa
aab
aab
@@ -101278,7 +101397,6 @@ aaa
aaa
aaa
aaa
-aaa
"}
(54,1,1) = {"
aaa
@@ -101431,6 +101549,7 @@ lRv
lRv
fJK
rcY
+emv
cgQ
lRv
qaB
@@ -101535,7 +101654,6 @@ aaa
aaa
aaa
aaa
-aaa
"}
(55,1,1) = {"
aaa
@@ -101687,6 +101805,7 @@ gea
bGn
jWI
noP
+qFl
ubK
coL
liR
@@ -101792,7 +101911,6 @@ aaa
aaa
aaa
aaa
-aaa
"}
(56,1,1) = {"
aaa
@@ -101944,13 +102062,13 @@ cvp
cyk
cvp
knc
-tdb
+fJI
+sjG
gYs
cgQ
gYs
cgQ
cgQ
-cgQ
aaa
aaa
aaa
@@ -102201,8 +102319,8 @@ cgQ
aaa
lRv
xlK
-lNb
-coL
+pLB
+rzL
cgQ
gta
gta
@@ -102715,7 +102833,7 @@ cgQ
cgQ
gYs
cwl
-lNb
+csE
jem
gYs
cgQ
@@ -107020,8 +107138,8 @@ wjV
lKq
qen
xBl
-twu
-aEO
+lfQ
+pAp
jkw
avf
aEO
@@ -115586,7 +115704,7 @@ oac
pqW
tiE
cHD
-pAp
+lEh
cRR
cRR
cRR
@@ -117117,7 +117235,7 @@ nvR
cvB
csD
cBv
-cBv
+sPB
cEi
cFh
cGJ
@@ -130671,7 +130789,7 @@ doE
ici
ici
nnF
-aGY
+jSi
aOC
aGX
aGY
@@ -131186,7 +131304,7 @@ ici
ici
ici
aNg
-aGY
+mKz
aGX
aQI
aGY
@@ -131443,7 +131561,7 @@ aaa
aaa
ici
aJI
-aGY
+rge
aGX
aGX
dys
@@ -138153,8 +138271,8 @@ aaa
aaa
bEF
bEF
+lRI
dBt
-rFe
hpY
glD
kTU
@@ -138163,7 +138281,7 @@ cXj
uuo
iSv
bNv
-bNv
+rFe
boD
ciY
cDo
@@ -140722,7 +140840,7 @@ aab
aab
aaa
ktQ
-bzO
+mkV
bmm
bBl
oWE
diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm
index b3878c8b81e..8f877b6b1d5 100644
--- a/_maps/map_files/stations/cerestation.dmm
+++ b/_maps/map_files/stations/cerestation.dmm
@@ -10558,6 +10558,12 @@
/obj/item/instrument/guitar,
/turf/simulated/floor/carpet,
/area/station/public/locker)
+"bBy" = (
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/fsmaint)
"bBB" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
@@ -17269,6 +17275,10 @@
icon_state = "asteroidplating"
},
/area/station/maintenance/fore)
+"cpT" = (
+/obj/machinery/atmospherics/refill_station/plasma,
+/turf/simulated/floor/plating/asteroid/ancient,
+/area/station/maintenance/apmaint)
"cpX" = (
/obj/structure/railing{
dir = 10
@@ -18136,16 +18146,8 @@
/turf/simulated/floor/grass,
/area/station/security/lobby)
"cxd" = (
-/obj/structure/closet/crate,
-/obj/effect/spawner/random/maintenance,
-/obj/structure/sign/securearea{
- desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
- icon_state = "space";
- layer = 4;
- name = "EXTERNAL AIRLOCK";
- pixel_x = -32
- },
-/turf/simulated/floor/plating/asteroid/ancient,
+/obj/machinery/atmospherics/refill_station/nitrogen,
+/turf/simulated/floor/catwalk,
/area/station/maintenance/apmaint)
"cxf" = (
/obj/machinery/ai_status_display,
@@ -29297,6 +29299,11 @@
/obj/effect/spawner/random/dirt/frequent,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
+"evE" = (
+/obj/structure/closet/crate,
+/obj/effect/spawner/random/maintenance,
+/turf/simulated/floor/plating/asteroid/ancient,
+/area/station/maintenance/apmaint)
"evL" = (
/turf/simulated/floor/plasteel{
icon_state = "redcorner"
@@ -30519,6 +30526,10 @@
icon_state = "darkfull"
},
/area/station/supply/qm)
+"eJr" = (
+/obj/machinery/atmospherics/refill_station/nitrogen,
+/turf/simulated/floor/catwalk,
+/area/station/maintenance/fsmaint)
"eJD" = (
/obj/machinery/shower{
dir = 8
@@ -32950,9 +32961,9 @@
dir = 6;
network = list("SS13","QM")
},
+/obj/machinery/atmospherics/refill_station/plasma,
/turf/simulated/floor/plasteel{
- icon_state = "browncorner";
- dir = 4
+ icon_state = "white"
},
/area/station/supply/lobby)
"frn" = (
@@ -35036,6 +35047,12 @@
icon_state = "darkpurple"
},
/area/station/maintenance/electrical_shop)
+"fQu" = (
+/obj/machinery/atmospherics/refill_station/oxygen,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/hallway/primary/port/north)
"fQv" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -36696,10 +36713,9 @@
},
/area/station/engineering/atmos)
"gps" = (
-/obj/structure/reagent_dispensers/water_cooler,
+/obj/machinery/atmospherics/refill_station/oxygen,
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "neutralcorner"
+ icon_state = "white"
},
/area/station/hallway/primary/fore/east)
"gpu" = (
@@ -39150,6 +39166,10 @@
/obj/effect/mapping_helpers/turfs/damage,
/turf/simulated/floor/wood,
/area/station/maintenance/fore)
+"gYe" = (
+/obj/machinery/atmospherics/refill_station/nitrogen,
+/turf/simulated/floor/plating,
+/area/station/security/permabrig)
"gYt" = (
/obj/machinery/light{
dir = 8
@@ -42626,6 +42646,10 @@
},
/turf/simulated/floor/plasteel,
/area/station/security/processing)
+"hNt" = (
+/obj/machinery/atmospherics/refill_station/nitrogen,
+/turf/simulated/floor/catwalk,
+/area/station/maintenance/fpmaint)
"hNu" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/chair/stool{
@@ -46042,10 +46066,10 @@
/turf/simulated/floor/carpet/royalblack,
/area/station/service/bar)
"iCf" = (
-/obj/structure/chair/sofa/corp/right{
- dir = 1
+/obj/machinery/atmospherics/refill_station/plasma,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
},
-/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"iCg" = (
/obj/effect/turf_decal/stripes/line{
@@ -46920,9 +46944,11 @@
},
/area/station/science/toxins/launch)
"iNd" = (
-/obj/structure/table,
-/obj/effect/spawner/random/maintenance,
-/turf/simulated/floor/plating,
+/obj/machinery/atmospherics/portable/canister/air,
+/obj/machinery/atmospherics/unary/portables_connector{
+ dir = 8
+ },
+/turf/simulated/floor/catwalk,
/area/station/maintenance/fsmaint)
"iNj" = (
/obj/machinery/computer/shuttle/mining{
@@ -47983,8 +48009,9 @@
/area/station/science/misc_lab)
"iZB" = (
/obj/machinery/alarm/directional/east,
+/obj/machinery/atmospherics/refill_station/nitrogen,
/turf/simulated/floor/plasteel{
- icon_state = "browncorner"
+ icon_state = "white"
},
/area/station/hallway/primary/fore/east)
"iZC" = (
@@ -50657,6 +50684,12 @@
},
/turf/simulated/floor/carpet/black,
/area/station/service/chapel/office)
+"jCz" = (
+/obj/machinery/atmospherics/refill_station/plasma,
+/turf/simulated/floor/plating{
+ icon_state = "asteroidplating"
+ },
+/area/station/security/permabrig)
"jCF" = (
/obj/structure/sign/poster/official/state_laws/directional/south,
/obj/structure/table/reinforced,
@@ -51575,6 +51608,11 @@
icon_state = "darkbluecorners"
},
/area/station/maintenance/disposal/northeast)
+"jMb" = (
+/obj/effect/spawner/random/dirt/frequent,
+/obj/machinery/atmospherics/refill_station/plasma,
+/turf/simulated/floor/catwalk,
+/area/station/maintenance/fsmaint)
"jMe" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -55576,9 +55614,12 @@
/area/station/maintenance/disposal/northwest)
"kHK" = (
/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 5
+ dir = 6;
+ level = 1
+ },
+/turf/simulated/floor/plating{
+ icon_state = "asteroidplating"
},
-/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"kHN" = (
/obj/machinery/door_control{
@@ -56771,6 +56812,10 @@
"kWu" = (
/turf/simulated/mineral/ancient,
/area/station/public/fitness)
+"kWz" = (
+/obj/machinery/atmospherics/refill_station/oxygen,
+/turf/simulated/floor/catwalk,
+/area/station/maintenance/fpmaint)
"kWA" = (
/obj/structure/sign/poster/contraband/random/directional/west,
/turf/simulated/floor/plating{
@@ -57287,6 +57332,10 @@
/obj/structure/disposalpipe/trunk,
/turf/simulated/floor/plating/airless,
/area/station/maintenance/disposal/westalt)
+"lem" = (
+/obj/machinery/atmospherics/refill_station/oxygen,
+/turf/simulated/floor/catwalk,
+/area/station/maintenance/apmaint)
"ler" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -58875,6 +58924,14 @@
icon_state = "bcircuit"
},
/area/station/turret_protected/aisat/interior/secondary)
+"lvc" = (
+/obj/effect/turf_decal/stripes/white/corner{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralcorner"
+ },
+/area/station/hallway/primary/port/north)
"lvj" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -62406,6 +62463,13 @@
icon_state = "dark"
},
/area/station/science/robotics)
+"mmp" = (
+/obj/machinery/atmospherics/pipe/simple/visible{
+ dir = 9
+ },
+/obj/effect/turf_decal/stripes/white/line,
+/turf/simulated/floor/plating/asteroid/ancient,
+/area/station/maintenance/apmaint)
"mmv" = (
/obj/effect/spawner/random/barrier/grille_maybe,
/turf/simulated/floor/plating{
@@ -68162,8 +68226,8 @@
/area/mine/unexplored/cere/orbiting)
"nJT" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/firecloset/full,
-/turf/simulated/floor/plating,
+/obj/machinery/atmospherics/refill_station/plasma,
+/turf/simulated/floor/catwalk,
/area/station/maintenance/fpmaint)
"nKb" = (
/obj/machinery/light{
@@ -70385,6 +70449,14 @@
icon_state = "darkred"
},
/area/station/security/checkpoint/secondary)
+"omV" = (
+/obj/effect/turf_decal/stripes/white/corner{
+ dir = 4
+ },
+/turf/simulated/floor/plating{
+ icon_state = "asteroidplating"
+ },
+/area/station/maintenance/fsmaint)
"omW" = (
/obj/effect/spawner/random/dirt/often,
/turf/simulated/floor/plasteel{
@@ -74478,6 +74550,12 @@
/obj/effect/mapping_helpers/turfs/rust,
/turf/simulated/wall,
/area/station/maintenance/solar_maintenance/aft_starboard)
+"pma" = (
+/obj/effect/turf_decal/stripes/white/corner{
+ dir = 8
+ },
+/turf/simulated/floor/plating/asteroid/ancient,
+/area/station/maintenance/apmaint)
"pmb" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
@@ -76756,6 +76834,12 @@
},
/turf/simulated/wall,
/area/station/maintenance/port2)
+"pOd" = (
+/obj/machinery/atmospherics/refill_station/plasma,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/hallway/primary/port/north)
"pOk" = (
/obj/machinery/barsign{
pixel_y = -32
@@ -80062,6 +80146,13 @@
icon_state = "white"
},
/area/station/science/test_chamber)
+"qBr" = (
+/obj/machinery/atmospherics/refill_station/nitrogen,
+/obj/structure/sign/poster/official/air1/directional/south,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/hallway/primary/port/north)
"qBt" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
@@ -81185,6 +81276,11 @@
},
/turf/simulated/floor/plasteel/white,
/area/station/science/xenobiology)
+"qPn" = (
+/obj/machinery/atmospherics/pipe/simple/visible,
+/obj/effect/turf_decal/stripes/white/corner,
+/turf/simulated/floor/plating,
+/area/station/maintenance/fsmaint)
"qPs" = (
/obj/structure/chair/sofa/corp/left{
dir = 4
@@ -82088,8 +82184,8 @@
/turf/simulated/floor/plasteel,
/area/station/service/janitor)
"raN" = (
-/obj/machinery/atmospherics/unary/portables_connector,
-/obj/machinery/atmospherics/portable/canister/air,
+/obj/structure/table,
+/obj/effect/spawner/random/maintenance,
/obj/structure/sign/vacuum/external{
pixel_x = 30
},
@@ -82611,7 +82707,6 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/structure/closet/emcloset,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "redcorner"
@@ -85907,6 +86002,12 @@
"rXJ" = (
/obj/effect/spawner/random/dirt/frequent,
/obj/effect/spawner/random/dirt/frequent,
+/obj/machinery/atmospherics/pipe/simple/visible{
+ dir = 5
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"rXS" = (
@@ -90790,6 +90891,12 @@
/obj/machinery/light,
/turf/simulated/floor/carpet/black,
/area/station/command/office/captain)
+"tdO" = (
+/obj/machinery/atmospherics/refill_station/nitrogen,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/hallway/secondary/exit)
"teg" = (
/turf/simulated/floor/plasteel{
icon_state = "darkbluecorners"
@@ -93542,6 +93649,10 @@
icon_state = "purplecorner"
},
/area/station/hallway/primary/aft/east)
+"tNS" = (
+/obj/machinery/atmospherics/refill_station/oxygen,
+/turf/simulated/floor/catwalk,
+/area/station/maintenance/fsmaint)
"tNT" = (
/turf/simulated/wall,
/area/station/security/storage)
@@ -94122,6 +94233,17 @@
icon_state = "purplecorner"
},
/area/station/hallway/primary/aft/west)
+"tVo" = (
+/obj/structure/sign/securearea{
+ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
+ icon_state = "space";
+ layer = 4;
+ name = "EXTERNAL AIRLOCK";
+ pixel_x = -32
+ },
+/obj/machinery/atmospherics/refill_station/plasma,
+/turf/simulated/floor/catwalk,
+/area/station/maintenance/apmaint)
"tVv" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -94261,6 +94383,13 @@
icon_state = "red"
},
/area/station/maintenance/fore2)
+"tWx" = (
+/obj/effect/spawner/random/dirt/frequent,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/fsmaint)
"tWA" = (
/obj/structure/table/wood,
/obj/effect/spawner/random/food_trash,
@@ -95451,7 +95580,10 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/turf/simulated/floor/plasteel,
+/obj/machinery/atmospherics/refill_station/oxygen,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/station/hallway/secondary/exit)
"ujO" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -97528,6 +97660,7 @@
c_tag = "Primary Tool Storage Hallway";
dir = 1
},
+/obj/effect/turf_decal/stripes/white/corner,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -97990,13 +98123,11 @@
},
/area/station/hallway/primary/fore/north)
"uOD" = (
-/obj/machinery/light{
- dir = 4
+/obj/effect/turf_decal/stripes/white/line,
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralcorner"
},
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
- },
-/area/station/security/permabrig)
+/area/station/hallway/primary/port/north)
"uOL" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -100550,10 +100681,10 @@
},
/area/station/maintenance/asmaint)
"vuF" = (
-/obj/structure/chair/sofa/corp{
+/obj/machinery/light,
+/obj/structure/chair/sofa/corp/right{
dir = 1
},
-/obj/machinery/light,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"vuM" = (
@@ -100948,10 +101079,10 @@
/turf/simulated/floor/plating,
/area/station/hallway/primary/central/east)
"vyU" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 9
+/obj/effect/turf_decal/stripes/white/line,
+/turf/simulated/floor/plating{
+ icon_state = "asteroidplating"
},
-/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/apmaint)
"vzb" = (
/obj/structure/chair/wood/wings{
@@ -120941,7 +121072,7 @@ fSt
yhW
yhW
yhW
-lzH
+hSa
qJG
lzH
lzH
@@ -121197,7 +121328,7 @@ iGW
duh
yhW
gjl
-cxw
+kWz
yhW
duh
sfF
@@ -122482,7 +122613,7 @@ iLC
eRH
xJa
nJT
-duh
+hNt
duh
duh
xeN
@@ -124666,9 +124797,9 @@ uaP
syZ
uCu
ccW
-rWw
-raV
-rWw
+ftr
+rza
+dHQ
ccW
rWw
rWw
@@ -124924,8 +125055,8 @@ fqC
uCu
ccW
ftr
-rza
-dHQ
+jfl
+ftr
ccW
ccW
rWw
@@ -125181,7 +125312,7 @@ lxe
uCu
ccW
ftr
-jfl
+rza
ftr
ccW
ccW
@@ -125437,9 +125568,9 @@ xwW
eoN
uCu
wIq
-ftr
-rza
-ftr
+cvs
+mmp
+tVo
ccW
ccW
ccW
@@ -125694,7 +125825,7 @@ viJ
cpx
uCu
wIq
-cvs
+wsR
vyU
cxd
wqx
@@ -125952,8 +126083,8 @@ uCu
uCu
wIq
rSX
-rza
-pDu
+vyU
+lem
ftr
pDu
ftr
@@ -126209,7 +126340,7 @@ wIq
wIq
wIq
sKh
-wsR
+pma
ftr
dha
pPI
@@ -127411,8 +127542,8 @@ mdH
vUJ
wmL
hvX
-gKg
-aXn
+uOD
+pOd
aEe
aEe
aEe
@@ -127668,8 +127799,8 @@ mkt
bkU
hGQ
hvX
-gKg
-aXn
+uOD
+qBr
aEe
bGx
pam
@@ -127753,7 +127884,7 @@ wXW
gYw
wsR
stR
-wsR
+evE
wsR
vFd
ahX
@@ -127925,8 +128056,8 @@ taT
bkU
xDr
hvX
-gKg
-aXn
+uOD
+fQu
aEe
qBt
aju
@@ -128182,7 +128313,7 @@ uyM
uyM
sur
hvX
-gKg
+lvc
aXn
aEe
ahf
@@ -130586,7 +130717,7 @@ cBM
cBM
cBM
uba
-wsR
+cpT
ccW
ccW
rWw
@@ -133756,8 +133887,8 @@ aQL
pJz
aQL
tkn
-aQL
-uOD
+uYa
+rHj
rHj
wNG
vNP
@@ -134014,8 +134145,8 @@ aCu
vQq
vQq
aTz
-aTz
-aTz
+jCz
+gYe
aTz
vPt
vPt
@@ -162425,9 +162556,9 @@ fJD
cQp
oNg
iTC
+tdO
thC
njJ
-njJ
squ
oTu
xjc
@@ -170291,7 +170422,7 @@ mAq
mAq
jSD
qcb
-hqL
+cpC
hqL
cpC
hqL
@@ -170805,12 +170936,12 @@ alc
alc
raN
kHK
-vdj
+qPn
rXJ
-vdj
-mAq
-mAq
-cpC
+bBy
+tWx
+tWx
+omV
cpC
vdj
gvE
@@ -171064,9 +171195,9 @@ aRx
vdj
fHf
iNd
-vdj
-vdj
-mAq
+tNS
+eJr
+jMb
alc
fgK
rCI
diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm
index 21a4a697799..0993078db00 100644
--- a/_maps/map_files/stations/deltastation.dmm
+++ b/_maps/map_files/stations/deltastation.dmm
@@ -1409,6 +1409,9 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -16925,6 +16928,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
+/obj/effect/turf_decal/stripes/white/corner,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -16943,6 +16947,7 @@
sort_type_txt = "6";
dir = 8
},
+/obj/effect/turf_decal/stripes/white/line,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "yellowcorner"
@@ -17415,6 +17420,9 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -19297,20 +19305,6 @@
/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel,
/area/station/public/toilet/lockerroom)
-"bAe" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
- },
-/area/station/hallway/primary/port/north)
"bAg" = (
/obj/structure/table/reinforced,
/obj/item/plant_analyzer,
@@ -20427,9 +20421,9 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -30347,6 +30341,15 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/central/east)
+"cnx" = (
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutral"
+ },
+/area/station/maintenance/port)
"cny" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -32651,9 +32654,9 @@
},
/area/station/public/locker)
"cuD" = (
-/obj/structure/closet/wardrobe/black,
+/obj/machinery/atmospherics/refill_station/oxygen,
/turf/simulated/floor/plasteel{
- icon_state = "neutralcorner"
+ icon_state = "white"
},
/area/station/public/locker)
"cuF" = (
@@ -33543,10 +33546,9 @@
dir = 8
},
/obj/machinery/firealarm/directional/west,
-/obj/structure/closet/wardrobe/pjs,
+/obj/machinery/atmospherics/refill_station/plasma,
/turf/simulated/floor/plasteel{
- dir = 8;
- icon_state = "neutralcorner"
+ icon_state = "white"
},
/area/station/public/locker)
"cxr" = (
@@ -35700,6 +35702,18 @@
icon_state = "yellowcorner"
},
/area/station/hallway/primary/port/north)
+"cEi" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "yellowcorner"
+ },
+/area/station/hallway/primary/port/north)
"cEj" = (
/obj/structure/sink{
dir = 8;
@@ -36836,6 +36850,12 @@
icon_state = "neutralfull"
},
/area/station/maintenance/port)
+"cHz" = (
+/obj/machinery/atmospherics/refill_station/nitrogen,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/hallway/primary/port/north)
"cHA" = (
/turf/simulated/wall,
/area/station/maintenance/port)
@@ -40655,13 +40675,6 @@
icon_state = "neutral"
},
/area/station/maintenance/port)
-"cWo" = (
-/obj/machinery/alarm/directional/north,
-/turf/simulated/floor/plasteel{
- dir = 1;
- icon_state = "neutral"
- },
-/area/station/maintenance/port)
"cWp" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -40968,11 +40981,23 @@
icon_state = "neutral"
},
/area/station/maintenance/port)
-"cXU" = (
-/turf/simulated/floor/plasteel{
- icon_state = "neutral"
+"cXT" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
-/area/station/maintenance/port)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/hallway/secondary/entry/south)
"cXX" = (
/obj/structure/closet/emcloset,
/turf/simulated/floor/plating,
@@ -45677,12 +45702,6 @@
icon_state = "darkpurple"
},
/area/station/maintenance/port2)
-"dsr" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel{
- icon_state = "neutral"
- },
-/area/station/maintenance/port)
"dst" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -47609,6 +47628,10 @@
icon_state = "neutral"
},
/area/station/maintenance/aft)
+"dDq" = (
+/obj/machinery/atmospherics/refill_station/oxygen,
+/turf/simulated/floor/plating,
+/area/station/maintenance/port)
"dDr" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -50493,6 +50516,10 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
+"dSx" = (
+/obj/machinery/atmospherics/refill_station/plasma,
+/turf/simulated/floor/catwalk,
+/area/station/maintenance/port)
"dSz" = (
/obj/structure/window/reinforced{
dir = 1
@@ -52919,6 +52946,13 @@
},
/turf/simulated/floor/plating/airless,
/area/station/engineering/control)
+"esC" = (
+/obj/structure/grille/broken,
+/obj/effect/turf_decal/stripes/white/line,
+/turf/simulated/floor/plasteel{
+ icon_state = "neutral"
+ },
+/area/station/maintenance/port)
"etc" = (
/obj/machinery/button/windowtint{
dir = 8;
@@ -56444,6 +56478,9 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
+/obj/effect/turf_decal/stripes/white/corner{
+ dir = 4
+ },
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -57692,6 +57729,12 @@
icon_state = "dark"
},
/area/station/security/warden)
+"gCn" = (
+/obj/machinery/atmospherics/refill_station/nitrogen,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/public/locker)
"gCF" = (
/obj/structure/closet/secure_closet/atmos_personal,
/obj/machinery/light{
@@ -58536,6 +58579,12 @@
},
/turf/simulated/floor/catwalk,
/area/station/maintenance/port)
+"gYn" = (
+/obj/machinery/atmospherics/refill_station/plasma,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/hallway/secondary/exit)
"gYx" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -60557,6 +60606,12 @@
icon_state = "darkgreen"
},
/area/station/medical/virology)
+"hYs" = (
+/obj/machinery/atmospherics/refill_station/plasma,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/hallway/secondary/entry/south)
"hYv" = (
/obj/structure/table,
/obj/item/toy/figure/crew/scientist,
@@ -60626,9 +60681,11 @@
/turf/simulated/floor/plasteel/dark,
/area/station/turret_protected/ai_upload)
"hZE" = (
-/obj/structure/sign/poster/random/directional/east,
-/turf/simulated/floor/plasteel,
-/area/station/security/permabrig)
+/obj/machinery/atmospherics/refill_station/oxygen,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/hallway/secondary/exit)
"hZH" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -60688,6 +60745,10 @@
icon_state = "dark"
},
/area/station/science/robotics/chargebay)
+"iaF" = (
+/obj/machinery/atmospherics/refill_station/nitrogen,
+/turf/simulated/floor/catwalk,
+/area/station/maintenance/port)
"iaU" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -61979,6 +62040,13 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/engineering/tech_storage)
+"iDE" = (
+/obj/machinery/atmospherics/portable/canister/air,
+/obj/machinery/atmospherics/unary/portables_connector{
+ layer = 2
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/port)
"iDR" = (
/obj/structure/table,
/obj/effect/spawner/random/jani_supplies,
@@ -62009,6 +62077,19 @@
icon_state = "neutral"
},
/area/station/maintenance/fore)
+"iFa" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/hallway/primary/port/north)
"iFl" = (
/obj/effect/mapping_helpers/turfs/damage,
/turf/simulated/floor/wood,
@@ -62964,19 +63045,6 @@
icon_state = "neutralcorner"
},
/area/station/public/fitness)
-"jco" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
- },
-/area/station/hallway/primary/port/north)
"jcP" = (
/obj/effect/spawner/random/blood/often,
/obj/effect/spawner/random/cobweb/left/frequent,
@@ -63996,6 +64064,12 @@
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/station/engineering/break_room/secondary)
+"jEd" = (
+/obj/effect/turf_decal/stripes/white/line,
+/turf/simulated/floor/plasteel{
+ icon_state = "neutral"
+ },
+/area/station/maintenance/port)
"jEn" = (
/obj/structure/table/wood,
/obj/machinery/light/small,
@@ -64396,6 +64470,12 @@
/obj/machinery/ai_status_display,
/turf/simulated/wall,
/area/station/hallway/secondary/entry/lounge)
+"jOV" = (
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/port)
"jOW" = (
/obj/machinery/camera{
c_tag = "Arrivals Aft Port";
@@ -65284,6 +65364,12 @@
icon_state = "redyellowfull"
},
/area/station/medical/break_room)
+"khN" = (
+/obj/machinery/atmospherics/refill_station/nitrogen,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/hallway/secondary/exit)
"khQ" = (
/obj/structure/cable{
icon_state = "0-2"
@@ -65486,6 +65572,12 @@
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
+"kmt" = (
+/obj/machinery/atmospherics/refill_station/plasma,
+/turf/simulated/floor/plasteel{
+ icon_state = "yellowcorner"
+ },
+/area/station/hallway/primary/port/north)
"kmu" = (
/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
@@ -66015,6 +66107,15 @@
},
/turf/simulated/floor/plasteel/white,
/area/station/medical/sleeper)
+"kzx" = (
+/obj/effect/turf_decal/stripes/white/corner{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutral"
+ },
+/area/station/maintenance/port)
"kzM" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -66867,6 +66968,12 @@
/obj/machinery/fishtank/tank,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
+"kTH" = (
+/obj/machinery/atmospherics/refill_station/plasma,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/hallway/primary/port/north)
"kTO" = (
/mob/living/simple_animal/hostile/retaliate/araneus,
/obj/structure/bed/dogbed{
@@ -69390,6 +69497,11 @@
icon_state = "caution"
},
/area/station/engineering/transmission_laser)
+"mjS" = (
+/obj/machinery/atmospherics/refill_station/plasma,
+/obj/structure/sign/poster/random/directional/east,
+/turf/simulated/floor/plasteel,
+/area/station/security/permabrig)
"mkr" = (
/obj/structure/table,
/obj/effect/spawner/random/maintenance,
@@ -70388,6 +70500,14 @@
},
/turf/simulated/floor/plating/airless,
/area/station/engineering/control)
+"mJs" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/white/line,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutral"
+ },
+/area/station/maintenance/port)
"mJw" = (
/obj/machinery/light{
dir = 8
@@ -72651,6 +72771,20 @@
icon_state = "neutralcorner"
},
/area/station/public/fitness)
+"nFw" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/hallway/primary/port/north)
"nFx" = (
/obj/item/radio/intercom{
name = "west bump";
@@ -76386,6 +76520,12 @@
icon_state = "darkpurple"
},
/area/station/science/toxins/launch)
+"pqK" = (
+/obj/machinery/atmospherics/refill_station/nitrogen,
+/turf/simulated/floor/plasteel{
+ icon_state = "black"
+ },
+/area/station/security/permabrig)
"pqM" = (
/obj/machinery/power/apc/directional/west,
/obj/structure/cable{
@@ -76599,10 +76739,6 @@
},
/turf/simulated/floor/plating,
/area/station/security/armory/secure)
-"pvo" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/port)
"pvv" = (
/obj/structure/table/reinforced,
/obj/machinery/door/window/reinforced/normal,
@@ -76809,6 +76945,20 @@
icon_state = "tranquillite"
},
/area/station/service/kitchen)
+"pzX" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/hallway/secondary/entry/south)
"pAa" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/engineering/glass,
@@ -81567,6 +81717,20 @@
/obj/structure/weightmachine/weightlifter,
/turf/simulated/floor/plasteel,
/area/station/public/fitness)
+"rFk" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/hallway/primary/port/north)
"rFv" = (
/obj/structure/disposalpipe/segment/corner{
dir = 1
@@ -83111,6 +83275,20 @@
},
/turf/simulated/floor/plating,
/area/station/public/storage/emergency/port)
+"skU" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/white/corner{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/hallway/secondary/entry/south)
"skV" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/poster/contraband/random/directional/west,
@@ -84404,6 +84582,15 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
+"sLs" = (
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "arrival"
+ },
+/area/station/hallway/secondary/entry/south)
"sLI" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -85387,6 +85574,16 @@
icon_state = "neutral"
},
/area/station/maintenance/port)
+"tfe" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/visible{
+ dir = 9
+ },
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/port)
"tfU" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -85492,6 +85689,10 @@
icon_state = "darkyellow"
},
/area/station/engineering/control)
+"tic" = (
+/obj/machinery/alarm/directional/north,
+/turf/simulated/floor/plating,
+/area/station/maintenance/port)
"tik" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -85956,9 +86157,9 @@
name = "east bump";
pixel_x = 28
},
+/obj/machinery/atmospherics/refill_station/oxygen,
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "yellowcorner"
+ icon_state = "white"
},
/area/station/hallway/primary/port/north)
"tty" = (
@@ -88013,12 +88214,6 @@
},
/turf/simulated/floor/wood,
/area/station/maintenance/library)
-"uht" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 9
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/port)
"uhy" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -88751,6 +88946,12 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
+"uAk" = (
+/obj/machinery/atmospherics/refill_station/nitrogen,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/hallway/secondary/entry/south)
"uAz" = (
/obj/effect/turf_decal/woodsiding{
dir = 1
@@ -90882,11 +91083,6 @@
/obj/effect/spawner/random/engineering/materials,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
-"vxg" = (
-/obj/machinery/atmospherics/unary/portables_connector,
-/obj/machinery/atmospherics/portable/canister/air,
-/turf/simulated/floor/plating,
-/area/station/maintenance/port)
"vxz" = (
/obj/machinery/computer/secure_data{
dir = 4
@@ -91649,10 +91845,8 @@
/turf/simulated/wall/r_wall,
/area/station/maintenance/port)
"vMI" = (
-/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "neutral"
- },
+/obj/machinery/atmospherics/refill_station/oxygen,
+/turf/simulated/floor/catwalk,
/area/station/maintenance/starboard)
"vMO" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -91747,6 +91941,13 @@
icon_state = "whitepurple"
},
/area/station/science/toxins/mixing)
+"vOO" = (
+/obj/machinery/alarm/directional/east,
+/turf/simulated/floor/plasteel{
+ dir = 4;
+ icon_state = "yellowcorner"
+ },
+/area/station/hallway/primary/port/north)
"vPa" = (
/obj/structure/sign/greencross{
pixel_x = 32
@@ -92155,6 +92356,15 @@
},
/turf/simulated/floor/wood,
/area/station/medical/psych)
+"vYM" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/white/corner{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "neutral"
+ },
+/area/station/maintenance/port)
"vYP" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -92180,6 +92390,14 @@
icon_state = "whiteblue"
},
/area/station/medical/reception)
+"vZd" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/white/corner,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutral"
+ },
+/area/station/maintenance/port)
"vZf" = (
/obj/machinery/recharge_station,
/turf/simulated/floor/plasteel{
@@ -94094,6 +94312,12 @@
},
/turf/simulated/floor/plating,
/area/station/engineering/hardsuitstorage)
+"wOh" = (
+/obj/machinery/atmospherics/refill_station/oxygen,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/hallway/secondary/entry/south)
"wOk" = (
/obj/structure/table/glass,
/obj/item/stack/sheet/mineral/plasma{
@@ -94317,6 +94541,16 @@
/obj/machinery/alarm/directional/east,
/turf/simulated/floor/plasteel/dark,
/area/station/engineering/controlroom)
+"wUh" = (
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "neutral"
+ },
+/area/station/maintenance/port)
"wUk" = (
/obj/effect/turf_decal/loading_area,
/turf/simulated/floor/plasteel{
@@ -117749,11 +117983,11 @@ cHA
cHA
pRD
sZp
-kPB
-cHA
-vxg
-uht
-cHA
+mJs
+dDq
+iDE
+tfe
+hkk
abj
aaa
aaa
@@ -118006,13 +118240,13 @@ drn
cLA
cLA
sZp
-cLA
-drn
-pvo
-pvo
+kzx
+cnx
+wUh
+dhG
pcc
abj
-aaa
+abj
aaa
aaa
aaa
@@ -118263,11 +118497,12 @@ eYk
eYk
rbS
uaW
-cJO
+jOV
cNh
dhG
-dhG
-hkk
+vZd
+cHA
+cHA
abj
aaa
aaa
@@ -118287,7 +118522,6 @@ aaa
aaa
aaa
aaa
-aaa
abj
aaa
abj
@@ -118523,10 +118757,10 @@ cIx
cIx
cIx
cWn
-dtU
+esC
+iaF
cHA
abj
-abj
aaa
sJA
sJA
@@ -118779,12 +119013,12 @@ cRE
cZq
deZ
cIx
-cWo
-cXU
+tic
+jEd
+dSx
cHA
abj
abj
-abj
sJA
rlI
dhu
@@ -119037,7 +119271,7 @@ cOx
deZ
cIx
nus
-dsr
+vYM
irt
irt
sJA
@@ -126437,14 +126671,14 @@ brV
boc
bpV
brU
-bxf
-bxf
+nFw
+nFw
fSH
bxf
byG
-bAe
+rFk
bBO
-jco
+iFa
bDC
bGQ
bOo
@@ -126694,17 +126928,17 @@ nnt
rjh
bpW
ttb
-brV
-brV
-bfG
+cHz
+kTH
+cEi
bGR
byH
brV
brV
ufM
brV
+vOO
bGR
-brV
nFz
kiW
bfG
@@ -126712,7 +126946,7 @@ bQw
brV
bUC
bYg
-bYg
+kmt
cHA
fBB
dhG
@@ -132557,8 +132791,8 @@ aaa
aaa
aaa
dGS
-ant
-rPU
+sLs
+skU
rBP
aoo
aoX
@@ -132814,8 +133048,8 @@ apv
aaa
aaa
dGS
-ant
-rPU
+hYs
+pzX
eiT
aoo
aoY
@@ -133071,7 +133305,7 @@ agD
agE
aaa
dGS
-ant
+uAk
ala
alm
nmr
@@ -133328,8 +133562,8 @@ agE
agD
abj
dGS
-ant
-anT
+wOh
+cXT
anY
aoo
apa
@@ -134489,9 +134723,9 @@ dGf
dbp
dHL
dIH
-dJH
-dJH
-dKP
+hZE
+khN
+gYn
dLA
dMo
dKP
@@ -145740,7 +145974,7 @@ bXW
bXW
bXW
bYR
-cqw
+gCn
wMZ
kGm
kOy
@@ -154689,8 +154923,8 @@ qGg
hLR
eSX
oov
-iiu
-hZE
+pfD
+aVw
dYv
key
plf
@@ -154945,10 +155179,10 @@ fev
bkd
ygH
ygH
-ygH
-ygH
-ygH
-ygH
+iiu
+pfD
+mjS
+pqK
ygH
ygH
ygH
@@ -155201,12 +155435,12 @@ abj
abj
abj
abj
-abj
-abj
-aaa
-abj
-aaa
-abj
+ygH
+ygH
+ygH
+ygH
+ygH
+ygH
aaa
abj
aaa
@@ -155457,14 +155691,14 @@ aaa
aaa
aaa
aaa
+abj
+abj
aaa
aaa
+abj
aaa
-aaa
-aWP
-aaa
-aaa
-aaa
+abj
+abj
abj
aaa
aaa
@@ -155718,7 +155952,7 @@ aaa
aaa
aaa
aaa
-aaa
+aWP
aaa
aaa
aaa
diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm
index b2a1391a666..38bc805bc5e 100644
--- a/_maps/map_files/stations/emeraldstation.dmm
+++ b/_maps/map_files/stations/emeraldstation.dmm
@@ -54,12 +54,12 @@
},
/area/station/command/office/ce)
"aaV" = (
-/obj/item/radio/intercom{
- name = "east bump";
- pixel_x = 28
+/obj/machinery/atmospherics/refill_station/oxygen,
+/obj/structure/sign/poster/official/random/directional/north,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
},
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/central/ne)
+/area/station/hallway/secondary/exit)
"abf" = (
/obj/machinery/power/apc/directional/west,
/obj/structure/cable{
@@ -88,6 +88,14 @@
/obj/effect/landmark/spawner/xeno,
/turf/simulated/floor/plasteel,
/area/station/maintenance/starboard)
+"aby" = (
+/obj/machinery/camera{
+ c_tag = "Central Hallway North East";
+ dir = 9
+ },
+/obj/effect/turf_decal/stripes/white/corner,
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/central/ne)
"abB" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -4269,12 +4277,11 @@
},
/area/station/service/chapel)
"aUe" = (
-/obj/machinery/camera{
- c_tag = "Central Hallway North East";
- dir = 8
+/obj/machinery/atmospherics/refill_station/nitrogen,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
},
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/central/ne)
+/area/station/hallway/secondary/entry/west)
"aUl" = (
/obj/machinery/door/firedoor,
/turf/simulated/floor/plasteel{
@@ -4496,7 +4503,6 @@
/area/station/science/robotics)
"aWB" = (
/obj/structure/chair/sofa/corp/left,
-/obj/machinery/newscaster/directional/north,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"aWR" = (
@@ -6768,10 +6774,11 @@
/turf/simulated/floor/plasteel,
/area/station/ai_monitored/storage/eva)
"btk" = (
-/obj/structure/table,
-/obj/item/storage/bag/dice,
/obj/machinery/newscaster/directional/south,
-/turf/simulated/floor/plasteel,
+/obj/machinery/atmospherics/refill_station/nitrogen,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/station/hallway/secondary/exit)
"btl" = (
/obj/structure/cable{
@@ -7954,8 +7961,10 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry/east)
"bDB" = (
-/obj/structure/chair/sofa/bench/right,
-/turf/simulated/floor/plasteel,
+/obj/machinery/atmospherics/refill_station/oxygen,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/station/hallway/primary/central/south)
"bDD" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -13026,14 +13035,12 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/aft)
"cEq" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/machinery/atmospherics/refill_station/nitrogen,
+/obj/structure/sign/poster/official/air2/directional/west,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
},
-/obj/machinery/status_display{
- pixel_y = 32
- },
-/turf/simulated/floor/plasteel,
-/area/station/hallway/secondary/entry/west)
+/area/station/hallway/primary/central/sw)
"cEt" = (
/turf/simulated/floor/engine/o2,
/area/station/engineering/atmos)
@@ -18358,6 +18365,7 @@
"dHG" = (
/obj/structure/rack,
/obj/item/tank/internals/air,
+/obj/effect/landmark/spawner/nukedisc_respawn,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"dHI" = (
@@ -19972,10 +19980,9 @@
},
/area/station/turret_protected/ai)
"eaY" = (
-/obj/structure/table,
-/obj/item/storage/fancy/crayons,
+/obj/machinery/atmospherics/refill_station/plasma,
/turf/simulated/floor/plasteel{
- icon_state = "red"
+ icon_state = "redcorner"
},
/area/station/security/permabrig)
"ebg" = (
@@ -20536,6 +20543,13 @@
icon_state = "darkredcorners"
},
/area/station/security/brig)
+"egp" = (
+/obj/machinery/atmospherics/refill_station/plasma,
+/turf/simulated/floor/plasteel{
+ dir = 8;
+ icon_state = "redcorner"
+ },
+/area/station/security/permabrig)
"egs" = (
/obj/structure/chair/comfy/black{
dir = 1
@@ -22091,6 +22105,12 @@
icon_state = "whitepurple"
},
/area/station/science/xenobiology)
+"ewA" = (
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/central/ne)
"ewI" = (
/obj/structure/closet/secure_closet/reagents,
/obj/effect/turf_decal/stripes/line{
@@ -26249,6 +26269,11 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/station/maintenance/dorms/fore)
+"fme" = (
+/obj/structure/chair/sofa/bench/right,
+/obj/structure/sign/poster/official/random/directional/north,
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/central/south)
"fmu" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
/obj/machinery/camera{
@@ -26724,6 +26749,7 @@
/area/station/engineering/tech_storage)
"fpY" = (
/obj/structure/table,
+/obj/item/storage/fancy/crayons,
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
"fqk" = (
@@ -26874,6 +26900,12 @@
/obj/structure/lattice/catwalk,
/turf/space,
/area/station/engineering/solar/aft_port)
+"frn" = (
+/obj/machinery/atmospherics/refill_station/plasma,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/hallway/secondary/exit)
"fro" = (
/obj/machinery/door/poddoor{
id_tag = "trash";
@@ -30128,13 +30160,6 @@
"fZM" = (
/turf/simulated/wall,
/area/station/maintenance/aft)
-"fZO" = (
-/obj/structure/chair{
- dir = 1
- },
-/obj/structure/sign/poster/official/random/directional/south,
-/turf/simulated/floor/plasteel,
-/area/station/hallway/secondary/exit)
"fZU" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -30298,13 +30323,8 @@
"gbI" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/glass,
-/obj/item/shard{
- icon_state = "medium"
- },
-/obj/structure/flora/straw_bail,
-/turf/simulated/floor/plasteel{
- icon_state = "redyellowfull"
- },
+/obj/machinery/atmospherics/refill_station/plasma,
+/turf/simulated/floor/catwalk,
/area/station/maintenance/apmaint)
"gbL" = (
/obj/machinery/camera{
@@ -30318,7 +30338,9 @@
"gbO" = (
/obj/structure/rack,
/obj/item/tank/internals/emergency_oxygen/engi,
-/turf/simulated/floor/plating,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plasteel,
/area/station/maintenance/starboard)
"gbQ" = (
/turf/simulated/floor/wood,
@@ -30474,6 +30496,12 @@
icon_state = "redfull"
},
/area/station/security/permabrig)
+"gcT" = (
+/obj/machinery/atmospherics/refill_station/plasma,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/hallway/primary/central/sw)
"gdk" = (
/obj/structure/cable{
icon_state = "2-4"
@@ -33864,7 +33892,7 @@
},
/area/station/public/shops)
"gLW" = (
-/obj/structure/table,
+/obj/machinery/atmospherics/refill_station/nitrogen,
/turf/simulated/floor/plasteel{
icon_state = "red"
},
@@ -34596,6 +34624,9 @@
/area/station/security/brig)
"gUP" = (
/obj/machinery/firealarm/directional/east,
+/obj/effect/turf_decal/stripes/white/corner{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/ne)
"gUR" = (
@@ -35934,6 +35965,10 @@
/obj/structure/chair/sofa/bench{
dir = 4
},
+/obj/item/radio/intercom{
+ name = "west bump";
+ pixel_x = -28
+ },
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/ne)
"hil" = (
@@ -37232,11 +37267,11 @@
/area/station/maintenance/starboard)
"huZ" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/table_frame,
/obj/machinery/light/small{
dir = 8
},
-/turf/simulated/floor/plasteel,
+/obj/machinery/atmospherics/refill_station/plasma,
+/turf/simulated/floor/catwalk,
/area/station/maintenance/starboard)
"hvg" = (
/obj/structure/table,
@@ -39011,6 +39046,12 @@
/obj/item/storage/fancy/donut_box,
/turf/simulated/floor/wood,
/area/station/service/library)
+"hLy" = (
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 8
+ },
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/central/sw)
"hLB" = (
/obj/item/rpd,
/obj/structure/table/reinforced,
@@ -39398,10 +39439,9 @@
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint2)
"hQP" = (
-/obj/structure/closet/emcloset,
-/obj/effect/spawner/random/maintenance,
/obj/effect/spawner/random/cobweb/left/rare,
-/turf/simulated/floor/plating,
+/obj/machinery/atmospherics/refill_station/nitrogen,
+/turf/simulated/floor/catwalk,
/area/station/maintenance/starboard)
"hQU" = (
/turf/simulated/floor/plasteel,
@@ -39829,12 +39869,12 @@
/turf/simulated/floor/wood,
/area/station/hallway/primary/central/se)
"hWy" = (
-/obj/structure/rack{
- dir = 1
+/obj/machinery/atmospherics/refill_station/oxygen,
+/obj/structure/sign/poster/official/air1/directional/east,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
},
-/obj/effect/spawner/random/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fsmaint)
+/area/station/hallway/primary/central/ne)
"hWz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -40224,6 +40264,9 @@
pixel_x = -32;
step_size = 0
},
+/obj/effect/turf_decal/stripes/white/corner{
+ dir = 8
+ },
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/sw)
"iaG" = (
@@ -40485,12 +40528,12 @@
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"ide" = (
-/obj/structure/closet/firecloset,
/obj/item/decorations/sticky_decorations/flammable/spiderweb{
pixel_y = 20;
pixel_x = -20
},
-/turf/simulated/floor/plating,
+/obj/machinery/atmospherics/refill_station/nitrogen,
+/turf/simulated/floor/catwalk,
/area/station/maintenance/apmaint)
"idf" = (
/obj/structure/bed/dogbed{
@@ -42347,6 +42390,10 @@
},
/turf/simulated/floor/plasteel,
/area/station/supply/storage)
+"iwt" = (
+/obj/machinery/atmospherics/refill_station/oxygen,
+/turf/simulated/floor/catwalk,
+/area/station/maintenance/apmaint)
"iwv" = (
/obj/structure/mopbucket/full,
/obj/item/mop,
@@ -44969,6 +45016,13 @@
icon_state = "dark"
},
/area/station/science/server)
+"iVI" = (
+/obj/structure/sign/poster/official/random/directional/south,
+/obj/structure/table,
+/obj/item/storage/bag/dice,
+/obj/structure/sign/poster/official/random/directional/south,
+/turf/simulated/floor/plasteel,
+/area/station/hallway/secondary/exit)
"iVU" = (
/obj/machinery/door/firedoor,
/turf/simulated/floor/carpet/grimey,
@@ -53557,11 +53611,6 @@
icon_state = "arrival"
},
/area/station/hallway/secondary/entry)
-"kJf" = (
-/obj/structure/chair/sofa/bench,
-/obj/structure/sign/poster/official/random/directional/north,
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/central/south)
"kJl" = (
/obj/machinery/door/airlock/public/glass{
name = "Central Access"
@@ -54210,10 +54259,8 @@
/turf/simulated/floor/engine,
/area/station/engineering/engine/supermatter)
"kOz" = (
-/obj/structure/table,
-/obj/item/poster/random_contraband,
-/obj/effect/landmark/spawner/nukedisc_respawn,
-/turf/simulated/floor/plating,
+/obj/machinery/atmospherics/refill_station/oxygen,
+/turf/simulated/floor/catwalk,
/area/station/maintenance/starboard)
"kOA" = (
/obj/structure/chair/comfy/black{
@@ -54802,23 +54849,11 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
"kVa" = (
-/obj/structure/sign/poster/official/random/directional/north,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
+/obj/machinery/atmospherics/refill_station/nitrogen,
/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
+ icon_state = "white"
},
-/area/station/hallway/secondary/exit)
+/area/station/hallway/primary/central/ne)
"kVd" = (
/obj/machinery/power/apc/directional/north,
/obj/structure/cable{
@@ -67362,9 +67397,12 @@
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"nzE" = (
-/obj/structure/chair/sofa/corp,
-/turf/simulated/floor/plasteel,
-/area/station/hallway/secondary/exit)
+/obj/effect/turf_decal/stripes/corner,
+/obj/machinery/atmospherics/refill_station/oxygen,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/hallway/secondary/entry/west)
"nzG" = (
/turf/simulated/floor/plasteel{
dir = 1;
@@ -74481,6 +74519,13 @@
icon_state = "bluecorner"
},
/area/station/hallway/primary/fore)
+"oQS" = (
+/obj/item/radio/intercom{
+ name = "south bump";
+ pixel_y = -28
+ },
+/turf/simulated/floor/plasteel,
+/area/station/hallway/secondary/entry/west)
"oQU" = (
/obj/item/radio/intercom{
name = "west bump";
@@ -74765,10 +74810,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
-"oTQ" = (
-/obj/structure/sign/poster/official/random/directional/west,
-/turf/simulated/floor/plasteel,
-/area/station/hallway/primary/central/sw)
"oTT" = (
/obj/structure/table,
/obj/item/reagent_containers/spray/cleaner,
@@ -83146,6 +83187,12 @@
icon_state = "dark"
},
/area/station/science/robotics)
+"qEZ" = (
+/obj/effect/turf_decal/stripes/white/corner{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/central/sw)
"qFc" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -84610,6 +84657,11 @@
/obj/machinery/alarm/directional/east,
/turf/simulated/floor/carpet/grimey,
/area/station/service/chapel/office)
+"qUN" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/reagent_dispensers/watertank,
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/apmaint)
"qUR" = (
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plasteel{
@@ -85307,8 +85359,10 @@
},
/area/station/security/prison/cell_block)
"rbl" = (
-/obj/machinery/economy/vending/coffee,
-/turf/simulated/floor/plasteel,
+/obj/machinery/atmospherics/refill_station/plasma,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/station/hallway/primary/central/ne)
"rbm" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -88249,6 +88303,18 @@
/obj/effect/spawner/window/reinforced,
/turf/simulated/floor/plating,
/area/station/supply/storage)
+"rFm" = (
+/obj/structure/chair{
+ dir = 4
+ },
+/obj/item/radio/intercom{
+ name = "west bump";
+ pixel_x = -28
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "dark"
+ },
+/area/station/hallway/secondary/exit)
"rFr" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -96537,6 +96603,10 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/se)
+"tkd" = (
+/obj/item/kirbyplants/large,
+/turf/simulated/floor/plasteel,
+/area/station/hallway/primary/central/west)
"tkf" = (
/obj/machinery/power/treadmill{
dir = 8
@@ -115613,6 +115683,9 @@
/obj/structure/disposalpipe/segment/corner{
dir = 2
},
+/obj/machinery/status_display{
+ pixel_y = 32
+ },
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry/west)
"xdQ" = (
@@ -116327,6 +116400,12 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/security/fore)
+"xkF" = (
+/obj/machinery/atmospherics/refill_station/plasma,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/hallway/secondary/entry/west)
"xkG" = (
/obj/structure/rack,
/obj/effect/spawner/random/maintenance,
@@ -117341,6 +117420,24 @@
/obj/item/clothing/gloves/color/fyellow,
/turf/simulated/floor/plasteel,
/area/station/public/locker)
+"xtO" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/sign/poster/official/random/directional/north,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/hallway/secondary/exit)
"xtX" = (
/obj/structure/table,
/obj/item/autopsy_scanner,
@@ -119091,10 +119188,6 @@
},
/area/station/medical/storage)
"xNo" = (
-/obj/item/radio/intercom{
- name = "south bump";
- pixel_y = -28
- },
/obj/machinery/economy/vending/cigarette,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry/west)
@@ -131132,7 +131225,7 @@ aZS
oQf
hNf
hGV
-pGI
+iwt
xBo
moy
vGF
@@ -136306,7 +136399,7 @@ uPm
uPm
hui
oeh
-cBD
+dGS
opq
hnA
qZA
@@ -143466,9 +143559,9 @@ dYe
xBo
hGT
loD
-pGI
+vGF
dhZ
-iBx
+pGI
hTl
nIX
eZs
@@ -143722,10 +143815,10 @@ jnP
dYe
xIe
oDp
-qXp
-jJF
-iUq
-vGF
+qUN
+dbR
+dbR
+dbR
hTl
jcl
bKW
@@ -143981,8 +144074,8 @@ dbR
pKJ
dbR
dbR
-dbR
-dbR
+cEq
+gcT
hTl
hTl
hTl
@@ -144233,14 +144326,14 @@ tlt
snX
jSL
ldE
-snX
+kjH
snX
vhh
snX
iaF
-oTQ
-kjH
-snX
+hLy
+hLy
+qEZ
owl
eEd
niR
@@ -145319,8 +145412,8 @@ rmm
pmf
xNo
ixW
-jnP
-jnP
+ixW
+ixW
jnP
jnP
jnP
@@ -145569,14 +145662,14 @@ bqd
uPm
aZS
jnP
-jnP
aZS
+ixW
uWo
pDX
bOD
-dPe
-ixW
+oQS
ixW
+aUe
ixW
ixW
ixW
@@ -145827,9 +145920,9 @@ uPm
aZS
aZS
aZS
-aZS
ixW
-cEq
+xkF
+pDX
dnw
dPe
yax
@@ -146004,7 +146097,7 @@ mAE
mAE
mAE
nwf
-fGF
+tkd
fGF
kpe
oAI
@@ -146084,7 +146177,7 @@ fZM
fZM
fZM
fZM
-fZM
+cPY
cPY
xdN
xHL
@@ -146350,7 +146443,7 @@ dPe
far
dPe
sQt
-rtE
+nzE
xHF
uWo
uWo
@@ -147320,7 +147413,7 @@ pgN
luN
hgn
xmm
-kJf
+fme
rxd
xgW
nwc
@@ -160125,10 +160218,10 @@ uBv
nOk
oWo
soN
-soN
-aaV
-aUe
-soN
+aby
+ewA
+ewA
+ewA
gUP
jJP
soN
@@ -160383,10 +160476,10 @@ syn
syn
wap
syn
-syn
-syn
+kVa
+hWy
rbl
-rSC
+syn
dkG
dkG
mIy
@@ -160639,11 +160732,11 @@ kAO
gdv
ibO
bPF
-reh
-hWy
-gdv
-rSC
-rSC
+kZk
+syn
+syn
+syn
+syn
ikP
iGm
tAF
@@ -168812,7 +168905,7 @@ kwy
hhU
kAa
xhr
-xhr
+egp
otB
sUV
fEn
@@ -169842,7 +169935,7 @@ eTO
pmI
xhr
mIj
-eaY
+gLW
eTx
xnS
vHR
@@ -172216,7 +172309,7 @@ qKm
jnP
jnP
aZh
-qiw
+frn
mKN
rul
mKN
@@ -172473,7 +172566,7 @@ aZS
jnP
jnP
aZh
-nzE
+qiw
mKN
rul
mKN
@@ -174270,7 +174363,7 @@ aZS
aZS
aZS
aZh
-kVa
+xtO
xFM
uuT
lIu
@@ -174284,7 +174377,7 @@ qCP
qCP
jgL
jgL
-fZO
+iVI
aZh
iWS
szh
@@ -175038,9 +175131,9 @@ tUm
fmU
fgG
vdF
-cNn
+rFm
tUm
-oQr
+aaV
sqS
nWI
jgL
@@ -175494,7 +175587,7 @@ kwy
rbY
tgF
hpA
-hpA
+eaY
hRG
sUV
kfm
@@ -177909,7 +178002,7 @@ fWN
kVq
caq
hQP
-gRv
+jcy
pot
dHG
caq
diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm
index 1a8d3e86d57..b220f39f283 100644
--- a/_maps/map_files/stations/metastation.dmm
+++ b/_maps/map_files/stations/metastation.dmm
@@ -499,6 +499,10 @@
/obj/structure/cable/pink{
icon_state = "2-4"
},
+/obj/item/mounted/frame/apc_frame,
+/obj/effect/turf_decal/stripes/white/corner{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"agi" = (
@@ -596,6 +600,23 @@
icon_state = "dark"
},
/area/station/engineering/atmos)
+"ahm" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/hallway/secondary/exit)
"ahq" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -4457,11 +4478,11 @@
/turf/simulated/wall,
/area/station/public/toilet/lockerroom)
"aBM" = (
-/obj/item/mounted/frame/apc_frame,
/obj/structure/cable/pink{
icon_state = "2-8"
},
-/turf/simulated/floor/plating,
+/obj/machinery/atmospherics/refill_station/plasma,
+/turf/simulated/floor/catwalk,
/area/station/maintenance/fore)
"aBN" = (
/obj/structure/cable{
@@ -15461,6 +15482,11 @@
},
/turf/simulated/floor/plating/airless,
/area/shuttle/arrival/station)
+"bnG" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/refill_station/plasma,
+/turf/simulated/floor/plating,
+/area/station/maintenance/fsmaint)
"bnJ" = (
/obj/structure/rack,
/obj/item/storage/toolbox/electrical{
@@ -16539,7 +16565,6 @@
pixel_x = -32;
pixel_y = -32
},
-/obj/item/kirbyplants/large,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -19475,12 +19500,13 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry/east)
"bzA" = (
-/obj/item/kirbyplants/large/plant8,
/obj/effect/turf_decal/stripes/line{
dir = 9
},
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/plasteel,
+/obj/machinery/atmospherics/refill_station/oxygen,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/station/hallway/secondary/entry/east)
"bzC" = (
/obj/structure/chair/comfy/beige{
@@ -19819,7 +19845,6 @@
/turf/simulated/floor/plating/airless,
/area/station/engineering/solar/fore_port)
"bAE" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -19827,6 +19852,9 @@
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 4
+ },
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry/east)
"bAK" = (
@@ -19850,9 +19878,10 @@
},
/area/station/engineering/smes)
"bAQ" = (
-/obj/item/beacon,
-/obj/effect/turf_decal/delivery,
-/turf/simulated/floor/plasteel,
+/obj/machinery/atmospherics/refill_station/nitrogen,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/station/hallway/secondary/entry/east)
"bAR" = (
/obj/machinery/economy/vending/cola,
@@ -20071,12 +20100,12 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1
- },
/obj/structure/cable{
icon_state = "2-4"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry/east)
"bBy" = (
@@ -35572,12 +35601,9 @@
},
/area/station/medical/medbay)
"cPp" = (
-/obj/structure/sign/poster/contraband/random/directional/north,
-/obj/structure/reagent_dispensers/fueltank,
/obj/effect/mapping_helpers/turfs/burn,
-/obj/machinery/light/small{
- dir = 1
- },
+/obj/structure/reagent_dispensers/fueltank,
+/obj/structure/sign/poster/contraband/random/directional/north,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"cPq" = (
@@ -35872,12 +35898,6 @@
icon_state = "whitepurple"
},
/area/station/science/research)
-"cQM" = (
-/obj/machinery/economy/vending/snack,
-/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
- },
-/area/station/hallway/secondary/exit)
"cQN" = (
/obj/machinery/door/airlock/external{
name = "Space Shack"
@@ -35904,15 +35924,6 @@
icon_state = "dark"
},
/area/station/turret_protected/aisat/interior)
-"cQR" = (
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/machinery/power/apc/directional/north,
-/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
- },
-/area/station/hallway/secondary/exit)
"cQW" = (
/turf/simulated/wall/r_wall,
/area/station/maintenance/solar_maintenance/aft_starboard)
@@ -35997,23 +36008,6 @@
icon_state = "white"
},
/area/station/medical/chemistry)
-"cRv" = (
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
- },
-/area/station/hallway/secondary/exit)
"cRA" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -36225,12 +36219,6 @@
},
/turf/simulated/floor/carpet/grimey,
/area/station/service/chapel/office)
-"cSN" = (
-/obj/machinery/economy/vending/cola,
-/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
- },
-/area/station/hallway/secondary/exit)
"cSO" = (
/turf/simulated/wall,
/area/station/service/chapel)
@@ -36273,24 +36261,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/carpet/green,
/area/station/maintenance/apmaint)
-"cTg" = (
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=10-Aft-To-Central";
- location = "9.4-Escape-4"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
- },
-/area/station/hallway/secondary/exit)
"cTk" = (
/obj/effect/decal/remains/human{
desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
@@ -36313,15 +36283,6 @@
},
/turf/simulated/floor/plating,
/area/station/security/prison/cell_block/a)
-"cTq" = (
-/obj/machinery/light{
- dir = 8
- },
-/obj/structure/sign/poster/official/random/directional/west,
-/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
- },
-/area/station/hallway/secondary/exit)
"cTr" = (
/obj/structure/chair{
dir = 8
@@ -36436,6 +36397,7 @@
c_tag = "Departure Lounge - Port Fore";
dir = 5
},
+/obj/machinery/economy/vending/snack,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -37077,6 +37039,7 @@
/area/station/maintenance/fore)
"cXz" = (
/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/machinery/economy/vending/cola,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -37208,7 +37171,8 @@
/obj/machinery/light/small{
dir = 4
},
-/turf/simulated/floor/plating,
+/obj/machinery/atmospherics/refill_station/oxygen,
+/turf/simulated/floor/catwalk,
/area/station/maintenance/fore)
"cYq" = (
/obj/effect/decal/cleanable/dirt,
@@ -38575,8 +38539,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"dhl" = (
-/obj/effect/spawner/random/maintenance,
-/obj/structure/rack,
+/obj/machinery/atmospherics/refill_station/oxygen,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"dhm" = (
@@ -38612,6 +38575,16 @@
},
/turf/simulated/floor/plasteel,
/area/station/science/testrange)
+"dhs" = (
+/obj/machinery/atmospherics/refill_station/plasma,
+/obj/item/radio/intercom{
+ name = "north bump";
+ pixel_y = 28
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/hallway/secondary/exit)
"dhw" = (
/obj/structure/flora/ausbushes/fernybush,
/obj/structure/flora/ausbushes/ywflowers,
@@ -39272,6 +39245,13 @@
icon_state = "darkgrey"
},
/area/station/turret_protected/ai)
+"duF" = (
+/obj/machinery/atmospherics/refill_station/nitrogen,
+/obj/structure/sign/poster/official/air1/directional/north,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/hallway/secondary/exit)
"dvc" = (
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
dir = 4
@@ -43926,6 +43906,13 @@
},
/turf/space,
/area/space/nearstation)
+"fss" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/item/beacon,
+/turf/simulated/floor/plasteel,
+/area/station/hallway/secondary/entry/east)
"fsT" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
@@ -45159,6 +45146,10 @@
icon_state = "darkredcorners"
},
/area/station/security/armory/secure)
+"fSt" = (
+/obj/machinery/atmospherics/refill_station/oxygen,
+/turf/simulated/floor/plating,
+/area/station/maintenance/starboard2)
"fSz" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -45733,6 +45724,31 @@
icon_state = "white"
},
/area/station/security/permabrig)
+"gdB" = (
+/obj/machinery/navbeacon{
+ codes_txt = "patrol;next_patrol=10-Aft-To-Central";
+ location = "9.4-Escape-4"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/navbeacon{
+ codes_txt = "patrol;next_patrol=10-Aft-To-Central";
+ location = "9.4-Escape-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/hallway/secondary/exit)
"geq" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -45939,9 +45955,9 @@
pixel_y = 32
},
/obj/machinery/alarm/directional/north,
+/obj/machinery/atmospherics/refill_station/oxygen,
/turf/simulated/floor/plasteel{
- dir = 4;
- icon_state = "cautioncorner"
+ icon_state = "white"
},
/area/station/hallway/primary/starboard/east)
"ghT" = (
@@ -49480,7 +49496,10 @@
/obj/effect/turf_decal/stripes/line{
dir = 10
},
-/turf/simulated/floor/plasteel,
+/obj/machinery/atmospherics/refill_station/plasma,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
/area/station/hallway/secondary/entry/east)
"hMf" = (
/obj/structure/cable{
@@ -52151,6 +52170,10 @@
dir = 5
},
/obj/item/stack/cable_coil/blue,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/white/line,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"iSY" = (
@@ -52647,6 +52670,10 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/aft/north)
+"jhI" = (
+/obj/machinery/atmospherics/refill_station/plasma,
+/turf/simulated/floor/catwalk,
+/area/station/maintenance/apmaint)
"jil" = (
/obj/structure/disposalpipe/segment/corner{
dir = 8
@@ -57811,6 +57838,10 @@
/obj/structure/cable/pink{
icon_state = "2-10"
},
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/white/corner,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"loz" = (
@@ -59927,20 +59958,6 @@
icon_state = "red"
},
/area/station/security/warden)
-"mky" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
- },
-/area/station/hallway/secondary/exit)
"mkK" = (
/obj/machinery/atmospherics/unary/vent_pump/siphon/on{
dir = 8;
@@ -62609,6 +62626,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
},
+/obj/effect/turf_decal/stripes/white/corner{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"nmh" = (
@@ -63034,6 +63054,12 @@
"nxT" = (
/turf/simulated/wall,
/area/station/maintenance/xenobio_north)
+"nxV" = (
+/obj/machinery/atmospherics/refill_station/plasma,
+/turf/simulated/floor/plasteel{
+ icon_state = "red"
+ },
+/area/station/security/permabrig)
"nya" = (
/obj/machinery/economy/vending/coffee,
/obj/effect/turf_decal/delivery/hollow,
@@ -63170,7 +63196,8 @@
icon_state = "0-8"
},
/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plating,
+/obj/machinery/atmospherics/refill_station/nitrogen,
+/turf/simulated/floor/catwalk,
/area/station/maintenance/fore)
"nBf" = (
/obj/structure/disposalpipe/segment{
@@ -67284,6 +67311,17 @@
icon_state = "red"
},
/area/station/security/permabrig)
+"pss" = (
+/obj/machinery/alarm/directional/west,
+/obj/machinery/camera{
+ c_tag = "Departure Lounge - Port Fore";
+ dir = 4
+ },
+/obj/machinery/atmospherics/refill_station/oxygen,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/hallway/secondary/exit)
"psz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable{
@@ -68449,17 +68487,11 @@
},
/area/station/medical/cloning)
"pSL" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+/obj/machinery/atmospherics/refill_station/plasma,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
},
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
-/turf/simulated/floor/plasteel,
-/area/station/hallway/secondary/entry/east)
+/area/station/hallway/primary/starboard/north)
"pSM" = (
/obj/machinery/camera{
c_tag = "Head of Security's Office"
@@ -68904,6 +68936,10 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 4
+ },
+/obj/item/kirbyplants/large/plant8,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry/east)
"qbE" = (
@@ -70560,6 +70596,9 @@
icon_state = "2-4"
},
/obj/effect/spawner/random/maintenance,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"qNV" = (
@@ -70817,6 +70856,10 @@
icon_state = "darkbluecorners"
},
/area/station/aisat)
+"qSg" = (
+/obj/machinery/atmospherics/refill_station/nitrogen,
+/turf/simulated/floor/catwalk,
+/area/station/maintenance/apmaint)
"qSr" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -72919,6 +72962,19 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/central/west)
+"rLl" = (
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/machinery/power/apc/directional/north,
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/obj/machinery/power/apc/directional/north,
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/hallway/secondary/exit)
"rLw" = (
/obj/machinery/atmospherics/air_sensor{
autolink_id = "waste_sensor";
@@ -73503,6 +73559,10 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 1
+ },
+/obj/structure/sign/poster/official/air1/directional/east,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"rWy" = (
@@ -74647,6 +74707,9 @@
icon_state = "1-9"
},
/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"syd" = (
@@ -75817,6 +75880,13 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/central/nw)
+"sWZ" = (
+/obj/machinery/atmospherics/refill_station/nitrogen,
+/obj/structure/sign/poster/official/air1/directional/west,
+/turf/simulated/floor/plasteel{
+ icon_state = "white"
+ },
+/area/station/hallway/primary/starboard/east)
"sXz" = (
/obj/structure/chair/sofa/corp,
/turf/simulated/floor/plasteel{
@@ -77048,6 +77118,7 @@
},
/area/station/security/main)
"txR" = (
+/obj/machinery/atmospherics/refill_station/nitrogen,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "red"
@@ -77596,7 +77667,7 @@
/obj/machinery/atmospherics/unary/portables_connector,
/obj/machinery/atmospherics/portable/canister/air,
/obj/effect/spawner/random/cobweb/right/rare,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/catwalk,
/area/station/maintenance/fore)
"tNQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -81266,6 +81337,9 @@
icon_state = "0-4"
},
/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/stripes/white/line{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"vpZ" = (
@@ -83112,6 +83186,16 @@
},
/turf/simulated/floor/engine,
/area/station/engineering/control)
+"wkM" = (
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/structure/sign/poster/official/random/directional/west,
+/obj/item/kirbyplants/large/plant14,
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/hallway/secondary/exit)
"wlo" = (
/obj/structure/closet/crate/trashcart,
/obj/effect/spawner/random/trash,
@@ -83575,6 +83659,26 @@
},
/turf/simulated/floor/engine/air,
/area/station/engineering/atmos)
+"wwK" = (
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/corner{
+ dir = 1
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/hallway/secondary/exit)
"wxb" = (
/obj/machinery/economy/vending/cola,
/turf/simulated/floor/plasteel{
@@ -84374,6 +84478,10 @@
icon_state = "dark"
},
/area/station/security/armory)
+"wQt" = (
+/obj/machinery/atmospherics/refill_station/oxygen,
+/turf/simulated/floor/catwalk,
+/area/station/maintenance/apmaint)
"wQE" = (
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -85888,6 +85996,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/aft/north)
+"xvs" = (
+/turf/simulated/wall/r_wall,
+/area/station/hallway/primary/starboard/north)
"xvB" = (
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk{
@@ -86892,6 +87003,23 @@
/obj/machinery/atmospherics/pipe/manifold/visible/yellow,
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
+"xTX" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/hallway/secondary/exit)
"xUb" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -87626,16 +87754,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
-"yjK" = (
-/obj/item/radio/intercom{
- name = "north bump";
- pixel_y = 28
- },
-/obj/item/kirbyplants/large/plant14,
-/turf/simulated/floor/plasteel{
- icon_state = "neutralfull"
- },
-/area/station/hallway/secondary/exit)
"ykh" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
@@ -99110,7 +99228,7 @@ bin
mVN
bAQ
baJ
-xhx
+fss
cmu
mVN
aaa
@@ -100652,7 +100770,7 @@ bin
abq
mVN
bzA
-pSL
+tjR
fqB
niH
uWq
@@ -103513,7 +103631,7 @@ erF
cky
crG
crG
-cCy
+jhI
bZP
cSP
cyy
@@ -103770,11 +103888,11 @@ cFU
crG
jGq
crG
-roH
-bZP
+qSg
bZP
cPp
crG
+crG
bZP
aaa
aaa
@@ -104027,9 +104145,9 @@ ctM
crG
cFU
cpD
-crG
+roH
bZP
-clK
+wQt
crG
crG
bZP
@@ -110625,7 +110743,7 @@ kkP
owq
apK
jRX
-uZy
+nxV
tfl
aRx
qMU
@@ -112789,9 +112907,9 @@ kWT
cXK
muB
bZU
-cSN
-mky
-cTq
+pss
+xTX
+wkM
cTO
cRt
cTt
@@ -113046,8 +113164,8 @@ ycl
cXK
cTD
bZU
-cQM
-mky
+duF
+ahm
kUp
kUp
cRt
@@ -113303,8 +113421,8 @@ chy
cXK
cQo
bZU
-yjK
-cTg
+dhs
+gdB
kUp
kUp
cRt
@@ -113560,8 +113678,8 @@ ced
iER
bZU
bZU
-cQR
-cRv
+rLl
+wwK
kUp
fhC
jnk
@@ -123515,8 +123633,8 @@ xNa
aLl
aaa
aaa
-aaa
blo
+pSL
aIr
nyR
rve
@@ -123772,8 +123890,8 @@ eiI
aBZ
vuo
aZK
-beC
-beC
+xvs
+xvs
gFZ
boX
bqD
@@ -124328,7 +124446,7 @@ csh
cte
lBw
qyp
-cwG
+fSt
crq
uWe
cmB
@@ -125551,7 +125669,7 @@ aBZ
aVc
cbc
vmT
-dAH
+bnG
cxr
avA
aCa
@@ -127379,7 +127497,7 @@ oob
bgN
bkU
xCF
-bqx
+sWZ
bqJ
bhY
cgn
diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm
index e6169752f75..74dc7de8d51 100644
--- a/code/game/objects/items/weapons/tanks/tank_types.dm
+++ b/code/game/objects/items/weapons/tanks/tank_types.dm
@@ -11,12 +11,17 @@
/*
* Oxygen
*/
-/obj/item/tank/internals/oxygen
- name = "oxygen tank"
- desc = "A tank of oxygen, this one is blue."
- icon_state = "oxygen"
+/obj/item/tank/internals
+ name = "internals tank"
+ desc = "A tank for use in internals. If you see this, please submit a bug report."
+ icon_state = "generic"
distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
force = 10
+
+/obj/item/tank/internals/oxygen
+ name = "oxygen tank"
+ desc = "A tank of oxygen. This one is blue."
+ icon_state = "oxygen"
dog_fashion = /datum/dog_fashion/back
/obj/item/tank/internals/oxygen/populate_gas()
@@ -25,12 +30,10 @@
/obj/item/tank/internals/oxygen/yellow
desc = "A tank of oxygen, this one is yellow."
icon_state = "oxygen_f"
- dog_fashion = null
/obj/item/tank/internals/oxygen/red
desc = "A tank of oxygen, this one is red."
icon_state = "oxygen_fr"
- dog_fashion = null
/obj/item/tank/internals/oxygen/empty/populate_gas()
return
@@ -43,7 +46,7 @@
desc = "A tank with an N2O/O2 gas mix."
icon_state = "anesthetic"
item_state = "an_tank"
- force = 10
+ distribute_pressure = ONE_ATMOSPHERE
/obj/item/tank/internals/anesthetic/populate_gas()
air_contents.set_oxygen((3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) * O2STANDARD)
@@ -89,8 +92,6 @@
desc = "A tank of plasma gas designed specifically for use as internals, particularly for plasma-based lifeforms. If you're not a Plasmaman, you probably shouldn't use this."
icon_state = "plasma_fr"
item_state = "plasma_fr"
- force = 10
- distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
/obj/item/tank/internals/plasmaman/populate_gas()
air_contents.set_toxins((3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C))
@@ -105,7 +106,7 @@
slot_flags = ITEM_SLOT_BELT
flags_2 = ALLOW_BELT_NO_JUMPSUIT_2
force = 5
- volume = 35
+ volume = 18 // Lasts 1h 16m 30s
w_class = WEIGHT_CLASS_SMALL
/obj/item/tank/internals/plasmaman/belt/full/populate_gas()
@@ -134,8 +135,7 @@
flags_2 = ALLOW_BELT_NO_JUMPSUIT_2
w_class = WEIGHT_CLASS_SMALL
force = 4
- distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
- volume = 3 //Tiny. Real life equivalents only have 21 breaths of oxygen in them. They're EMERGENCY tanks anyway -errorage (dangercon 2011)
+ volume = 1 // Roughly 4m 15s of air
/obj/item/tank/internals/emergency_oxygen/populate_gas()
air_contents.set_oxygen((10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C))
@@ -146,7 +146,7 @@
/obj/item/tank/internals/emergency_oxygen/engi
name = "extended-capacity emergency oxygen tank"
icon_state = "emergency_engi"
- volume = 6 // should last 24 minutes if full
+ volume = 3 // Lasts 12m 45s
/obj/item/tank/internals/emergency_oxygen/engi/empty/populate_gas()
return
@@ -155,11 +155,12 @@
name = "suspicious emergency oxygen tank"
icon_state = "emergency_syndi"
desc = "A dark emergency oxygen tank. The label on the back reads \"Original Oxygen Tank Design, Do Not Steal.\""
+ volume = 11 // Lasts 46m 45s
/obj/item/tank/internals/emergency_oxygen/double
name = "double emergency oxygen tank"
icon_state = "emergency_double"
- volume = 12 //If it's double of the above, shouldn't it be double the volume??
+ volume = 6 // Lasts 25m 30s
/obj/item/tank/internals/emergency_oxygen/double/empty/populate_gas()
return
@@ -171,7 +172,6 @@
name = "nitrogen tank"
desc = "A tank of nitrogen."
icon_state = "oxygen_fr"
- distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
/obj/item/tank/internals/nitrogen/populate_gas()
air_contents.set_nitrogen((6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C))
@@ -188,7 +188,7 @@
name = "vox specialized nitrogen tank"
desc = "A high-tech nitrogen tank designed specifically for Vox."
icon_state = "emergency_vox"
- volume = 35
+ volume = 18 // Lasts 1h 16m 30s
/obj/item/tank/internals/emergency_oxygen/double/vox/populate_gas()
air_contents.set_nitrogen((10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C))
@@ -215,9 +215,6 @@
desc = "A generic tank used for storing and transporting gasses. Can be used for internals."
icon_state = "generic"
item_state = "generic"
- distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
- force = 10
- dog_fashion = /datum/dog_fashion/back
/obj/item/tank/internals/generic/populate_gas()
return
diff --git a/code/modules/atmospherics/machinery/other/refill_station.dm b/code/modules/atmospherics/machinery/other/refill_station.dm
new file mode 100644
index 00000000000..5d7779c5b1f
--- /dev/null
+++ b/code/modules/atmospherics/machinery/other/refill_station.dm
@@ -0,0 +1,207 @@
+/// The maximum `target_pressure` you can set on the station. Equates to about 1013.25 kPa.
+#define MAX_TARGET_PRESSURE 10 * ONE_ATMOSPHERE
+
+/obj/machinery/atmospherics/refill_station
+ name = "refill station"
+ icon = 'icons/obj/atmos.dmi'
+ icon_state = "filler_oxy"
+ anchored = TRUE
+ density = TRUE
+ resistance_flags = NONE
+ idle_power_consumption = 1
+ active_power_consumption = 5
+ power_channel = PW_CHANNEL_ENVIRONMENT
+ /// The desired pressure the refill station should be outputting into a holding tank.
+ target_pressure = MAX_TARGET_PRESSURE
+ can_unwrench_while_on = FALSE
+ /// The current air contents of this device
+ var/datum/gas_mixture/air_contents = new
+ /// The tank inserted into the machine
+ var/obj/item/tank/holding_tank
+ /// The maximum pressure of the device
+ var/maximum_pressure = 10 * ONE_ATMOSPHERE
+ /// Type of atmos refilled. Used in examines
+ var/refill_type = "oxygen"
+
+/obj/machinery/atmospherics/refill_station/Initialize(mapload)
+ . = ..()
+ SSair.atmos_machinery += src
+ air_contents.volume = 1000
+ air_contents.set_temperature(T20C)
+
+/obj/machinery/atmospherics/refill_station/examine(mob/user)
+ . = ..()
+ . += "The Nanotrasen standard refill station is a vital piece of equipment for \
+ ensuring a multi-species crew. By providing an easy-to-access source of refillable [refill_type], \
+ Nanotrasen aims to ensure worker productivity through the provision of breathable \
+ atmospherics to their crew."
+ if(holding_tank)
+ . += ""
+ . += "The pressure gauge on the inserted tank displays [round(holding_tank.air_contents.return_pressure())] kPa."
+
+/obj/machinery/atmospherics/refill_station/update_overlays()
+ overlays.Cut()
+ if(holding_tank)
+ overlays += "tank_oxy"
+ var/pressure = holding_tank.air_contents.return_pressure()
+ if(stat & (NOPOWER|BROKEN))
+ return
+ if(pressure < 1000)
+ overlays += "filling_oxy"
+ else
+ overlays += "filled_oxy"
+
+/obj/machinery/atmospherics/refill_station/return_analyzable_air()
+ return air_contents
+
+/obj/machinery/atmospherics/refill_station/proc/replace_tank(mob/living/user, obj/item/tank/new_tank)
+ if(!holding_tank)
+ return FALSE
+ if(Adjacent(user) && !issilicon(user))
+ user.put_in_hands(holding_tank)
+ holding_tank = new_tank
+ if(!(stat & NOPOWER))
+ on = TRUE
+ change_power_mode(ACTIVE_POWER_USE)
+ update_icon(UPDATE_OVERLAYS)
+ return TRUE
+
+/obj/machinery/atmospherics/refill_station/item_interaction(mob/living/user, obj/item/used, list/modifiers)
+ if(istype(used, /obj/item/analyzer))
+ return ..()
+ if(!istype(used, /obj/item/tank))
+ to_chat(user, "[used] does not fit in [src]'s tank slot.")
+ return ITEM_INTERACT_COMPLETE
+ if(!(stat & BROKEN))
+ if(used.flags & NODROP || !user.transfer_item_to(used, src))
+ to_chat(user, "[used] is stuck to your hand!")
+ return ITEM_INTERACT_COMPLETE
+ var/obj/item/tank/new_tank = used
+ to_chat(user, "[holding_tank ? "In one smooth motion you pop [holding_tank] out of [src]'s connector and replace it with [new_tank]" : "You insert [new_tank] into [src]"].")
+ investigate_log("[key_name(user)] started a transfer into [new_tank] at [src].
", "atmos")
+ if(holding_tank)
+ replace_tank(user, new_tank)
+ else
+ holding_tank = new_tank
+ if(!(stat & NOPOWER))
+ on = TRUE
+ change_power_mode(ACTIVE_POWER_USE)
+ update_icon(UPDATE_OVERLAYS)
+ return ITEM_INTERACT_COMPLETE
+
+/obj/machinery/atmospherics/refill_station/attack_hand(mob/living/user)
+ if(!holding_tank)
+ to_chat(user, "There is no tank to remove.")
+ return FINISH_ATTACK
+ user.put_in_hands(holding_tank)
+ holding_tank = null
+ on = FALSE
+ change_power_mode(IDLE_POWER_USE)
+ update_icon(UPDATE_OVERLAYS)
+
+/obj/machinery/atmospherics/refill_station/process_atmos()
+ ..()
+ if(stat & (NOPOWER|BROKEN))
+ return
+ var/datum/milla_safe/refill_station_process/milla = new()
+ milla.invoke_async(src)
+
+/datum/milla_safe/refill_station_process
+
+/datum/milla_safe/refill_station_process/on_run(obj/machinery/atmospherics/refill_station/refill_station)
+ // Refill the holding tank
+ if(!refill_station.on)
+ return
+ if(!refill_station.holding_tank)
+ return
+ var/datum/gas_mixture/holding_environment
+ holding_environment = refill_station.holding_tank.air_contents
+
+ var/pressure_delta = refill_station.target_pressure - holding_environment.return_pressure()
+ // Can not have a pressure delta that would cause environment pressure > tank pressure
+
+ var/transfer_moles = 0
+ transfer_moles = pressure_delta * holding_environment.volume / (refill_station.air_contents.temperature() * R_IDEAL_GAS_EQUATION)
+ // Make it take some time. Max half a mole per cycle.
+ transfer_moles = min(transfer_moles, 0.5)
+ // Actually transfer the gas
+ var/datum/gas_mixture/removed = refill_station.air_contents.remove(transfer_moles)
+ holding_environment.merge(removed)
+ refill_station.update_icon(UPDATE_OVERLAYS)
+
+/obj/machinery/atmospherics/refill_station/oxygen
+ name = "oxygen refill station"
+
+/obj/machinery/atmospherics/refill_station/oxygen/Initialize(mapload)
+ . = ..()
+ air_contents.set_oxygen(maximum_pressure * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature()))
+
+/obj/machinery/atmospherics/refill_station/nitrogen
+ name = "nitrogen refill station"
+ icon_state = "filler_nitro"
+ refill_type = "nitrogen"
+
+/obj/machinery/atmospherics/refill_station/nitrogen/Initialize(mapload)
+ . = ..()
+ air_contents.set_nitrogen(maximum_pressure * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature()))
+
+/obj/machinery/atmospherics/refill_station/nitrogen/update_overlays()
+ overlays.Cut()
+ if(holding_tank)
+ overlays += "tank_nitro"
+ var/pressure = holding_tank.air_contents.return_pressure()
+ if(stat & (NOPOWER|BROKEN))
+ return
+ if(pressure < 1000)
+ overlays += "filling_nitro"
+ else
+ overlays += "filled_nitro"
+
+/obj/machinery/atmospherics/refill_station/plasma
+ name = "plasma refill station"
+ icon_state = "filler_plasma"
+ refill_type = "plasma"
+ /// What types of tanks can the plasma refill station accept?
+ var/list/accepted_types = list(/obj/item/tank/internals/emergency_oxygen/plasma, /obj/item/tank/internals/plasmaman, /obj/item/tank/internals/plasmaman/belt)
+
+/obj/machinery/atmospherics/refill_station/plasma/Initialize(mapload)
+ . = ..()
+ air_contents.set_toxins(maximum_pressure * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature()))
+ accepted_types = typecacheof(accepted_types)
+
+/obj/machinery/atmospherics/refill_station/plasma/update_overlays()
+ overlays.Cut()
+ if(holding_tank)
+ overlays += "tank_plasma"
+ var/pressure = holding_tank.air_contents.return_pressure()
+ if(stat & (NOPOWER|BROKEN))
+ return
+ if(pressure < 1000)
+ overlays += "filling_plasma"
+ else
+ overlays += "filled_plasma"
+
+/obj/machinery/atmospherics/refill_station/plasma/item_interaction(mob/living/user, obj/item/used, list/modifiers)
+ if(istype(used, /obj/item/analyzer))
+ return ..()
+ if(!is_type_in_typecache(used, accepted_types))
+ to_chat(user, "[used] does not fit in [src]'s tank slot.")
+ return ITEM_INTERACT_COMPLETE
+ if(!(stat & BROKEN))
+ if(used.flags & NODROP || !user.transfer_item_to(used, src))
+ to_chat(user, "[used] is stuck to your hand!")
+ return ITEM_INTERACT_COMPLETE
+ var/obj/item/tank/new_tank = used
+ to_chat(user, "[holding_tank ? "In one smooth motion you pop [holding_tank] out of [src]'s connector and replace it with [new_tank]" : "You insert [new_tank] into [src]"].")
+ investigate_log("[key_name(user)] started a transfer into [new_tank] at [src].
", "atmos")
+ if(holding_tank)
+ replace_tank(user, new_tank)
+ else
+ holding_tank = new_tank
+ if(!(stat & NOPOWER))
+ on = TRUE
+ change_power_mode(ACTIVE_POWER_USE)
+ update_icon(UPDATE_OVERLAYS)
+ return ITEM_INTERACT_COMPLETE
+
+#undef MAX_TARGET_PRESSURE
diff --git a/icons/obj/atmos.dmi b/icons/obj/atmos.dmi
index 74769e2dae3..352513a83ff 100644
Binary files a/icons/obj/atmos.dmi and b/icons/obj/atmos.dmi differ
diff --git a/paradise.dme b/paradise.dme
index 76cacca60a8..dd76a699cd5 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -1738,6 +1738,7 @@
#include "code\modules\atmospherics\machinery\components\unary_devices\vent_scrubber.dm"
#include "code\modules\atmospherics\machinery\other\area_atmos_computer.dm"
#include "code\modules\atmospherics\machinery\other\meter.dm"
+#include "code\modules\atmospherics\machinery\other\refill_station.dm"
#include "code\modules\atmospherics\machinery\pipes\cap.dm"
#include "code\modules\atmospherics\machinery\pipes\manifold.dm"
#include "code\modules\atmospherics\machinery\pipes\manifold4w.dm"