diff --git a/html/changelogs/furrycactus - map changes v3.yml b/html/changelogs/furrycactus - map changes v3.yml
new file mode 100644
index 00000000000..e6966d3e44f
--- /dev/null
+++ b/html/changelogs/furrycactus - map changes v3.yml
@@ -0,0 +1,44 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+# balance
+# admin
+# backend
+# security
+# refactor
+#################################
+
+# Your name.
+author: Furrycactus
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - maptweak: "Tidied up some pipes and wires around the station, added disposals to some more places lacking them."
+ - maptweak: "Added a backup SMES to the engineering sublevel, can be charged over the shift like a backup battery."
+ - maptweak: "Engineering sublevel now has a proper hallway, instead of a weird maintenance section just outside the elevator."
+
diff --git a/maps/_common/areas/station/engineering.dm b/maps/_common/areas/station/engineering.dm
index 6abe69a4ac2..3a513784424 100644
--- a/maps/_common/areas/station/engineering.dm
+++ b/maps/_common/areas/station/engineering.dm
@@ -96,3 +96,8 @@
/area/engineering/gravity_gen
name = "\improper Engineering - Gravity Generator"
icon_state = "engine"
+
+/area/engineering/backup_SMES
+ name = "\improper Engineering - Backup Power Storage"
+ icon_state = "substation"
+ sound_env = SMALL_ENCLOSED
diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm
index 1be77b55c5d..557c03a5a9c 100644
--- a/maps/aurora/aurora-3_sublevel.dmm
+++ b/maps/aurora/aurora-3_sublevel.dmm
@@ -2837,6 +2837,13 @@
"agu" = (
/obj/machinery/vending/cigarette,
/obj/effect/floor_decal/corner/white/diagonal,
+/obj/machinery/ringer{
+ department = "Engineering";
+ id = "engie_ringer";
+ pixel_x = 30;
+ pixel_y = 0;
+ req_access = list(10)
+ },
/turf/simulated/floor/tiled,
/area/outpost/engineering/meeting)
"agv" = (
@@ -3564,9 +3571,6 @@
/turf/simulated/floor/plating,
/area/outpost/engineering/power)
"ahU" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 4
- },
/obj/machinery/door/airlock/external{
frequency = 1379;
icon_state = "door_locked";
@@ -3576,32 +3580,24 @@
name = "Engineering Sub-Level EVA";
req_access = list(10,13)
},
-/turf/simulated/floor{
- icon_state = "plating"
- },
+/turf/simulated/floor/tiled,
/area/outpost/engineering/hallway)
"ahV" = (
-/obj/machinery/light/small/emergency{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 4
- },
/obj/machinery/airlock_sensor{
id_tag = "eng_sl_eva_sensor";
master_tag = "eng_sl_eva_airlock";
pixel_y = 26
},
-/turf/simulated/floor{
- icon_state = "plating"
- },
-/area/outpost/engineering/hallway)
-"ahW" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
- dir = 8;
+ dir = 2;
frequency = 1379;
id_tag = "eng_sl_eva_pump"
},
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/tiled,
+/area/outpost/engineering/hallway)
+"ahW" = (
/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
frequency = 1379;
id_tag = "eng_sl_eva_airlock";
@@ -3613,9 +3609,17 @@
tag_exterior_door = "eng_sl_eva_outer";
tag_interior_door = "eng_sl_eva_inner"
},
-/turf/simulated/floor{
- icon_state = "plating"
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+ dir = 2;
+ frequency = 1379;
+ id_tag = "eng_sl_eva_pump"
},
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/emergency{
+ dir = 1
+ },
+/turf/simulated/floor/tiled,
/area/outpost/engineering/hallway)
"ahX" = (
/obj/machinery/door/airlock/external{
@@ -3627,9 +3631,7 @@
name = "Engineering Sub-Level EVA";
req_access = list(10,13)
},
-/turf/simulated/floor{
- icon_state = "plating"
- },
+/turf/simulated/floor/tiled,
/area/outpost/engineering/hallway)
"ahY" = (
/turf/simulated/floor/plating,
@@ -3830,19 +3832,17 @@
/turf/simulated/floor/plating,
/area/outpost/engineering/power)
"aiv" = (
-/obj/machinery/atmospherics/unary/vent_pump/high_volume{
- dir = 8;
- frequency = 1379;
- id_tag = "eng_sl_eva_pump"
- },
-/turf/simulated/floor{
- icon_state = "plating"
- },
+/obj/machinery/atmospherics/pipe/manifold4w/hidden,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/tiled,
/area/outpost/engineering/hallway)
"aiw" = (
-/turf/simulated/floor{
- icon_state = "plating"
+/obj/machinery/atmospherics/pipe/manifold/hidden{
+ dir = 4;
+ icon_state = "map"
},
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/tiled,
/area/outpost/engineering/hallway)
"aix" = (
/obj/machinery/atmospherics/pipe/zpipe/up/cyan{
@@ -3891,6 +3891,7 @@
icon_state = "tube1";
dir = 2
},
+/obj/effect/floor_decal/corner/blue,
/turf/simulated/floor/tiled,
/area/engineering/atmos)
"aiC" = (
@@ -3901,6 +3902,10 @@
/obj/effect/floor_decal/corner/blue{
dir = 10
},
+/obj/effect/floor_decal/corner/yellow{
+ icon_state = "corner_white";
+ dir = 8
+ },
/turf/simulated/floor/tiled,
/area/engineering/atmos)
"aiD" = (
@@ -3912,6 +3917,10 @@
dir = 4;
icon_state = "intact"
},
+/obj/effect/floor_decal/corner/yellow{
+ icon_state = "corner_white";
+ dir = 8
+ },
/turf/simulated/floor/tiled,
/area/engineering/atmos)
"aiE" = (
@@ -3922,16 +3931,21 @@
icon_state = "map";
dir = 1
},
+/obj/effect/floor_decal/corner/yellow{
+ icon_state = "corner_white";
+ dir = 8
+ },
/turf/simulated/floor/tiled,
/area/engineering/atmos)
"aiF" = (
-/obj/effect/floor_decal/corner/blue{
- dir = 10
- },
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
icon_state = "intact";
dir = 9
},
+/obj/effect/floor_decal/corner/yellow{
+ icon_state = "corner_white";
+ dir = 8
+ },
/turf/simulated/floor/tiled,
/area/engineering/atmos)
"aiG" = (
@@ -4291,7 +4305,10 @@
/turf/simulated/floor/plating,
/area/outpost/engineering/power)
"ajr" = (
-/obj/machinery/atmospherics/pipe/manifold4w/hidden,
+/obj/machinery/atmospherics/pipe/manifold/hidden{
+ dir = 4;
+ icon_state = "map"
+ },
/turf/simulated/floor/tiled,
/area/outpost/engineering/hallway)
"ajs" = (
@@ -4430,6 +4447,11 @@
/obj/machinery/atmospherics/pipe/zpipe/up/red{
dir = 4
},
+/obj/machinery/alarm{
+ dir = 4;
+ icon_state = "alarm0";
+ pixel_x = -22
+ },
/turf/simulated/floor/plating,
/area/engineering/atmos)
"ajI" = (
@@ -4790,52 +4812,60 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
+/obj/machinery/light{
+ icon_state = "tube1";
+ dir = 8
+ },
/turf/simulated/floor/tiled,
/area/outpost/engineering/hallway)
"akv" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable{
d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- pixel_y = 0
+ d2 = 4;
+ icon_state = "1-4"
},
-/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/turf/simulated/floor/tiled,
/area/outpost/engineering/hallway)
"akw" = (
-/obj/machinery/light{
- dir = 4;
- icon_state = "tube1"
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ pixel_x = 0
+ },
+/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/tiled,
/area/outpost/engineering/hallway)
"akx" = (
/turf/simulated/wall/r_wall,
/area/maintenance/engsublevel)
-"aky" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/plating,
-/area/engineering/atmos)
"akz" = (
/obj/structure/window/reinforced,
/turf/simulated/floor/plating,
/area/engineering/atmos)
-"akA" = (
-/obj/structure/stairs/east,
-/obj/structure/window/reinforced,
-/turf/simulated/floor/plating,
-/area/engineering/atmos)
"akB" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/sign/securearea{
pixel_x = 32
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled,
/area/engineering/atmos)
"akC" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -4883,15 +4913,6 @@
/turf/simulated/floor/plating,
/area/outpost/engineering/power)
"akI" = (
-/obj/machinery/access_button{
- command = "cycle_interior";
- frequency = 1379;
- master_tag = "eng_sl_eva_airlock";
- name = "interior access button";
- pixel_x = 26;
- pixel_y = 8;
- req_access = list(10,13)
- },
/obj/machinery/atmospherics/binary/pump{
dir = 1;
name = "gas pump";
@@ -4920,6 +4941,15 @@
icon_state = "warning";
dir = 10
},
+/obj/machinery/access_button{
+ command = "cycle_interior";
+ frequency = 1379;
+ master_tag = "eng_sl_eva_airlock";
+ name = "interior access button";
+ pixel_x = 26;
+ pixel_y = 8;
+ req_access = list(10,13)
+ },
/turf/simulated/floor{
icon_state = "plating"
},
@@ -4986,128 +5016,36 @@
/obj/machinery/firealarm/south,
/turf/simulated/floor/tiled,
/area/outpost/engineering/hallway)
-"akS" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
-/turf/simulated/floor/tiled,
-/area/outpost/engineering/hallway)
-"akT" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- pixel_x = 0
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/effect/floor_decal/corner/yellow/full{
- icon_state = "corner_white_full";
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/tiled,
-/area/outpost/engineering/hallway)
-"akU" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- pixel_x = 0
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_engineering{
- name = "Engineering Sublevel";
- req_access = null;
- req_one_access = list(11,24)
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/tiled,
-/area/outpost/engineering/hallway)
-"akV" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- pixel_x = 0
- },
-/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/plating,
-/area/maintenance/engsublevel)
-"akW" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- pixel_x = 0
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/light/small/emergency{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/maintenance/engsublevel)
"akX" = (
/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1
+ icon_state = "map-scrubbers";
+ dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
+ dir = 8
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/engsublevel)
+/turf/simulated/floor/tiled,
+/area/outpost/engineering/hallway)
"akY" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/yellow{
+ icon_state = "corner_white";
+ dir = 6
+ },
+/turf/simulated/floor/tiled,
+/area/outpost/engineering/hallway)
+"akZ" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/glass_atmos{
name = "Atmospherics";
@@ -5119,14 +5057,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plating,
-/area/maintenance/engsublevel)
-"akZ" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled,
/area/engineering/atmos)
"ala" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -5135,19 +5066,16 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled,
/area/engineering/atmos)
"alb" = (
-/obj/machinery/alarm{
- pixel_y = 22
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled,
/area/engineering/atmos)
"alc" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -5158,7 +5086,12 @@
icon_state = "intact-scrubbers";
dir = 9
},
-/turf/simulated/floor/plating,
+/obj/machinery/camera/network/engineering_outpost{
+ c_tag = "Engineering Sublevel - Atmospherics Access";
+ dir = 8;
+ icon_state = "camera"
+ },
+/turf/simulated/floor/tiled,
/area/engineering/atmos)
"ald" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -5191,18 +5124,6 @@
/turf/simulated/floor/plating,
/area/outpost/engineering/power)
"alh" = (
-/obj/machinery/camera/network/engineering_outpost{
- c_tag = "Engineering Sublevel - Corridor Camera 4";
- dir = 8;
- icon_state = "camera"
- },
-/obj/machinery/ringer{
- department = "Engineering";
- id = "engie_ringer";
- pixel_x = 30;
- pixel_y = 0;
- req_access = list(10)
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
@@ -5298,8 +5219,19 @@
},
/area/engineering/gravity_gen)
"alu" = (
-/turf/simulated/floor/plating,
-/area/maintenance/engsublevel)
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled,
+/area/outpost/engineering/hallway)
"alv" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -5311,47 +5243,36 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/engsublevel)
-"alw" = (
-/obj/machinery/door/firedoor,
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/window/reinforced{
- icon_state = "rwindow";
- dir = 8
- },
-/obj/structure/window/reinforced{
- icon_state = "rwindow";
- dir = 1
- },
-/turf/simulated/floor/plating,
-/area/maintenance/engsublevel)
"alx" = (
/obj/machinery/firealarm/south,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/yellow/full,
+/obj/effect/floor_decal/corner/blue{
+ icon_state = "corner_white";
+ dir = 8
+ },
+/turf/simulated/floor/tiled,
/area/engineering/atmos)
"aly" = (
-/obj/machinery/camera/network/engineering_outpost{
- c_tag = "Engineering Sublevel - Atmospherics Access";
- dir = 1;
- icon_state = "camera"
- },
-/turf/simulated/floor/plating,
-/area/engineering/atmos)
-"alz" = (
-/obj/machinery/light/small/emergency,
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled,
+/area/engineering/atmos)
+"alz" = (
+/obj/machinery/light{
+ icon_state = "tube1";
+ dir = 2
+ },
+/turf/simulated/floor/tiled,
/area/engineering/atmos)
"alA" = (
/obj/structure/sign/nosmoking_2{
pixel_y = -32
},
-/turf/simulated/floor/plating,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 1
+ },
+/turf/simulated/floor/tiled,
/area/engineering/atmos)
"alB" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -5430,19 +5351,19 @@
},
/area/turbolift/engineering_maintenance)
"alK" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/sign/securearea{
- pixel_x = 32
- },
/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plating,
-/area/maintenance/engsublevel)
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ icon_state = "map-scrubbers";
+ dir = 8
+ },
+/turf/simulated/floor/tiled,
+/area/outpost/engineering/hallway)
"alL" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -5540,21 +5461,6 @@
icon_state = "plating"
},
/area/turbolift/engineering_maintenance)
-"alX" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/light/small/emergency{
- icon_state = "bulb1";
- dir = 4
- },
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plating,
-/area/maintenance/engsublevel)
"alY" = (
/turf/simulated/wall/r_wall,
/area/turret_protected/ai)
@@ -5761,23 +5667,7 @@
},
/turf/simulated/open,
/area/mine/unexplored)
-"amm" = (
-/obj/machinery/light/small/emergency,
-/turf/simulated/floor/plating,
-/area/maintenance/engsublevel)
-"amn" = (
-/obj/structure/sign/nosmoking_2{
- pixel_y = -32
- },
-/turf/simulated/floor/plating,
-/area/maintenance/engsublevel)
"amo" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
/obj/structure/cable{
d1 = 1;
d2 = 4;
@@ -5787,30 +5677,15 @@
dir = 1;
icon_state = "pipe-c"
},
-/turf/simulated/floor/plating,
-/area/maintenance/engsublevel)
-"amp" = (
-/obj/machinery/door/airlock/maintenance{
- req_one_access = list(11,24)
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/structure/cable{
d1 = 4;
d2 = 8;
- icon_state = "4-8";
- pixel_x = 0
+ icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/maintenance/engsublevel)
+/turf/simulated/floor/tiled,
+/area/outpost/engineering/hallway)
"amq" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -13982,17 +13857,15 @@
/area/medical/patient_wing)
"aAY" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/light/small/emergency{
- icon_state = "bulb1";
- dir = 4
- },
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
/turf/simulated/floor/plating,
/area/maintenance/medsublevel)
"aAZ" = (
@@ -18323,9 +18196,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -18336,6 +18206,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
/turf/simulated/floor/plating,
/area/maintenance/scisublevel)
"aJP" = (
@@ -18344,16 +18217,16 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
/obj/machinery/light/small/emergency,
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/visible/universal{
+ dir = 4
+ },
+/obj/machinery/meter{
+ name = "Air supply"
+ },
/turf/simulated/floor/plating,
/area/maintenance/scisublevel)
"aJR" = (
@@ -26145,6 +26018,17 @@
},
/turf/simulated/floor/reinforced/airless,
/area/rnd/mixing)
+"bhR" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled,
+/area/outpost/engineering/hallway)
"bhZ" = (
/mob/living/simple_animal/hostile/bear,
/turf/unsimulated/floor/asteroid/ash/rocky,
@@ -27458,6 +27342,18 @@
icon_state = "asteroidplating"
},
/area/rnd/mixing)
+"bnV" = (
+/obj/machinery/light{
+ dir = 4;
+ icon_state = "tube1"
+ },
+/obj/machinery/alarm{
+ dir = 8;
+ pixel_x = 25;
+ pixel_y = 0
+ },
+/turf/simulated/floor/plating,
+/area/outpost/engineering/power)
"boe" = (
/obj/effect/floor_decal/industrial/warning/dust,
/obj/structure/table/rack,
@@ -27477,6 +27373,21 @@
/obj/structure/bookcase/libraryspawn/religion,
/turf/simulated/floor/carpet,
/area/medical/patient_wing_library)
+"brx" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/obj/machinery/door/airlock/external{
+ frequency = 1379;
+ icon_state = "door_locked";
+ id_tag = "eng_sl_eva_inner";
+ locked = 1;
+ luminosity = 1;
+ name = "Engineering Sub-Level EVA";
+ req_access = list(10,13)
+ },
+/turf/simulated/floor/tiled,
+/area/outpost/engineering/hallway)
"bsd" = (
/obj/effect/decal/cleanable/generic,
/turf/simulated/floor/tiled/dark,
@@ -27697,6 +27608,20 @@
},
/turf/simulated/floor/wood,
/area/medical/patient_c)
+"cqC" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
+/turf/simulated/floor/tiled/dark,
+/area/engineering/backup_SMES)
"cue" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -27726,6 +27651,10 @@
temperature = 278
},
/area/turret_protected/ai)
+"cwx" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled/dark,
+/area/engineering/backup_SMES)
"cyD" = (
/obj/structure/flora/ausbushes/leafybush,
/obj/effect/floor_decal/spline/fancy/wood{
@@ -27771,6 +27700,39 @@
},
/turf/simulated/floor/plating,
/area/rnd/xenoarch_atrium)
+"cOT" = (
+/obj/structure/cable{
+ d2 = 2;
+ icon_state = "0-2";
+ pixel_y = 0
+ },
+/obj/machinery/power/apc{
+ dir = 1;
+ name = "north bump";
+ pixel_x = 0;
+ pixel_y = 24
+ },
+/obj/machinery/light{
+ icon_state = "tube1";
+ dir = 8
+ },
+/turf/simulated/floor/tiled/dark,
+/area/engineering/backup_SMES)
+"cQm" = (
+/obj/machinery/atmospherics/pipe/simple/visible/universal{
+ dir = 4
+ },
+/obj/machinery/meter{
+ name = "Scrubbers"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/scisublevel)
+"cQJ" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
+ },
+/turf/simulated/floor/tiled,
+/area/outpost/engineering/hallway)
"cVf" = (
/obj/effect/floor_decal/corner/red{
icon_state = "corner_white";
@@ -28007,6 +27969,13 @@
/obj/structure/lattice/catwalk/indoor,
/turf/simulated/floor/plating,
/area/rnd/xenoarch_atrium)
+"dnb" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ icon_state = "map_scrubber_on";
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark,
+/area/engineering/backup_SMES)
"dpL" = (
/obj/structure/table/rack,
/obj/item/weapon/pickaxe{
@@ -28253,6 +28222,32 @@
icon_state = "asteroidplating"
},
/area/mine/unexplored)
+"dSV" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/engineering{
+ name = "Backup Power Storage";
+ req_one_access = list(11,24)
+ },
+/turf/simulated/floor/tiled/dark,
+/area/engineering/backup_SMES)
+"dTr" = (
+/obj/effect/floor_decal/corner/yellow/full{
+ icon_state = "corner_white_full";
+ dir = 4
+ },
+/turf/simulated/floor/tiled,
+/area/outpost/engineering/hallway)
"dUv" = (
/obj/structure/disposaloutlet,
/obj/structure/disposalpipe/trunk{
@@ -28357,6 +28352,12 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/patient_wing_post1)
+"dZs" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark,
+/area/engineering/backup_SMES)
"ebn" = (
/turf/simulated/floor/airless{
icon_state = "asteroidplating"
@@ -28466,6 +28467,14 @@
"exv" = (
/turf/simulated/wall,
/area/medical/patient_c)
+"eAq" = (
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/turf/simulated/floor/tiled/dark,
+/area/engineering/backup_SMES)
"eBJ" = (
/obj/machinery/atmospherics/pipe/manifold/visible,
/obj/effect/floor_decal/corner/green{
@@ -28815,6 +28824,19 @@
},
/turf/simulated/floor/plating,
/area/rnd/mixing)
+"fIm" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/tiled,
+/area/outpost/engineering/hallway)
"fOV" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -29074,6 +29096,14 @@
},
/turf/simulated/floor/tiled/white,
/area/rnd/test_range)
+"grD" = (
+/obj/effect/floor_decal/corner/yellow/full{
+ icon_state = "corner_white_full";
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/blue,
+/turf/simulated/floor/tiled,
+/area/engineering/atmos)
"gsG" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -29185,6 +29215,9 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/quarantine)
+"gHk" = (
+/turf/simulated/floor/tiled/dark,
+/area/engineering/backup_SMES)
"gHy" = (
/obj/machinery/door/firedoor{
dir = 2
@@ -29314,6 +29347,20 @@
},
/turf/simulated/floor/plating,
/area/rnd/xenobiology/xenoflora)
+"hoE" = (
+/obj/machinery/alarm{
+ pixel_y = 22
+ },
+/obj/effect/floor_decal/corner/blue{
+ icon_state = "corner_white";
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/yellow{
+ icon_state = "corner_white";
+ dir = 1
+ },
+/turf/simulated/floor/tiled,
+/area/engineering/atmos)
"hpx" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -29334,6 +29381,19 @@
/obj/item/device/flashlight/lamp,
/turf/simulated/floor/tiled/dark,
/area/rnd/xenoarch_atrium)
+"hrG" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/medsublevel)
"hwN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -29395,6 +29455,14 @@
temperature = 278
},
/area/medical/quarantineautopsy)
+"hGX" = (
+/obj/machinery/camera/network/engineering_outpost{
+ c_tag = "Engineering Sublevel - Corridor Camera 4";
+ dir = 2;
+ icon_state = "camera"
+ },
+/turf/simulated/floor/tiled,
+/area/outpost/engineering/hallway)
"hHy" = (
/obj/structure/table/wood,
/turf/simulated/floor/beach/sand,
@@ -29592,6 +29660,11 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/patient_wing_gym)
+"igE" = (
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/power/port_gen/pacman,
+/turf/simulated/floor/tiled/dark,
+/area/engineering/backup_SMES)
"ipg" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/hologram/holopad,
@@ -29753,6 +29826,18 @@
temperature = 278
},
/area/medical/quarantineautopsy)
+"iZk" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled,
+/area/outpost/engineering/hallway)
"jbg" = (
/obj/structure/table/rack,
/obj/item/stack/rods{
@@ -29993,6 +30078,11 @@
},
/turf/simulated/floor/plating,
/area/maintenance/scisublevel)
+"jAt" = (
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/computer/station_alert,
+/turf/simulated/floor/tiled/dark,
+/area/engineering/backup_SMES)
"jBb" = (
/obj/machinery/firealarm/north,
/turf/simulated/floor/carpet,
@@ -30021,6 +30111,19 @@
},
/turf/simulated/floor/tiled/white,
/area/rnd/xenobiology/xenoflora_hazard)
+"jKb" = (
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/closet/crate,
+/obj/item/weapon/circuitboard/smes,
+/obj/item/weapon/circuitboard/smes,
+/obj/item/weapon/smes_coil,
+/obj/item/weapon/smes_coil,
+/obj/item/weapon/smes_coil/super_capacity,
+/obj/item/weapon/smes_coil/super_capacity,
+/obj/item/weapon/smes_coil/super_io,
+/obj/item/weapon/smes_coil/super_io,
+/turf/simulated/floor/tiled/dark,
+/area/engineering/backup_SMES)
"jMg" = (
/obj/structure/table/standard,
/obj/machinery/computer/med_data/laptop,
@@ -30134,6 +30237,16 @@
/obj/machinery/light,
/turf/simulated/floor/tiled/dark,
/area/rnd/test_range)
+"kaD" = (
+/obj/machinery/ringer{
+ department = "Engineering";
+ id = "engie_ringer";
+ pixel_x = 30;
+ pixel_y = 0;
+ req_access = list(10)
+ },
+/turf/simulated/floor/tiled,
+/area/engineering/atmos)
"kbk" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/glass_research{
@@ -30367,6 +30480,15 @@
},
/turf/simulated/floor/tiled/white,
/area/rnd/isolation_b)
+"lbY" = (
+/obj/structure/sign/securearea{
+ desc = "A warning sign which reads 'HIGH VOLTAGE'";
+ icon_state = "shock";
+ name = "HIGH VOLTAGE";
+ pixel_y = 0
+ },
+/turf/simulated/wall/r_wall,
+/area/outpost/engineering/power)
"lcj" = (
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -30400,6 +30522,20 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/virologytesting)
+"lhL" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark,
+/area/engineering/backup_SMES)
"ljj" = (
/obj/machinery/artifact_scanpad,
/obj/effect/floor_decal/spline/plain{
@@ -30453,6 +30589,16 @@
},
/turf/simulated/floor/tiled,
/area/outpost/engineering/meeting)
+"lsl" = (
+/obj/structure/cable{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/obj/effect/floor_decal/industrial/outline/yellow,
+/turf/simulated/floor{
+ icon_state = "plating"
+ },
+/area/engineering/backup_SMES)
"ltb" = (
/obj/structure/table/wood,
/obj/item/weapon/deck/cards,
@@ -30652,6 +30798,10 @@
/obj/item/weapon/reagent_containers/glass/bucket,
/turf/simulated/floor/tiled/dark,
/area/rnd/xenobiology/xenoflora)
+"mlz" = (
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/tiled,
+/area/outpost/engineering/hallway)
"mmQ" = (
/obj/effect/floor_decal/corner/white/diagonal,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -30774,6 +30924,14 @@
},
/turf/simulated/floor/plating,
/area/medical/virologytesting)
+"mCk" = (
+/obj/machinery/alarm{
+ dir = 4;
+ icon_state = "alarm0";
+ pixel_x = -22
+ },
+/turf/simulated/floor/tiled,
+/area/outpost/engineering/hallway)
"mDh" = (
/obj/structure/window/reinforced{
dir = 1
@@ -31134,6 +31292,15 @@
},
/turf/simulated/floor/tiled/dark,
/area/rnd/xenobiology/xenoflora)
+"nzN" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
+ },
+/turf/simulated/floor/tiled,
+/area/engineering/atmos)
"nzR" = (
/turf/simulated/wall/r_wall,
/area/medical/patient_wing_hallway)
@@ -31205,6 +31372,14 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/patient_wing_post1)
+"nBU" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/tiled/dark,
+/area/engineering/backup_SMES)
"nCa" = (
/obj/structure/cable/green{
d1 = 4;
@@ -31566,6 +31741,12 @@
},
/turf/simulated/floor/grass,
/area/medical/patient_wing_picnic)
+"oIX" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/scisublevel)
"oLA" = (
/obj/machinery/door/firedoor,
/obj/structure/grille,
@@ -31800,6 +31981,17 @@
},
/turf/simulated/floor/plating,
/area/medical/patient_wing_gym)
+"pCR" = (
+/obj/structure/cable{
+ icon_state = "0-4";
+ d2 = 4
+ },
+/obj/machinery/power/terminal{
+ icon_state = "term";
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark,
+/area/engineering/backup_SMES)
"pDN" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -31821,6 +32013,14 @@
/obj/machinery/recharge_station,
/turf/simulated/floor/tiled,
/area/rnd/eva)
+"pFW" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/dark,
+/area/engineering/backup_SMES)
"pHE" = (
/obj/effect/floor_decal/industrial/warning/dust{
icon_state = "warning_dust";
@@ -31875,6 +32075,43 @@
},
/turf/simulated/floor/tiled/white,
/area/rnd/isolation_b)
+"pIl" = (
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
+/turf/simulated/floor/tiled,
+/area/outpost/engineering/hallway)
+"pMT" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ pixel_x = 0
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/tiled,
+/area/outpost/engineering/hallway)
"pPI" = (
/obj/effect/floor_decal/corner/red/full{
icon_state = "corner_white_full";
@@ -31908,6 +32145,12 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/patient_wing_hallway)
+"pRY" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/medsublevel)
"pUK" = (
/obj/effect/floor_decal/corner/red/full{
icon_state = "corner_white_full";
@@ -32037,6 +32280,10 @@
icon_state = "asteroidplating"
},
/area/mine/unexplored)
+"qki" = (
+/obj/effect/floor_decal/corner/yellow/full,
+/turf/simulated/floor/tiled,
+/area/outpost/engineering/hallway)
"qkl" = (
/obj/effect/floor_decal/corner/lime{
icon_state = "corner_white";
@@ -32135,6 +32382,19 @@
/obj/machinery/botany/extractor,
/turf/simulated/floor/tiled/white,
/area/rnd/xenobiology/xenoflora)
+"qEk" = (
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/visible/universal,
+/obj/machinery/meter{
+ name = "Air supply"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/medsublevel)
"qFM" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 4;
@@ -32143,6 +32403,31 @@
},
/turf/simulated/floor/plating,
/area/maintenance/scisublevel)
+"qGf" = (
+/obj/machinery/camera/network/engineering_outpost{
+ c_tag = "Engineering Sublevel - Corridor Camera 5";
+ dir = 1;
+ icon_state = "camera"
+ },
+/turf/simulated/floor/tiled,
+/area/outpost/engineering/hallway)
+"qId" = (
+/obj/machinery/door/firedoor,
+/obj/structure/grille,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/window/reinforced{
+ icon_state = "rwindow";
+ dir = 8
+ },
+/obj/structure/window/reinforced{
+ icon_state = "rwindow";
+ dir = 1
+ },
+/turf/simulated/floor/plating,
+/area/engineering/atmos)
"qLE" = (
/obj/effect/floor_decal/corner/white/diagonal,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -32157,6 +32442,16 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/patient_wing_gym)
+"qMQ" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+ dir = 1;
+ frequency = 1379;
+ id_tag = "eng_sl_eva_pump"
+ },
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/tiled,
+/area/outpost/engineering/hallway)
"qNw" = (
/obj/structure/closet/excavation,
/obj/effect/floor_decal/industrial/outline/yellow,
@@ -32252,6 +32547,28 @@
icon_state = "asteroidplating"
},
/area/mine/unexplored)
+"qWW" = (
+/obj/machinery/door/airlock/maintenance{
+ req_one_access = list(11,24)
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ pixel_x = 0
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/outpost/engineering/hallway)
"qXm" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
@@ -32279,6 +32596,15 @@
"qZD" = (
/turf/simulated/wall,
/area/maintenance/substation/research_sublevel)
+"qZV" = (
+/obj/structure/sign/securearea{
+ desc = "A warning sign which reads 'HIGH VOLTAGE'";
+ icon_state = "shock";
+ name = "HIGH VOLTAGE";
+ pixel_y = 0
+ },
+/turf/simulated/wall/r_wall,
+/area/engineering/backup_SMES)
"rfa" = (
/turf/simulated/wall,
/area/maintenance/scisublevel)
@@ -32327,6 +32653,24 @@
},
/turf/simulated/floor/plating,
/area/maintenance/scisublevel)
+"rpT" = (
+/obj/structure/sign/securearea{
+ pixel_x = 0
+ },
+/turf/simulated/wall/r_wall,
+/area/engineering/backup_SMES)
+"rrO" = (
+/obj/machinery/light{
+ icon_state = "tube1";
+ dir = 8
+ },
+/obj/machinery/alarm{
+ dir = 1;
+ icon_state = "alarm0";
+ pixel_y = -22
+ },
+/turf/simulated/floor/tiled/dark,
+/area/engineering/backup_SMES)
"rst" = (
/obj/structure/window/reinforced{
icon_state = "rwindow";
@@ -32624,6 +32968,29 @@
icon_state = "asteroidplating"
},
/area/mine/unexplored)
+"smA" = (
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+ dir = 1;
+ frequency = 1379;
+ id_tag = "eng_sl_eva_pump"
+ },
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/emergency,
+/turf/simulated/floor/tiled,
+/area/outpost/engineering/hallway)
+"soJ" = (
+/obj/structure/table/reinforced,
+/obj/item/stack/cable_coil,
+/obj/item/stack/cable_coil{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/device/multitool{
+ pixel_x = 5
+ },
+/turf/simulated/floor/tiled/dark,
+/area/engineering/backup_SMES)
"sph" = (
/obj/machinery/door/firedoor,
/obj/effect/floor_decal/corner/mauve{
@@ -32753,6 +33120,17 @@
/obj/effect/floor_decal/corner/pink/full,
/turf/simulated/floor/tiled/white,
/area/medical/virologytesting)
+"sRe" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
+ },
+/obj/machinery/alarm{
+ dir = 1;
+ icon_state = "alarm0";
+ pixel_y = -22
+ },
+/turf/simulated/floor/tiled,
+/area/outpost/engineering/hallway)
"sRQ" = (
/obj/effect/floor_decal/industrial/warning{
icon_state = "warning";
@@ -32813,6 +33191,23 @@
},
/turf/simulated/floor/tiled/white,
/area/rnd/xenoarch_atrium)
+"tbs" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ icon_state = "0-4";
+ d2 = 4
+ },
+/turf/simulated/floor/tiled/dark,
+/area/engineering/backup_SMES)
"tbu" = (
/obj/machinery/door/firedoor,
/obj/structure/grille,
@@ -32957,6 +33352,32 @@
/obj/item/target,
/turf/simulated/floor/tiled/dark,
/area/rnd/test_range)
+"tsX" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled,
+/area/outpost/engineering/hallway)
+"ttx" = (
+/obj/machinery/light/small/emergency{
+ icon_state = "bulb1";
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/visible/universal,
+/obj/machinery/meter{
+ name = "Scrubbers"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/medsublevel)
"ttF" = (
/obj/machinery/power/emitter{
anchored = 1;
@@ -32970,12 +33391,29 @@
/obj/structure/lattice/catwalk/indoor,
/turf/simulated/floor/plating,
/area/rnd/xenoarch_atrium)
+"tvF" = (
+/obj/structure/table/reinforced,
+/obj/item/clothing/gloves/yellow,
+/obj/item/clothing/gloves/yellow,
+/obj/item/stack/cable_coil,
+/obj/item/stack/cable_coil{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/turf/simulated/floor/tiled/dark,
+/area/engineering/backup_SMES)
"twe" = (
/obj/machinery/light/small/emergency{
dir = 8
},
/turf/unsimulated/floor/asteroid/ash/rocky,
/area/mine/unexplored)
+"tyC" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/medsublevel)
"tzO" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 4;
@@ -33028,6 +33466,19 @@
},
/turf/simulated/floor/plating,
/area/outpost/engineering/power)
+"tLV" = (
+/obj/machinery/ringer{
+ department = "Engineering";
+ id = "engie_ringer";
+ pixel_x = 30;
+ pixel_y = 0;
+ req_access = list(10)
+ },
+/obj/structure/sign/securearea{
+ pixel_x = 32
+ },
+/turf/simulated/floor/tiled,
+/area/outpost/engineering/hallway)
"tLW" = (
/obj/machinery/alarm{
dir = 8;
@@ -33120,6 +33571,19 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/patient_wing_post1)
+"tSs" = (
+/obj/effect/floor_decal/corner/yellow/full{
+ icon_state = "corner_white_full";
+ dir = 1
+ },
+/turf/simulated/floor/tiled,
+/area/outpost/engineering/hallway)
+"tTG" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/tiled/dark,
+/area/engineering/backup_SMES)
"tTI" = (
/obj/structure/window/reinforced{
dir = 8
@@ -33355,6 +33819,9 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/quarantine)
+"uwP" = (
+/turf/simulated/wall/r_wall,
+/area/engineering/backup_SMES)
"uxH" = (
/obj/structure/window/reinforced{
dir = 8
@@ -33432,18 +33899,12 @@
},
/turf/simulated/floor/wood,
/area/medical/patient_wing_library)
-"uFm" = (
-/obj/machinery/light{
- dir = 4;
- icon_state = "tube1"
- },
-/obj/machinery/alarm{
- dir = 8;
- pixel_x = 25;
- pixel_y = 0
+"uEu" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
},
/turf/simulated/floor/plating,
-/area/outpost/engineering/power)
+/area/maintenance/scisublevel)
"uGd" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -33504,6 +33965,11 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/patient_wing_library)
+"uPd" = (
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/field_generator,
+/turf/simulated/floor/plating,
+/area/outpost/engineering/power)
"uQx" = (
/obj/machinery/portable_atmospherics/hydroponics,
/obj/effect/floor_decal/corner/red/full{
@@ -33604,6 +34070,18 @@
/obj/machinery/atmospherics/pipe/simple/visible/yellow,
/turf/simulated/floor/tiled,
/area/rnd/xenoarch_atrium)
+"vaz" = (
+/obj/structure/sign/securearea{
+ desc = "A warning sign which reads 'RADIOACTIVE AREA'";
+ icon_state = "radiation";
+ name = "RADIOACTIVE AREA";
+ pixel_x = 32;
+ pixel_y = -32
+ },
+/turf/simulated/floor{
+ icon_state = "plating"
+ },
+/area/engineering/gravity_gen)
"vdr" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
@@ -33693,6 +34171,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled,
/area/rnd/eva)
+"vqy" = (
+/obj/structure/window/reinforced,
+/obj/structure/stairs/west,
+/turf/simulated/floor/plating,
+/area/engineering/atmos)
"vrd" = (
/obj/structure/cable/green{
d1 = 4;
@@ -33776,6 +34259,30 @@
},
/turf/simulated/floor/tiled/white,
/area/outpost/research/hallway)
+"vEg" = (
+/obj/structure/cable{
+ icon_state = "0-4";
+ d2 = 4
+ },
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/machinery/power/smes/buildable{
+ charge = 0;
+ cur_coils = 4;
+ input_attempt = 0;
+ input_level = 500000;
+ output_attempt = 0;
+ output_level = 500000;
+ RCon_tag = "NO_TAG"
+ },
+/obj/machinery/camera/network/engineering_outpost{
+ c_tag = "Engineering Sublevel - Backup Power Storage";
+ dir = 4;
+ icon_state = "camera"
+ },
+/turf/simulated/floor{
+ icon_state = "plating"
+ },
+/area/engineering/backup_SMES)
"vIg" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/effect/floor_decal/industrial/warning{
@@ -33920,6 +34427,13 @@
},
/turf/simulated/floor/plating,
/area/rnd/xenoarch_atrium)
+"vZr" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ icon_state = "intact-scrubbers";
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark,
+/area/engineering/backup_SMES)
"vZM" = (
/obj/structure/cable/green{
d1 = 4;
@@ -34068,6 +34582,13 @@
/obj/structure/closet/crate,
/turf/simulated/floor/plating,
/area/maintenance/scisublevel)
+"woY" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9;
+ pixel_y = 0
+ },
+/turf/simulated/floor/tiled/dark,
+/area/engineering/backup_SMES)
"wqz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -34107,6 +34628,11 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/virologytesting)
+"wuX" = (
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/item/modular_computer/console/preset/engineering,
+/turf/simulated/floor/tiled/dark,
+/area/engineering/backup_SMES)
"wwk" = (
/obj/structure/cable/green{
d1 = 4;
@@ -34152,6 +34678,12 @@
},
/turf/simulated/floor/plating,
/area/outpost/engineering/power)
+"wBT" = (
+/obj/structure/sign/nosmoking_2{
+ pixel_y = -32
+ },
+/turf/simulated/floor/tiled,
+/area/outpost/engineering/hallway)
"wCp" = (
/obj/structure/cable/green{
d2 = 8;
@@ -34287,6 +34819,16 @@
"wNU" = (
/turf/simulated/floor/tiled/dark,
/area/outpost/research/anomaly_harvest)
+"wNZ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ icon_state = "map-scrubbers";
+ dir = 1
+ },
+/turf/simulated/floor/tiled,
+/area/engineering/atmos)
"wRu" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/white,
@@ -34344,6 +34886,23 @@
},
/turf/simulated/floor/bluegrid,
/area/rnd/isolation_a)
+"xco" = (
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/scisublevel)
"xex" = (
/turf/simulated/wall/r_wall,
/area/maintenance/substation/research_sublevel)
@@ -34496,6 +35055,12 @@
},
/turf/simulated/floor/wood,
/area/medical/patient_c)
+"xrs" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
+/turf/simulated/floor/tiled/dark,
+/area/engineering/backup_SMES)
"xsE" = (
/obj/effect/floor_decal/corner/paleblue{
icon_state = "corner_white";
@@ -34526,6 +35091,19 @@
/obj/structure/table/reinforced/steel,
/turf/simulated/floor/tiled/dark,
/area/outpost/research/anomaly_storage)
+"xvi" = (
+/obj/machinery/ringer{
+ department = "Engineering";
+ id = "engie_ringer";
+ pixel_x = 30;
+ pixel_y = 0;
+ req_access = list(10)
+ },
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
+/turf/simulated/floor/tiled,
+/area/outpost/engineering/hallway)
"xyq" = (
/obj/machinery/power/apc{
dir = 8;
@@ -34806,13 +35384,19 @@
/turf/simulated/floor/wood,
/area/medical/patient_c)
"xXX" = (
-/obj/machinery/alarm{
- dir = 4;
- icon_state = "alarm0";
- pixel_x = -22
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
-/turf/simulated/floor/plating,
-/area/maintenance/engsublevel)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled,
+/area/outpost/engineering/hallway)
"xZp" = (
/obj/effect/floor_decal/spline/plain{
icon_state = "spline_plain";
@@ -43492,7 +44076,7 @@ afc
afH
ace
ace
-ace
+uPd
ace
ace
afH
@@ -44260,7 +44844,7 @@ ace
adO
aex
afd
-ace
+uPd
ace
ace
ahc
@@ -45540,8 +46124,8 @@ aaa
aaa
abJ
ach
-uFm
ace
+bnV
adR
afe
afK
@@ -45797,7 +46381,7 @@ aaa
aaa
abJ
acj
-abJ
+lbY
abJ
jQd
aff
@@ -45813,7 +46397,7 @@ aez
afL
xQw
abJ
-abJ
+lbY
acj
abJ
aaa
@@ -46312,7 +46896,7 @@ aaa
abJ
ach
ace
-abJ
+lbY
acC
afh
afN
@@ -46326,7 +46910,7 @@ abJ
ace
afM
ace
-abJ
+lbY
alM
ach
abJ
@@ -47602,11 +48186,11 @@ abJ
abJ
abJ
abJ
-abJ
+lbY
agJ
ahG
akb
-abJ
+lbY
abJ
abJ
akm
@@ -50701,11 +51285,11 @@ als
als
aiQ
aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+uwP
+uwP
+uwP
+uwP
+uwP
aaa
aaa
aaa
@@ -50957,13 +51541,13 @@ als
alO
alT
aiQ
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+uwP
+uwP
+gHk
+vEg
+pCR
+uwP
+uwP
aaa
aaa
aaa
@@ -51214,14 +51798,14 @@ als
als
alU
aiQ
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+uwP
+cOT
+nBU
+lsl
+pFW
+rrO
+uwP
+uwP
aaa
aaa
aaa
@@ -51471,14 +52055,14 @@ als
als
als
aiQ
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+wuX
+dnb
+eAq
+tbs
+tTG
+dZs
+jKb
+uwP
aaa
aaa
aaa
@@ -51728,14 +52312,14 @@ alH
als
als
aiQ
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+jAt
+xrs
+vZr
+cqC
+cwx
+woY
+igE
+uwP
aaa
aaa
aaa
@@ -51983,16 +52567,16 @@ akQ
alt
alI
als
-als
+vaz
aiQ
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+uwP
+soJ
+gHk
+lhL
+gHk
+tvF
+uwP
+uwP
aaa
aaa
aaa
@@ -52243,12 +52827,12 @@ agQ
agQ
agQ
agQ
-agQ
-akx
-akx
-akx
-aaa
-aaa
+uwP
+qZV
+dSV
+rpT
+uwP
+uwP
aaa
aaa
aaa
@@ -52501,10 +53085,10 @@ alJ
alJ
alZ
agQ
-alu
+ahf
xXX
-akx
-aaa
+qki
+agQ
aaa
aaa
aaa
@@ -52758,10 +53342,10 @@ alV
alJ
alJ
agQ
+ahg
alu
-alu
-akx
-aaa
+sRe
+agQ
aaa
aaa
aaa
@@ -53007,7 +53591,7 @@ aiT
ait
akL
akv
-akS
+ahg
agQ
alJ
alJ
@@ -53015,10 +53599,10 @@ alJ
alJ
alJ
agQ
-alu
-alu
-akx
-aaa
+ahg
+xXX
+ahg
+agQ
aaa
aaa
aaa
@@ -53264,7 +53848,7 @@ akI
akK
alh
akw
-akT
+ahg
agQ
alJ
alJ
@@ -53272,10 +53856,10 @@ alJ
alJ
alJ
agQ
-alu
-alu
-akx
-aaa
+ahg
+xXX
+ahg
+agQ
aaa
aaa
aaa
@@ -53516,12 +54100,12 @@ aba
agQ
agQ
ahU
+brx
ahU
agQ
-agQ
-agQ
-agQ
-akU
+mlz
+pMT
+mlz
agQ
alJ
alJ
@@ -53529,10 +54113,10 @@ alW
alJ
alJ
agQ
-alu
-amm
-akx
-aaa
+ahj
+iZk
+qGf
+agQ
aaa
aaa
aaa
@@ -53774,11 +54358,11 @@ aba
agQ
ahV
aiv
+qMQ
agQ
-aba
-aba
-akx
-akV
+ahg
+akw
+ahg
agQ
alJ
alJ
@@ -53786,10 +54370,10 @@ alJ
alJ
alJ
agQ
-alu
-alu
-akx
-aaa
+ahg
+xXX
+ahg
+agQ
aaa
aaa
aaa
@@ -54031,11 +54615,11 @@ aba
agQ
ahW
aiw
+smA
agQ
-aba
-aba
-akx
-akV
+ahg
+akw
+ahg
agQ
agQ
agQ
@@ -54043,10 +54627,10 @@ agQ
agQ
agQ
agQ
-alu
-alu
-akx
-aaa
+mlz
+tsX
+mlz
+agQ
aaa
aaa
aaa
@@ -54288,22 +54872,22 @@ aba
agQ
ahX
ahX
+ahX
+agQ
+ahg
+akw
+ahg
+ahg
+ahg
+ahg
+mCk
+ahg
+cQJ
+ahg
+ahg
+xXX
+wBT
agQ
-aba
-aba
-akx
-akW
-alu
-alu
-alu
-alu
-alu
-alu
-alu
-alu
-amn
-akx
-aaa
aaa
aaa
aaa
@@ -54542,25 +55126,25 @@ aad
aac
aba
aba
-aba
-aba
-aba
aiV
aba
aba
-akx
+aba
+agQ
+hGX
+pIl
akX
-alv
+bhR
alK
-alv
-alX
-alv
-alv
-alv
-alv
+bhR
+bhR
+bhR
+fIm
+bhR
+bhR
amo
-akx
-aaa
+ahg
+agQ
aaa
aaa
aaa
@@ -54803,21 +55387,21 @@ aba
aba
aba
aba
-aba
-aaO
-akx
+agQ
+tSs
+tLV
akY
-alw
-akx
-akx
-akx
-akx
-akx
-akx
-akx
-amp
-akx
-aaa
+ahg
+xvi
+ahg
+ahg
+ahg
+ahg
+ahg
+ahg
+akw
+dTr
+agQ
aaa
aaa
aaa
@@ -55060,21 +55644,21 @@ aba
aba
aba
aba
-aba
aaO
-aky
+aaO
+aaO
akZ
-ahY
+qId
aaO
-aaa
-aaa
-aaa
-aaa
-aaa
-akx
-amq
-akx
-aaa
+agQ
+agQ
+agQ
+agQ
+agQ
+agQ
+qWW
+agQ
+agQ
aaa
aaa
aaa
@@ -55319,7 +55903,7 @@ aei
bbd
aaO
aaO
-akz
+vqy
ala
alx
aaO
@@ -55576,8 +56160,8 @@ aix
aiW
ajH
aaO
-akA
-ala
+akz
+nzN
aly
aaO
aaa
@@ -55833,7 +56417,7 @@ aiy
aiX
ajI
aaO
-aaO
+hoE
alb
alz
aaO
@@ -56090,8 +56674,8 @@ aiz
aiY
ajJ
akc
-ahY
-ala
+abo
+wNZ
alA
aaO
aaa
@@ -56349,7 +56933,7 @@ ajK
akd
akB
alc
-ahY
+grD
aaO
aaa
aaa
@@ -57174,7 +57758,7 @@ avX
aBd
wbr
aHG
-oFB
+uEu
aJO
wbr
aLJ
@@ -57431,7 +58015,7 @@ avX
avX
wbr
aHH
-oFB
+cQm
aJP
wbr
aLK
@@ -57688,8 +58272,8 @@ rgE
tTI
wbr
aHI
-oFB
-aEN
+oIX
+xco
wbr
aLL
aMM
@@ -60710,7 +61294,7 @@ abo
abo
abo
bcl
-abo
+kaD
aih
aiI
ajn
@@ -75409,8 +75993,8 @@ sXz
sXz
ayI
azg
-azg
-azg
+hrG
+qEk
aAY
azg
hwN
@@ -75665,11 +76249,11 @@ aaa
aaa
sXz
sXz
-azh
sXz
-azh
+tyC
+ttx
+pRY
sXz
-azh
sXz
vPb
bbn
@@ -75922,11 +76506,11 @@ aaa
aaa
aaa
aaa
-aba
-aba
-aba
-aba
-aba
+sXz
+azh
+sXz
+azh
+sXz
sXz
fbJ
nXh
diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm
index caf8f9650c3..a9a9391dd48 100644
--- a/maps/aurora/aurora-4_mainlevel.dmm
+++ b/maps/aurora/aurora-4_mainlevel.dmm
@@ -1211,26 +1211,15 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
- },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/maintenance/security_starboard)
"acy" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9;
- pixel_y = 0
- },
/turf/simulated/floor/plating,
/area/maintenance/security_starboard)
-"acz" = (
-/obj/structure/closet/crate,
-/obj/random/loot,
-/turf/simulated/floor/tiled,
-/area/maintenance/security_starboard)
"acA" = (
/obj/structure/cable/green{
d1 = 1;
@@ -5465,6 +5454,9 @@
pixel_y = 3
},
/obj/item/weapon/storage/briefcase/inflatable,
+/obj/effect/floor_decal/corner/blue{
+ dir = 1
+ },
/turf/simulated/floor/tiled,
/area/engineering/atmos/storage)
"akF" = (
@@ -5484,6 +5476,9 @@
d2 = 4;
icon_state = "1-4"
},
+/obj/effect/floor_decal/corner/blue{
+ dir = 1
+ },
/turf/simulated/floor/tiled,
/area/engineering/atmos/storage)
"akG" = (
@@ -5503,22 +5498,17 @@
d2 = 8;
icon_state = "2-8"
},
-/turf/simulated/floor/tiled,
-/area/engineering/atmos/storage)
-"akH" = (
-/obj/structure/window/reinforced{
- icon_state = "rwindow";
- dir = 8
+/obj/effect/floor_decal/corner/blue{
+ dir = 1
},
-/obj/structure/window/reinforced,
-/turf/simulated/open,
+/obj/effect/floor_decal/corner/blue,
+/turf/simulated/floor/tiled,
/area/engineering/atmos/storage)
"akI" = (
/obj/structure/window/reinforced,
/turf/simulated/open,
/area/engineering/atmos/storage)
"akJ" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/machinery/light{
icon_state = "tube1";
dir = 1
@@ -5530,6 +5520,8 @@
pixel_x = 0;
pixel_y = 28
},
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/machinery/pipedispenser,
/turf/simulated/floor/tiled,
/area/engineering/atmos/storage)
"akK" = (
@@ -5540,6 +5532,8 @@
pixel_x = 0;
pixel_y = 32
},
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/machinery/pipedispenser/disposal,
/turf/simulated/floor/tiled,
/area/engineering/atmos/storage)
"akL" = (
@@ -5936,22 +5930,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/machinery/pipedispenser,
-/turf/simulated/floor/tiled,
-/area/engineering/atmos/storage)
-"alz" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/machinery/pipedispenser/disposal,
/turf/simulated/floor/tiled,
/area/engineering/atmos/storage)
"alA" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- icon_state = "intact-scrubbers";
- dir = 9
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
},
/turf/simulated/floor/tiled,
/area/engineering/atmos/storage)
@@ -9054,6 +9037,7 @@
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/obj/effect/floor_decal/corner/blue,
/turf/simulated/floor/tiled,
/area/engineering/atmos/storage)
"arr" = (
@@ -9078,6 +9062,7 @@
icon_state = "corner_white";
dir = 10
},
+/obj/effect/floor_decal/corner/blue,
/turf/simulated/floor/tiled,
/area/engineering/atmos/storage)
"art" = (
@@ -10999,6 +10984,9 @@
dir = 5
},
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/obj/effect/floor_decal/corner/blue{
+ dir = 1
+ },
/turf/simulated/floor/tiled,
/area/engineering/atmos/monitoring)
"auk" = (
@@ -11023,6 +11011,9 @@
dir = 5
},
/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/effect/floor_decal/corner/blue{
+ dir = 1
+ },
/turf/simulated/floor/tiled,
/area/engineering/locker_room)
"aum" = (
@@ -14027,6 +14018,7 @@
icon_state = "corner_white";
dir = 10
},
+/obj/effect/floor_decal/corner/blue,
/turf/simulated/floor/tiled,
/area/engineering/atmos/monitoring)
"azj" = (
@@ -23434,10 +23426,10 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/turf/simulated/floor/plating,
@@ -24406,8 +24398,10 @@
/turf/simulated/open,
/area/engineering/engine_room)
"aQb" = (
-/obj/random/junk,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/universal,
+/obj/machinery/meter{
+ name = "Scrubbers"
+ },
/turf/simulated/floor/plating,
/area/maintenance/research_port)
"aQc" = (
@@ -24417,7 +24411,10 @@
icon_state = "1-2";
pixel_y = 0
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/universal,
+/obj/machinery/meter{
+ name = "Air supply"
+ },
/turf/simulated/floor/plating,
/area/maintenance/research_port)
"aQd" = (
@@ -25478,8 +25475,14 @@
/turf/simulated/floor/plating,
/area/crew_quarters/captain)
"aRP" = (
-/obj/machinery/meter{
- name = "Scrubbers"
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ icon_state = "intact-supply";
+ dir = 6
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
@@ -25487,14 +25490,13 @@
"aRQ" = (
/obj/structure/cable{
d1 = 1;
- d2 = 2;
- icon_state = "1-2";
- pixel_y = 0
+ d2 = 8;
+ icon_state = "1-8"
},
-/obj/machinery/meter{
- name = "Air supply"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ icon_state = "intact-supply";
+ dir = 9
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/maintenance/research_port)
"aRR" = (
@@ -26281,31 +26283,6 @@
"aTf" = (
/turf/simulated/wall/r_wall,
/area/bridge/ailobby)
-"aTg" = (
-/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- icon_state = "intact-supply";
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plating,
-/area/maintenance/research_port)
-"aTh" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- icon_state = "intact-supply";
- dir = 9
- },
-/turf/simulated/floor/plating,
-/area/maintenance/research_port)
"aTi" = (
/obj/structure/closet/secure_closet/engineering_chief,
/obj/item/weapon/tank/emergency_oxygen/engi,
@@ -28025,7 +28002,6 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/firedoor,
/turf/simulated/floor/plating,
/area/maintenance/research_port)
"aVZ" = (
@@ -37406,8 +37382,9 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/structure/disposalpipe/junction{
+ dir = 8;
+ icon_state = "pipe-j2"
},
/turf/simulated/floor/tiled,
/area/bridge)
@@ -38216,6 +38193,7 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled,
/area/bridge)
"bnk" = (
@@ -39401,6 +39379,7 @@
d2 = 8;
icon_state = "1-8"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled,
/area/bridge)
"boP" = (
@@ -41525,6 +41504,7 @@
icon_state = "1-4"
},
/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled,
/area/bridge)
"bsp" = (
@@ -43765,6 +43745,7 @@
icon_state = "1-2"
},
/obj/effect/floor_decal/corner/paleblue/diagonal,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/white,
/area/bridge)
"bvQ" = (
@@ -44285,6 +44266,7 @@
icon_state = "1-2"
},
/obj/effect/floor_decal/corner/paleblue/diagonal,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/white,
/area/bridge)
"bwJ" = (
@@ -45360,6 +45342,7 @@
icon_state = "1-2"
},
/obj/effect/floor_decal/corner/paleblue/diagonal,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/white,
/area/bridge)
"byh" = (
@@ -46030,6 +46013,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/tiled,
/area/bridge)
"bzw" = (
@@ -46048,6 +46035,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/tiled,
/area/bridge)
"bzx" = (
@@ -46062,6 +46052,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/tiled,
/area/bridge)
"bzy" = (
@@ -46080,6 +46073,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/maintcentral)
"bzz" = (
@@ -46094,6 +46090,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/maintenance/maintcentral)
"bzA" = (
@@ -46616,6 +46616,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/maintcentral)
"bAz" = (
@@ -47029,6 +47030,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/maintcentral)
"bBu" = (
@@ -49932,6 +49934,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/maintenance/maintcentral)
"bGO" = (
@@ -49946,6 +49952,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/maintcentral)
"bGP" = (
@@ -49961,6 +49970,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/maintenance/maintcentral)
"bGQ" = (
@@ -50641,6 +50654,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/universal,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/maintcentral)
"bHL" = (
@@ -51129,6 +51143,7 @@
/obj/machinery/meter{
name = "Air supply"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/maintcentral)
"bIJ" = (
@@ -51921,6 +51936,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/maintcentral)
"bKv" = (
@@ -52237,10 +52253,6 @@
/obj/effect/decal/cleanable/cobweb,
/turf/simulated/floor/tiled/freezer,
/area/maintenance/medbay)
-"bLf" = (
-/obj/machinery/light/small/emergency,
-/turf/simulated/floor/plating,
-/area/maintenance/research_port)
"bLg" = (
/obj/structure/cable{
d1 = 1;
@@ -52627,6 +52639,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/maintcentral)
"bLV" = (
@@ -53287,6 +53300,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/maintenance/maintcentral)
"bNh" = (
@@ -60432,20 +60449,6 @@
/obj/random/junk,
/turf/simulated/floor/plating,
/area/maintenance/bar)
-"cbN" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
- icon_state = "intact";
- dir = 6
- },
-/turf/simulated/floor/plating,
-/area/maintenance/bar)
-"cbO" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
- icon_state = "intact";
- dir = 10
- },
-/turf/simulated/floor/plating,
-/area/maintenance/bar)
"cbP" = (
/obj/structure/closet,
/turf/simulated/floor/plating,
@@ -60656,20 +60659,23 @@
/turf/simulated/wall,
/area/maintenance/bar)
"ccp" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/universal,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
/turf/simulated/floor/plating,
/area/maintenance/bar)
"ccq" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/universal,
-/obj/machinery/meter{
- name = "Scrubbers"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
},
/turf/simulated/floor/plating,
/area/maintenance/bar)
"ccr" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/universal,
+/obj/machinery/atmospherics/pipe/simple/hidden/universal{
+ dir = 4
+ },
/obj/machinery/meter{
- name = "Air supply"
+ name = "Scrubbers"
},
/turf/simulated/floor/plating,
/area/maintenance/bar)
@@ -60925,13 +60931,12 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- icon_state = "intact-scrubbers";
- dir = 9
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
/turf/simulated/floor/plating,
/area/maintenance/bar)
"ccQ" = (
@@ -60944,7 +60949,6 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- icon_state = "intact-scrubbers";
dir = 5
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -60961,29 +60965,11 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- icon_state = "intact-supply";
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/machinery/atmospherics/pipe/simple/hidden/universal{
dir = 4
},
-/turf/simulated/floor/plating,
-/area/maintenance/bar)
-"ccS" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
+/obj/machinery/meter{
+ name = "Air supply"
},
/turf/simulated/floor/plating,
/area/maintenance/bar)
@@ -64415,12 +64401,27 @@
},
/turf/simulated/floor/plating,
/area/maintenance/engineering)
+"ctY" = (
+/obj/structure/window/reinforced{
+ icon_state = "rwindow";
+ dir = 4
+ },
+/obj/structure/window/reinforced,
+/turf/simulated/open,
+/area/engineering/atmos/storage)
"cuh" = (
/obj/structure/bed,
/obj/effect/decal/cleanable/dirt,
/obj/item/weapon/bedsheet/medical,
/turf/simulated/floor/tiled/white,
/area/maintenance/medbay)
+"cxh" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/universal,
+/obj/machinery/meter{
+ name = "Scrubbers"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/security_starboard)
"cyq" = (
/obj/machinery/door/firedoor,
/obj/structure/window/reinforced{
@@ -64455,6 +64456,13 @@
},
/turf/simulated/floor/plating,
/area/maintenance/medbay)
+"cMe" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/universal,
+/obj/machinery/meter{
+ name = "Air supply"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/security_starboard)
"cPy" = (
/obj/structure/cable{
d1 = 2;
@@ -64473,6 +64481,21 @@
},
/turf/simulated/floor/plating,
/area/maintenance/cargo)
+"cTo" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/effect/floor_decal/corner/paleblue{
+ icon_state = "corner_white";
+ dir = 10
+ },
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled,
+/area/bridge)
"cVy" = (
/turf/simulated/floor/tiled,
/area/maintenance/cargo)
@@ -64648,6 +64671,12 @@
/obj/effect/decal/cleanable/blood/splatter,
/turf/simulated/floor/tiled/freezer,
/area/maintenance/medbay)
+"dED" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/security_starboard)
"dFK" = (
/obj/machinery/light/small/emergency{
icon_state = "bulb1";
@@ -64828,6 +64857,14 @@
/obj/random/loot,
/turf/simulated/floor/plating,
/area/maintenance/atmos_control)
+"eJC" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9;
+ pixel_y = 0
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/security_starboard)
"eJM" = (
/obj/structure/disposalpipe/segment{
dir = 4;
@@ -65657,7 +65694,9 @@
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
/turf/simulated/floor/plating,
/area/maintenance/medbay)
"iBt" = (
@@ -66161,6 +66200,20 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/carpet/blue,
/area/maintenance/medbay)
+"lhb" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/research_port)
"lhs" = (
/obj/structure/window/phoronreinforced,
/obj/structure/grille/broken,
@@ -66243,6 +66296,20 @@
/obj/structure/reagent_dispensers/fueltank,
/turf/simulated/floor/tiled,
/area/maintenance/cargo)
+"luW" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/visible/universal{
+ dir = 4
+ },
+/obj/machinery/meter{
+ name = "Scrubbers"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/research_port)
"lyh" = (
/obj/machinery/camera/network/engineering{
c_tag = "Maintenance - Atmospherics"
@@ -66356,6 +66423,13 @@
/obj/structure/grille,
/turf/simulated/floor/plating,
/area/medical/medbay2)
+"lUQ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/universal,
+/obj/machinery/meter{
+ name = "Scrubbers"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/medbay)
"lVA" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -66560,6 +66634,10 @@
d2 = 8;
icon_state = "0-8"
},
+/obj/structure/disposalpipe/up{
+ icon_state = "pipe-u";
+ dir = 8
+ },
/turf/simulated/floor/plating{
roof_type = null
},
@@ -66590,6 +66668,20 @@
},
/turf/simulated/floor/plating,
/area/maintenance/library)
+"mJV" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/research_port)
"mKz" = (
/turf/simulated/wall,
/area/maintenance/library)
@@ -66919,7 +67011,7 @@
"oXa" = (
/obj/machinery/power/smes/buildable{
charge = 0;
- RCon = 0;
+ RCon = 1;
RCon_tag = "NO_TAG"
},
/obj/structure/cable/green,
@@ -67093,6 +67185,23 @@
},
/turf/simulated/floor/tiled/dark,
/area/rnd/telesci)
+"pDF" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/bar)
"pFt" = (
/obj/effect/floor_decal/corner/mauve/full{
icon_state = "corner_white_full";
@@ -67136,6 +67245,13 @@
},
/turf/simulated/floor/plating,
/area/rnd/chemistry)
+"pTa" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9;
+ pixel_y = 0
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/research_port)
"pUs" = (
/obj/structure/cable{
d1 = 1;
@@ -67143,8 +67259,10 @@
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/universal,
+/obj/machinery/meter{
+ name = "Air supply"
+ },
/turf/simulated/floor/plating,
/area/maintenance/medbay)
"pZo" = (
@@ -67760,6 +67878,18 @@
/obj/effect/decal/cleanable/flour,
/turf/simulated/floor/plating,
/area/maintenance/civ)
+"tdO" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ pixel_y = 0
+ },
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/plating,
+/area/maintenance/research_port)
"tjF" = (
/obj/machinery/atmospherics/pipe/simple/hidden/red,
/obj/machinery/hologram/holopad,
@@ -68070,6 +68200,12 @@
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/kitchen)
+"uvI" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/medbay)
"uwI" = (
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -68366,6 +68502,10 @@
icon_state = "asteroidplating"
},
/area/mine/unexplored)
+"vNa" = (
+/obj/machinery/light/small/emergency,
+/turf/simulated/floor/plating,
+/area/mine/unexplored)
"vNh" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -68417,6 +68557,29 @@
/obj/structure/reagent_dispensers/watertank,
/turf/simulated/floor/plating,
/area/maintenance/library)
+"waD" = (
+/obj/machinery/atmospherics/pipe/simple/visible/universal{
+ dir = 4
+ },
+/obj/machinery/meter{
+ name = "Air supply"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/research_port)
+"wbf" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ pixel_y = 0
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/medbay)
"whu" = (
/obj/structure/disposalpipe/trunk{
dir = 4
@@ -68755,6 +68918,12 @@
/obj/item/weapon/reagent_containers/blood/empty,
/turf/simulated/floor/tiled/freezer,
/area/maintenance/medbay)
+"xIw" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/research_port)
"xJi" = (
/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
frequency = 1379;
@@ -68827,6 +68996,12 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/maintenance/library)
+"xVv" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/medbay)
"yck" = (
/obj/structure/lattice/catwalk,
/obj/random/tool,
@@ -83630,11 +83805,11 @@ aHx
asw
aKU
aMF
-aOv
+mJV
aQb
aRP
-aTg
aUW
+tdO
aVY
aXH
aYT
@@ -83890,7 +84065,7 @@ aKV
aOw
aQc
aRQ
-aTh
+bbs
bbs
bbs
aXI
@@ -87010,9 +87185,9 @@ bcY
bbs
beC
bbs
-beG
-bbs
-bbs
+aOv
+xIw
+bcY
bbs
bbs
bbs
@@ -87267,9 +87442,9 @@ beC
bbs
bcY
bbs
-beG
-bbs
-aox
+luW
+waD
+vNa
bbs
bMw
bNh
@@ -87524,9 +87699,9 @@ bcY
bbs
bcY
bcY
-beG
-bbs
-bbs
+lhb
+pTa
+bcY
bbs
bMx
bNi
@@ -87783,7 +87958,7 @@ bIK
bIK
sNG
bcY
-bLf
+bcY
bbs
bbs
bNj
@@ -89264,7 +89439,7 @@ ahr
aiq
ajj
ajP
-akH
+akI
aly
amz
anM
@@ -89521,8 +89696,8 @@ ahs
air
ajk
agH
-akI
-alz
+ctY
+aly
amz
anN
aoO
@@ -100924,9 +101099,9 @@ bZt
blc
bGC
bGC
-cbN
-ccp
-ccP
+bGC
+bMU
+pDF
cdi
bEK
aaa
@@ -101181,9 +101356,9 @@ bYy
blc
caT
bGC
-cbO
+bGC
ccq
-ccQ
+ccP
cdi
bEK
aaa
@@ -101326,8 +101501,8 @@ aaJ
aah
abj
aae
-acz
-abV
+dED
+cMe
acx
abU
abU
@@ -101438,7 +101613,7 @@ bZu
blc
bQB
bGC
-cbN
+bGC
ccr
ccR
cdi
@@ -101583,8 +101758,8 @@ aaO
aaT
abk
abH
-abU
-abU
+eJC
+cxh
acy
aah
aaD
@@ -101695,9 +101870,9 @@ bYN
bVd
bGC
bGC
-cbO
+bGC
ccp
-ccS
+ccQ
cdj
bEK
aaa
@@ -102208,7 +102383,7 @@ bXV
bZw
blc
bKY
-bMU
+bGC
bGC
bEK
bFF
@@ -102981,7 +103156,7 @@ bGC
bEK
bEK
bEK
-bMU
+bEK
bFF
cdl
bEK
@@ -107824,7 +107999,7 @@ bDV
ipL
iAK
pUs
-bJp
+wbf
bJp
tEq
bJp
@@ -108079,9 +108254,9 @@ bBo
tUJ
blN
bBo
-bBo
-bBo
-bBo
+xVv
+lUQ
+uvI
bBo
rcu
nXX
@@ -114236,7 +114411,7 @@ bnj
bnj
bso
bnj
-aKr
+cTo
bvP
bwI
byg
diff --git a/maps/aurora/aurora-5_interstitial.dmm b/maps/aurora/aurora-5_interstitial.dmm
index f0697ecef9d..6aef632e96e 100644
--- a/maps/aurora/aurora-5_interstitial.dmm
+++ b/maps/aurora/aurora-5_interstitial.dmm
@@ -1104,6 +1104,10 @@
d2 = 8;
icon_state = "2-8"
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating{
roof_type = null
},
@@ -7571,6 +7575,10 @@
pixel_x = -22;
pixel_y = 0
},
+/obj/structure/disposalpipe/up{
+ icon_state = "pipe-u";
+ dir = 4
+ },
/turf/simulated/floor/plating{
roof_type = null
},
@@ -8243,6 +8251,10 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/maintenance/maintcentral)
"yf" = (
@@ -10664,6 +10676,10 @@
icon_state = "11-1"
},
/obj/structure/lattice,
+/obj/structure/disposalpipe/down{
+ icon_state = "pipe-d";
+ dir = 8
+ },
/turf/simulated/open,
/area/maintenance/maintcentral)
"MV" = (
diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm
index 10c2ccf09db..dca99322060 100644
--- a/maps/aurora/aurora-6_surface.dmm
+++ b/maps/aurora/aurora-6_surface.dmm
@@ -11225,7 +11225,6 @@
icon_state = "1-2";
pixel_y = 0
},
-/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/cargo/surface)
@@ -11298,6 +11297,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/tiled,
/area/bridge/levela)
"vw" = (
@@ -11510,10 +11513,6 @@
},
/area/crew_quarters/fitness/pool)
"vZ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- icon_state = "intact-scrubbers";
- dir = 5
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable{
d1 = 1;
@@ -11522,6 +11521,8 @@
pixel_y = 0
},
/obj/structure/disposalpipe/segment,
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
/area/maintenance/cargo/surface)
"wa" = (
@@ -11529,9 +11530,6 @@
/turf/simulated/floor/tiled/white,
/area/bridge/levela)
"wb" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable{
d1 = 1;
@@ -11540,6 +11538,9 @@
pixel_y = 0
},
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
/turf/simulated/floor/plating,
/area/maintenance/cargo/surface)
"wc" = (
@@ -11597,6 +11598,7 @@
icon_state = "corner_white";
dir = 6
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled,
/area/bridge/levela)
"wh" = (
@@ -11895,6 +11897,9 @@
/area/crew_quarters/fitness/pool)
"wL" = (
/obj/machinery/light,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/wood,
/area/bridge/levela)
"wM" = (
@@ -11902,6 +11907,9 @@
dir = 1;
pixel_y = -22
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/wood,
/area/bridge/levela)
"wN" = (
@@ -11912,10 +11920,6 @@
/turf/simulated/floor/plating,
/area/bridge/levela)
"wO" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
/obj/structure/cable{
d1 = 1;
d2 = 2;
@@ -11928,6 +11932,10 @@
pixel_x = -22
},
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/universal,
+/obj/machinery/meter{
+ name = "Air supply"
+ },
/turf/simulated/floor/plating,
/area/maintenance/cargo/surface)
"wP" = (
@@ -11938,13 +11946,13 @@
/obj/machinery/light{
dir = 8
},
+/obj/structure/disposalpipe/junction{
+ icon_state = "pipe-j2";
+ dir = 2
+ },
/turf/simulated/floor/tiled,
/area/bridge/levela)
"wQ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
- },
/obj/structure/cable{
d1 = 1;
d2 = 2;
@@ -11952,6 +11960,10 @@
pixel_y = 0
},
/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/maintenance/cargo/surface)
"wR" = (
@@ -11972,6 +11984,9 @@
icon_state = "corner_white_full";
dir = 8
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/tiled/white,
/area/bridge/levela)
"wT" = (
@@ -11979,6 +11994,9 @@
icon_state = "corner_white";
dir = 9
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/tiled,
/area/bridge/levela)
"wU" = (
@@ -12001,6 +12019,9 @@
name = "Command Dock Monitoring";
req_access = list(19)
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/tiled,
/area/bridge/levela)
"wW" = (
@@ -12066,6 +12087,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/tiled/white,
/area/bridge/levela)
"xb" = (
@@ -12079,6 +12103,9 @@
/obj/machinery/firealarm/north{
pixel_y = 36
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/tiled,
/area/bridge/levela)
"xc" = (
@@ -12089,6 +12116,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/tiled,
/area/bridge/levela)
"xd" = (
@@ -12493,6 +12523,7 @@
icon_state = "corner_white_full";
dir = 1
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled,
/area/bridge/levela)
"xU" = (
@@ -12503,6 +12534,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/tiled,
/area/bridge/levela)
"xV" = (
@@ -12516,6 +12550,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/tiled,
/area/bridge/levela)
"xW" = (
@@ -12535,6 +12572,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
/turf/simulated/floor/tiled,
/area/bridge/levela)
"xY" = (
@@ -12841,6 +12882,9 @@
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/bridge/levela)
"yD" = (
@@ -12863,6 +12907,9 @@
icon_state = "intact";
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/bridge/levela)
"yE" = (
@@ -12881,6 +12928,10 @@
icon_state = "intact";
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/tiled,
/area/bridge/levela)
"yF" = (
@@ -13203,6 +13254,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/bridge/levela)
"zl" = (
@@ -13349,6 +13401,9 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/bridge/levela)
"zJ" = (
@@ -13363,6 +13418,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/bridge/levela)
"zK" = (
@@ -14274,6 +14333,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/bridge/levela)
"BM" = (
@@ -14914,6 +14976,7 @@
icon_state = "1-2"
},
/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/bridge/levela)
"Dk" = (
@@ -14990,6 +15053,7 @@
d2 = 8;
icon_state = "1-8"
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/bridge/levela)
"Dr" = (
@@ -15036,6 +15100,10 @@
d2 = 1;
icon_state = "11-1"
},
+/obj/structure/disposalpipe/down{
+ icon_state = "pipe-d";
+ dir = 4
+ },
/turf/simulated/open,
/area/bridge/levela)
"Dw" = (
@@ -15049,6 +15117,10 @@
/obj/effect/floor_decal/industrial/warning/corner{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/bridge/levela)
"Dx" = (
@@ -18854,6 +18926,7 @@
/obj/structure/sign/drop{
pixel_x = 32
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/bridge/levela)
"Lr" = (
@@ -19057,6 +19130,16 @@
/obj/structure/window/reinforced,
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/sleep/cryo)
+"Mj" = (
+/obj/structure/bed/chair{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/paleblue/diagonal,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/white,
+/area/bridge/levela)
"Mk" = (
/obj/structure/closet/toolcloset,
/obj/random/tech_supply,
@@ -19360,6 +19443,10 @@
icon_state = "intact-supply";
dir = 6
},
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/wood,
/area/bridge/levela)
"NA" = (
@@ -20616,6 +20703,13 @@
temperature = 303.15
},
/area/crew_quarters/fitness/pool)
+"RU" = (
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
+/obj/machinery/disposal,
+/turf/simulated/floor/wood,
+/area/bridge/levela)
"RW" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable/green{
@@ -20771,6 +20865,16 @@
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/sleep/cryo)
+"SE" = (
+/obj/effect/floor_decal/corner/paleblue/diagonal,
+/obj/structure/bed/chair{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/white,
+/area/bridge/levela)
"SF" = (
/obj/structure/cable/green{
d1 = 4;
@@ -20873,6 +20977,7 @@
dir = 9;
pixel_y = 0
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/wood,
/area/bridge/levela)
"Te" = (
@@ -21325,6 +21430,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/bridge/levela)
"Ve" = (
@@ -21520,6 +21626,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/wood,
/area/bridge/levela)
"VI" = (
@@ -21594,6 +21703,10 @@
/obj/machinery/photocopier/faxmachine{
department = "Command Study"
},
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/wood,
/area/bridge/levela)
"VT" = (
@@ -21618,6 +21731,10 @@
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/bridge/levela)
"VV" = (
@@ -21631,6 +21748,7 @@
/obj/structure/sign/drop{
pixel_x = 32
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/bridge/levela)
"VW" = (
@@ -21679,6 +21797,10 @@
d2 = 4;
icon_state = "1-4"
},
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/bridge/levela)
"Wa" = (
@@ -21813,6 +21935,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/plating,
/area/bridge/levela)
"Wr" = (
@@ -22008,6 +22134,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/random/junk,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/bridge/levela)
"WH" = (
@@ -22265,15 +22392,6 @@
icon_state = "asteroidplating"
},
/area/mine/explored)
-"Xq" = (
-/obj/machinery/atmospherics/pipe/simple/visible/universal{
- dir = 4
- },
-/obj/machinery/light/small/emergency{
- dir = 1
- },
-/turf/simulated/floor/plating,
-/area/maintenance/cargo/surface)
"Xr" = (
/obj/effect/floor_decal/corner/paleblue{
icon_state = "corner_white";
@@ -22303,11 +22421,8 @@
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/fitness/changing)
"Xt" = (
-/obj/machinery/atmospherics/pipe/simple/visible/universal{
- dir = 4
- },
-/obj/machinery/meter{
- name = "Scrubbers"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
},
/turf/simulated/floor/plating,
/area/maintenance/cargo/surface)
@@ -22339,30 +22454,14 @@
},
/area/crew_quarters/fitness/pool)
"Xw" = (
-/obj/machinery/atmospherics/pipe/simple/visible/universal{
- dir = 4
- },
+/obj/machinery/atmospherics/pipe/simple/hidden/universal,
/obj/machinery/meter{
- name = "Air supply"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/cargo/surface)
-"Xx" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
- icon_state = "intact";
- dir = 10
+ name = "Scrubbers"
},
/turf/simulated/floor/plating,
/area/maintenance/cargo/surface)
"Xz" = (
-/obj/machinery/atmospherics/pipe/simple/visible/universal{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/maintenance/cargo/surface)
-"XA" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
- icon_state = "intact";
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
/turf/simulated/floor/plating,
@@ -22490,6 +22589,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/tiled,
/area/bridge/levela)
"Ya" = (
@@ -47832,9 +47934,9 @@ ey
ey
ey
gv
+gv
mk
mA
-mA
mO
gv
nr
@@ -51430,9 +51532,9 @@ eI
eI
eI
gv
+gv
mk
mA
-mA
mO
gv
ag
@@ -51761,7 +51863,7 @@ GQ
Px
Px
Px
-Xq
+Px
Xt
Xw
Xz
@@ -52017,11 +52119,11 @@ HC
GQ
ag
ag
+ag
+Px
+Px
+Px
Px
-Xx
-XA
-Xx
-XA
AV
Px
ag
@@ -52274,10 +52376,10 @@ HD
GQ
ag
ag
-Px
-Px
-Px
-Px
+ag
+ag
+ag
+ag
Px
AV
Px
@@ -66624,7 +66726,7 @@ VQ
Vw
VD
VJ
-VQ
+RU
rV
Pp
Md
@@ -68166,7 +68268,7 @@ rV
uB
Ik
VN
-VN
+SE
wa
yF
rV
@@ -68937,7 +69039,7 @@ rV
vl
Ms
wi
-wi
+Mj
xW
yH
rV