diff --git a/_maps/RandomRuins/StationRuins/BoxStation/chapel1.dmm b/_maps/RandomRuins/StationRuins/BoxStation/chapel1.dmm index 9b50498b0870..07c565565231 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/chapel1.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/chapel1.dmm @@ -817,6 +817,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/mail_sorting/service/chapel, /turf/open/floor/plasteel/dark, /area/chapel/main) "YT" = ( diff --git a/_maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm b/_maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm index efa926487759..7351d51b927e 100644 --- a/_maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm +++ b/_maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm @@ -128,6 +128,7 @@ /obj/structure/disposalpipe/sorting/mail{ sortType = 17 }, +/obj/effect/mapping_helpers/mail_sorting/service/chapel, /turf/open/floor/carpet/black, /area/chapel/office) "gr" = ( diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 069daf583dd9..bef3f0129778 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -397,7 +397,6 @@ }, /obj/structure/table/wood, /obj/item/flashlight/lamp/green{ - light_on = 0; pixel_x = 6; pixel_y = 4 }, @@ -579,6 +578,10 @@ /obj/structure/closet/secure_closet/hos, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) +"adN" = ( +/obj/structure/lattice/catwalk, +/turf/closed/wall, +/area/escapepodbay) "adR" = ( /turf/closed/wall/r_wall, /area/security/main) @@ -1384,10 +1387,10 @@ /turf/open/floor/plasteel, /area/security/brig) "ajK" = ( -/obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ dir = 8 }, +/obj/machinery/disposal/bin/tagger, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "ajR" = ( @@ -1811,9 +1814,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/plasteel, /area/science/misc_lab) "amY" = ( @@ -2696,6 +2696,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/crew_quarters/dorms) +"atS" = ( +/obj/machinery/suit_storage_unit/standard_unit, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/dark, +/area/escapepodbay) "atU" = ( /obj/machinery/computer/cargo{ dir = 1 @@ -4342,9 +4347,6 @@ "aFu" = ( /turf/closed/wall, /area/library) -"aFB" = ( -/turf/open/floor/plasteel/dark, -/area/escapepodbay) "aFD" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -4555,9 +4557,6 @@ /turf/open/floor/plasteel/dark, /area/security/courtroom) "aHK" = ( -/obj/structure/disposalpipe/junction{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, @@ -4570,6 +4569,10 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/mail_sorting/service/theater, +/obj/structure/disposalpipe/sorting/mail{ + dir = 4 + }, /turf/open/floor/wood/parquet, /area/crew_quarters/bar) "aHL" = ( @@ -5202,6 +5205,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "aLE" = ( @@ -5217,6 +5223,9 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "aLK" = ( @@ -5561,6 +5570,18 @@ /obj/structure/closet/emcloset, /turf/open/floor/plasteel, /area/engine/storage_shared) +"aNZ" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/machinery/airalarm{ + pixel_y = 24 + }, +/turf/open/floor/plasteel, +/area/escapepodbay) "aOb" = ( /obj/machinery/computer/arcade, /turf/open/floor/plasteel, @@ -5601,21 +5622,12 @@ dir = 1; pixel_y = -26 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/plasteel, /area/hallway/primary/port) "aOs" = ( /obj/machinery/space_heater, /turf/open/floor/plating, /area/maintenance/fore/secondary) -"aOv" = ( -/obj/structure/disposalpipe/junction{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/port) "aOw" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, @@ -5833,6 +5845,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/port) "aPG" = ( @@ -6005,10 +6018,6 @@ /obj/machinery/vending/coffee, /turf/open/floor/plasteel, /area/crew_quarters/locker) -"aQQ" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, -/area/crew_quarters/locker) "aQR" = ( /obj/machinery/vending/clothing, /turf/open/floor/plasteel, @@ -6256,6 +6265,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/port) "aSm" = ( @@ -6430,6 +6440,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/port) "aTO" = ( @@ -6482,7 +6493,6 @@ /turf/open/floor/plasteel, /area/hydroponics) "aUi" = ( -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ dir = 1 }, @@ -6624,13 +6634,13 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 2; - sortType = 26 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/effect/mapping_helpers/mail_sorting/service/dormitories, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 2 + }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) "aVh" = ( @@ -6766,15 +6776,9 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, /turf/open/floor/plasteel, /area/quartermaster/office) "aXb" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ icon_state = "2-4" }, @@ -6867,6 +6871,7 @@ /obj/structure/cable{ icon_state = "0-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/port) "aXA" = ( @@ -6982,9 +6987,7 @@ "aZz" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, +/obj/structure/disposalpipe/junction/flip, /turf/open/floor/wood, /area/bridge/meeting_room) "aZB" = ( @@ -7127,13 +7130,6 @@ }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) -"bbc" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, -/area/crew_quarters/locker) "bbd" = ( /obj/structure/pool_ladder, /turf/open/indestructible/sound/pool/end, @@ -7160,6 +7156,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/port) "bbx" = ( @@ -7180,6 +7179,11 @@ }, /turf/open/floor/plasteel, /area/science/misc_lab) +"bbz" = ( +/obj/structure/table, +/obj/item/storage/toolbox/mechanical, +/turf/open/floor/plasteel/dark, +/area/escapepodbay) "bbB" = ( /obj/machinery/light, /turf/open/floor/engine{ @@ -7337,7 +7341,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "4-8" }, @@ -7345,6 +7348,7 @@ dir = 8 }, /obj/effect/turf_decal/trimline/brown/filled/corner/lower, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/quartermaster/sorting) "bcu" = ( @@ -7398,6 +7402,10 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/mail_sorting/science/genetics, +/obj/structure/disposalpipe/sorting/mail{ + dir = 2 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) "bcS" = ( @@ -8610,10 +8618,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) -"bnA" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, -/area/quartermaster/office) "bnD" = ( /obj/machinery/light_switch{ pixel_x = 23 @@ -8668,6 +8672,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft) "bnO" = ( @@ -8747,10 +8752,6 @@ /turf/open/space, /area/space/nearstation) "boT" = ( -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 1; - sortType = 3 - }, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /obj/structure/cable{ @@ -8762,6 +8763,10 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/effect/mapping_helpers/mail_sorting/supply/qm_office, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 1 + }, /turf/open/floor/plasteel, /area/quartermaster/miningdock) "boU" = ( @@ -8864,6 +8869,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/quartermaster/office) "bpO" = ( @@ -9006,12 +9014,10 @@ "bqV" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/junction/flip, /turf/open/floor/plasteel, /area/hallway/primary/aft) "brn" = ( @@ -9088,9 +9094,6 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "1-2" @@ -9357,10 +9360,6 @@ /turf/open/floor/plating, /area/maintenance/fore) "btT" = ( -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 8; - sortType = 6 - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, @@ -9373,6 +9372,10 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/effect/mapping_helpers/mail_sorting/engineering/atmospherics, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/aft) "btW" = ( @@ -10096,6 +10099,9 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"bAj" = ( +/turf/open/floor/plasteel/dark, +/area/escapepodbay) "bAo" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/manifold/general/visible{ @@ -10203,6 +10209,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bBh" = ( @@ -10219,13 +10228,16 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bBi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, /turf/open/floor/plasteel/dark, @@ -10292,12 +10304,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bBC" = ( @@ -10405,10 +10417,10 @@ /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/hor) "bCi" = ( -/obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ dir = 1 }, +/obj/machinery/disposal/bin/tagger, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/hor) "bCj" = ( @@ -10533,7 +10545,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, -/obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "1-2" }, @@ -10560,12 +10571,6 @@ }, /turf/open/floor/plasteel/white, /area/science/research) -"bDq" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/escapepodbay) "bDx" = ( /obj/structure/table/wood, /obj/item/canvas/twentythreeXtwentythree{ @@ -10686,24 +10691,6 @@ "bEC" = ( /turf/closed/wall/r_wall, /area/science/mixing) -"bEP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "bET" = ( /obj/machinery/holopad, /turf/open/floor/plasteel, @@ -11667,6 +11654,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) "bNY" = ( @@ -12015,6 +12003,22 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, /area/maintenance/port/aft) +"bQx" = ( +/obj/machinery/power/apc{ + areastring = "/area/escapepodbay"; + dir = 8; + name = "Podbay APC"; + pixel_x = -25 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/railing/corner, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/plasteel, +/area/escapepodbay) "bQy" = ( /obj/machinery/space_heater, /turf/open/floor/plating, @@ -12380,12 +12384,12 @@ /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "bVE" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/turf_decal/loading_area{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "bVF" = ( @@ -12523,6 +12527,9 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/quartermaster/office) "bXJ" = ( @@ -12552,9 +12559,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -12567,6 +12571,9 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) "bYl" = ( @@ -12648,6 +12655,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) "bZI" = ( @@ -12773,16 +12781,16 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - sortType = 9 - }, /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 4 }, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 1 + }, +/obj/effect/mapping_helpers/mail_sorting/medbay/general, /turf/open/floor/plasteel/white, /area/medical/storage) "cbp" = ( @@ -13341,6 +13349,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/central) "ciN" = ( @@ -13456,7 +13465,6 @@ /turf/open/floor/plasteel/dark, /area/engine/engine_smes) "cky" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 @@ -13464,6 +13472,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/wood/parquet, /area/crew_quarters/bar) "ckz" = ( @@ -13511,6 +13520,7 @@ pixel_x = 32 }, /obj/item/kirbyplants/random, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) "ckT" = ( @@ -13715,6 +13725,9 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "cmd" = ( @@ -13799,12 +13812,12 @@ req_access_txt = "5" }, /obj/effect/turf_decal/delivery, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/medbay/central) "cnh" = ( @@ -13846,8 +13859,10 @@ /area/hallway/secondary/entry) "cno" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/junction/flip{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "cnq" = ( @@ -13919,10 +13934,6 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) "col" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 2; - sortType = 19 - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -13932,6 +13943,10 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, +/obj/effect/mapping_helpers/mail_sorting/service/bar, +/obj/structure/disposalpipe/sorting/mail{ + dir = 2 + }, /turf/open/floor/wood/parquet, /area/crew_quarters/bar) "cou" = ( @@ -14276,6 +14291,9 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/bridge) "csW" = ( @@ -14356,6 +14374,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/central) "ctR" = ( @@ -14418,18 +14437,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/exit) -"cuF" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/escapepodbay) "cuG" = ( /obj/machinery/navbeacon{ codes_txt = "delivery;dir=2"; @@ -14965,9 +14972,7 @@ /area/engine/atmos/distro) "cCl" = ( /obj/effect/decal/cleanable/cobweb, -/obj/machinery/computer/atmos_sim{ - mode = 1 - }, +/obj/machinery/computer/atmos_sim, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "cCD" = ( @@ -15124,6 +15129,9 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/bridge) "cEu" = ( @@ -15256,15 +15264,6 @@ "cHL" = ( /turf/open/floor/mech_bay_recharge_floor, /area/science/robotics/mechbay) -"cHM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/turf/open/floor/plasteel, -/area/escapepodbay) "cHN" = ( /obj/machinery/holopad, /obj/structure/cable{ @@ -15520,6 +15519,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "cLM" = ( @@ -15560,6 +15562,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft) "cMj" = ( @@ -15577,10 +15580,12 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "2-4" }, +/obj/structure/disposalpipe/junction/flip{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "cMy" = ( @@ -16055,6 +16060,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "cSA" = ( @@ -16673,7 +16681,6 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel, /area/hallway/primary/central) @@ -16771,9 +16778,6 @@ /area/maintenance/aft) "dhC" = ( /obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -16786,6 +16790,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plating/airless, /area/space/nearstation) "dhS" = ( @@ -16800,6 +16807,21 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/aft) +"dif" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "dil" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -17127,9 +17149,6 @@ "doM" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, /obj/structure/cable{ icon_state = "1-4" }, @@ -17162,8 +17181,16 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/bridge) +"doP" = ( +/obj/structure/lattice/catwalk, +/obj/structure/marker_beacon, +/turf/open/space/basic, +/area/space/nearstation) "doR" = ( /obj/machinery/atmospherics/pipe/simple/supply/visible{ dir = 10 @@ -17237,9 +17264,6 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "dqh" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 9 }, @@ -17297,6 +17321,9 @@ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "dsd" = ( @@ -17461,12 +17488,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/plasteel, -/area/engine/foyer) -"dvH" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, -/area/hallway/primary/port) +/area/engine/foyer) "dvI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -18019,6 +18043,9 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "dFD" = ( @@ -18061,12 +18088,6 @@ }, /turf/open/floor/plasteel, /area/security/prison) -"dHx" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "dHB" = ( /obj/structure/cable{ icon_state = "1-2" @@ -18396,6 +18417,9 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "dNk" = ( @@ -18756,6 +18780,8 @@ /obj/effect/turf_decal/trimline/purple/filled/corner/lower{ dir = 4 }, +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) "dTz" = ( @@ -18852,9 +18878,6 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, /obj/structure/cable{ icon_state = "1-4" }, @@ -18864,6 +18887,9 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "dVy" = ( @@ -18875,14 +18901,6 @@ }, /turf/open/floor/plasteel, /area/quartermaster/storage) -"dVM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel, -/area/hallway/primary/port) "dVT" = ( /obj/structure/cable{ icon_state = "0-4" @@ -19105,12 +19123,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) -"eaG" = ( -/obj/structure/disposalpipe/junction/flip{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/port) "eaO" = ( /obj/machinery/door/airlock/security/glass{ name = "Security Office"; @@ -19186,6 +19198,26 @@ }, /turf/open/floor/plasteel/dark, /area/engine/engine_smes) +"ece" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/spawner/structure/window/reinforced/shutter, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "ecl" = ( /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 1 @@ -19299,18 +19331,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) -"eec" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/port) "ees" = ( /obj/effect/turf_decal/arrows/white{ color = "#99ccff" @@ -19383,6 +19403,7 @@ dir = 8; pixel_x = 24 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) "efw" = ( @@ -19699,9 +19720,6 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, /obj/structure/cable{ icon_state = "2-8" }, @@ -19711,6 +19729,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/port/aft) "elV" = ( @@ -19783,9 +19804,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, /turf/open/floor/plasteel, /area/quartermaster/office) "enr" = ( @@ -19912,14 +19930,6 @@ }, /turf/open/floor/wood, /area/lawoffice) -"eqH" = ( -/obj/effect/turf_decal/stripes/corner, -/obj/machinery/camera{ - c_tag = "Escape Podbay"; - dir = 8 - }, -/turf/open/floor/plasteel, -/area/escapepodbay) "era" = ( /obj/machinery/computer/operating, /obj/machinery/camera{ @@ -20675,7 +20685,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "4-8" }, @@ -20990,19 +20999,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/fore) -"eHw" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/ramp_middle{ - dir = 1 - }, -/turf/open/floor/plasteel/stairs{ - dir = 1 - }, -/area/escapepodbay) "eHD" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 30 @@ -21017,6 +21013,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) "eHM" = ( @@ -21026,6 +21023,7 @@ dir = 8 }, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, /area/bridge) "eHU" = ( @@ -21044,9 +21042,9 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/effect/mapping_helpers/mail_sorting/service/library, /obj/structure/disposalpipe/sorting/mail{ - dir = 8; - sortType = 16 + dir = 8 }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) @@ -21303,9 +21301,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/mail_sorting/engineering/ce_office, /obj/structure/disposalpipe/sorting/mail/flip{ - dir = 8; - sortType = 5 + dir = 8 }, /turf/open/floor/plasteel, /area/engine/foyer) @@ -21580,18 +21578,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/carpet, /area/crew_quarters/fitness) -"eRg" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 4 - }, -/obj/machinery/advanced_airlock_controller{ - pixel_y = 24 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plating, -/area/escapepodbay) "eRj" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -21619,6 +21605,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/crew_quarters/locker) "eRA" = ( @@ -21679,9 +21666,9 @@ dir = 8 }, /obj/structure/disposalpipe/sorting/mail{ - dir = 1; - sortType = 12 + dir = 1 }, +/obj/effect/mapping_helpers/mail_sorting/science/research, /turf/open/floor/plasteel/white, /area/science/research) "eTe" = ( @@ -21737,7 +21724,6 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/crew_quarters/locker) "eUI" = ( @@ -21765,7 +21751,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ - dir = 9 + dir = 10 }, /turf/open/floor/plasteel, /area/hallway/primary/central) @@ -21926,7 +21912,6 @@ /turf/open/floor/plasteel, /area/hallway/primary/port) "eWF" = ( -/obj/structure/reagent_dispensers/fueltank, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -21939,6 +21924,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/maintenance/starboard/fore) "eWI" = ( @@ -22280,9 +22266,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -22622,12 +22605,12 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ icon_state = "1-4" }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "fiz" = ( @@ -22708,9 +22691,6 @@ /obj/structure/noticeboard{ pixel_y = 32 }, -/obj/structure/disposalpipe/junction{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 }, @@ -22724,6 +22704,9 @@ dir = 1 }, /obj/effect/turf_decal/trimline/brown/filled/corner/lower, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/plasteel, /area/quartermaster/office) "fkf" = ( @@ -22815,6 +22798,9 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "flu" = ( @@ -22919,13 +22905,13 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 8; - sortType = 9 - }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/structure/disposalpipe/sorting/mail{ + dir = 8 + }, +/obj/effect/mapping_helpers/mail_sorting/medbay/general, /turf/open/floor/plating, /area/maintenance/aft) "fnr" = ( @@ -22987,6 +22973,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/central) "foa" = ( @@ -23438,12 +23425,10 @@ pixel_y = 3 }, /obj/item/stack/sheet/mineral/plasma, -/obj/structure/disposalpipe/junction/yjunction{ - dir = 4 - }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/science/misc_lab) "fwD" = ( @@ -23477,6 +23462,15 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"fxr" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/escapepodbay) "fxX" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/pump, @@ -24136,9 +24130,6 @@ "fJy" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -24146,6 +24137,7 @@ icon_state = "1-4" }, /obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/port) "fJG" = ( @@ -24336,6 +24328,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) "fLf" = ( @@ -24358,9 +24351,9 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/mail_sorting/supply/disposals, /obj/structure/disposalpipe/sorting/mail/flip{ - dir = 1; - sortType = 1 + dir = 1 }, /turf/open/floor/plating, /area/maintenance/port) @@ -24564,9 +24557,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/plasteel, /area/quartermaster/storage) "fQt" = ( @@ -24828,9 +24818,12 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/sorting/mail/flip{ - dir = 2; - sortTypes = list("13","28") + dir = 2 }, +/obj/effect/mapping_helpers/mail_sorting/science/xenobiology, +/obj/effect/mapping_helpers/mail_sorting/science/toxins, +/obj/effect/mapping_helpers/mail_sorting/science/rd_office, +/obj/effect/mapping_helpers/mail_sorting/science/research, /turf/open/floor/plasteel/white, /area/science/xenobiology) "fWL" = ( @@ -25032,6 +25025,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/crew_quarters/locker) "gbe" = ( @@ -25057,15 +25051,6 @@ }, /turf/open/floor/plasteel/white, /area/science/mixing) -"gbo" = ( -/obj/structure/table, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -2; - pixel_y = -1 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, -/area/crew_quarters/locker) "gbM" = ( /obj/structure/table, /obj/item/hand_labeler, @@ -25185,6 +25170,10 @@ }, /turf/open/floor/plasteel, /area/quartermaster/storage) +"gcL" = ( +/obj/machinery/recycler, +/turf/open/floor/plating/airless, +/area/escapepodbay) "gcP" = ( /obj/structure/sign/warning/electricshock{ pixel_y = 32 @@ -26255,6 +26244,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/crew_quarters/locker) "gAh" = ( @@ -26371,14 +26361,6 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/plasteel, /area/security/prison) -"gBj" = ( -/obj/machinery/conveyor{ - dir = 4; - id = "shipbreaking" - }, -/obj/structure/railing, -/turf/open/floor/plating/airless, -/area/escapepodbay) "gBO" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/trimline/white/arrow_ccw{ @@ -26394,11 +26376,6 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) -"gBZ" = ( -/obj/structure/table, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, -/area/crew_quarters/locker) "gCp" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, @@ -26539,6 +26516,9 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/misc_lab) "gFO" = ( @@ -26734,6 +26714,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/central) "gIR" = ( @@ -26855,6 +26836,15 @@ }, /turf/open/floor/plasteel/dark, /area/tcommsat/storage) +"gLC" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/maintenance/aft) "gLV" = ( /obj/machinery/camera{ c_tag = "Fore Primary Hallway Central"; @@ -27061,6 +27051,9 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/plating, /area/maintenance/port) "gRk" = ( @@ -27215,6 +27208,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/port) "gSj" = ( @@ -27224,13 +27220,13 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, /obj/structure/cable{ icon_state = "2-4" }, /obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "gSn" = ( @@ -27313,27 +27309,16 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/plasteel/white, /area/medical/medbay/aft) -"gTc" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner, -/turf/open/floor/plasteel, -/area/escapepodbay) "gTe" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 8; - sortType = 12 - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, +/obj/structure/disposalpipe/junction/flip{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) "gTh" = ( @@ -27375,9 +27360,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -27511,10 +27493,6 @@ /turf/open/floor/circuit/telecomms, /area/science/xenobiology) "gWr" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 4; - sortType = 21 - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, @@ -27528,6 +27506,10 @@ icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/mail_sorting/service/hydroponics, +/obj/structure/disposalpipe/sorting/mail{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "gWA" = ( @@ -27554,15 +27536,6 @@ }, /turf/open/floor/wood, /area/medical/psych) -"gXf" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/escapepodbay) "gXs" = ( /obj/structure/lattice, /turf/open/space/basic, @@ -28226,7 +28199,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 4 }, /turf/open/floor/plasteel, @@ -28380,6 +28352,13 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) +"hld" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/turf/open/floor/plasteel, +/area/escapepodbay) "hlp" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -28656,12 +28635,6 @@ }, /turf/open/floor/plasteel, /area/security/checkpoint/auxiliary) -"hqB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/locker) "hqM" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8; @@ -28814,6 +28787,7 @@ pixel_x = 24; pixel_y = 1 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) "hsq" = ( @@ -28841,10 +28815,10 @@ name = "Captain RC"; pixel_x = -30 }, -/obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ dir = 4 }, +/obj/machinery/disposal/bin/tagger, /turf/open/floor/stone, /area/crew_quarters/heads/captain) "hsA" = ( @@ -28975,10 +28949,6 @@ }, /turf/open/floor/stone, /area/crew_quarters/heads/captain) -"huK" = ( -/obj/machinery/computer/shipbreaker, -/turf/open/floor/plasteel/dark, -/area/escapepodbay) "huO" = ( /obj/structure/table, /obj/machinery/photocopier/faxmachine{ @@ -29020,6 +28990,13 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) +"hwn" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/turf/open/floor/plasteel, +/area/escapepodbay) "hwq" = ( /obj/machinery/atmospherics/components/binary/pump{ name = "Plasma Tank Pump" @@ -29387,6 +29364,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft) "hCi" = ( @@ -29654,6 +29632,18 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/fore) +"hHb" = ( +/obj/machinery/light_switch{ + pixel_x = -24 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/turf/open/floor/plasteel, +/area/escapepodbay) "hHJ" = ( /obj/effect/turf_decal/trimline/white/filled/corner/lower{ dir = 4 @@ -29840,9 +29830,10 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/effect/mapping_helpers/mail_sorting/science/rd_office, /obj/structure/disposalpipe/sorting/mail{ dir = 1; - sortType = 13 + pixel_y = -1 }, /turf/open/floor/plasteel/white, /area/science/research) @@ -30248,13 +30239,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/theatre) -"hRy" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "hRB" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/wood/parquet, @@ -30384,12 +30368,12 @@ /area/security/checkpoint/service) "hTW" = ( /obj/machinery/light, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "hTY" = ( @@ -30708,6 +30692,9 @@ /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "hZg" = ( @@ -31072,6 +31059,9 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "ieh" = ( @@ -31088,13 +31078,13 @@ /obj/machinery/computer/security/telescreen/vault{ pixel_y = 30 }, -/obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ dir = 4 }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 }, +/obj/machinery/disposal/bin/tagger, /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) "ieo" = ( @@ -31472,6 +31462,8 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 }, +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) "imT" = ( @@ -31522,6 +31514,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/port) "inu" = ( @@ -31808,6 +31801,13 @@ }, /turf/open/floor/plasteel, /area/security/main) +"iqP" = ( +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "iqU" = ( /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ dir = 1 @@ -31852,6 +31852,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft) "irC" = ( @@ -31926,17 +31927,6 @@ }, /turf/open/floor/plasteel/dark, /area/engine/engine_smes) -"isG" = ( -/obj/structure/rack, -/obj/item/tank/internals/oxygen, -/obj/item/storage/toolbox/mechanical, -/obj/item/storage/bag/sheetsnatcher, -/obj/item/melee/sledgehammer, -/obj/item/storage/bag/trash, -/obj/item/broom, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel/dark, -/area/escapepodbay) "isH" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -32031,6 +32021,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"iuW" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/trimline/purple/filled/line/lower{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel, +/area/hallway/primary/aft_starboard) "iuY" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 @@ -32216,9 +32215,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -32228,6 +32224,9 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "iyR" = ( @@ -32330,15 +32329,15 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ icon_state = "2-4" }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "iAN" = ( @@ -32486,7 +32485,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 4 }, /turf/open/floor/plasteel, @@ -32643,6 +32641,18 @@ }, /turf/open/floor/plasteel/dark, /area/maintenance/disposal/incinerator) +"iGZ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/escapepodbay) "iHr" = ( /obj/structure/cable{ icon_state = "4-8" @@ -32819,9 +32829,6 @@ /turf/open/floor/engine/air, /area/engine/atmos/distro) "iJY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/power/apc{ areastring = "/area/hallway/primary/port"; name = "Port Hall APC"; @@ -33134,6 +33141,15 @@ dir = 1 }, /area/library) +"iOa" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/escapepodbay) "iOb" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -33145,6 +33161,13 @@ }, /turf/open/floor/plasteel/white, /area/science/research) +"iOc" = ( +/obj/machinery/conveyor_switch/oneway{ + id = "shipbreaking"; + name = "shipbreaking recycler conveyer" + }, +/turf/open/floor/plating/airless, +/area/escapepodbay) "iOB" = ( /obj/machinery/power/apc{ areastring = "/area/medical/chemistry"; @@ -33453,6 +33476,7 @@ /obj/effect/turf_decal/trimline/brown/warning/lower{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/central) "iUE" = ( @@ -33797,7 +33821,6 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) "iZZ" = ( @@ -33874,6 +33897,19 @@ }, /turf/open/floor/plasteel/white, /area/medical/virology) +"jcd" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/external{ + name = "External Access"; + req_access_txt = "12" + }, +/obj/machinery/atmospherics/pipe/layer_manifold{ + dir = 4 + }, +/turf/open/floor/plating, +/area/escapepodbay) "jcf" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/components/unary/passive_vent{ @@ -34051,15 +34087,6 @@ dir = 4 }, /area/hallway/secondary/entry) -"jfE" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/escapepodbay) "jfG" = ( /obj/machinery/newscaster{ pixel_y = -27 @@ -34480,9 +34507,6 @@ /turf/open/space/basic, /area/space/nearstation) "jnH" = ( -/obj/structure/disposalpipe/sorting/mail{ - sortType = 27 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, @@ -34492,6 +34516,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) "joa" = ( @@ -34501,6 +34528,15 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"joc" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/escapepodbay) "joq" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical{ @@ -34657,9 +34693,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/plasteel, /area/quartermaster/storage) "jpO" = ( @@ -34669,9 +34702,6 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "jpZ" = ( @@ -34748,6 +34778,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/plating{ icon_state = "platingdmg3" }, @@ -34822,13 +34855,13 @@ /area/security/prison/hallway) "jrX" = ( /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, /obj/effect/turf_decal/trimline/purple/filled/corner/lower, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) "jsa" = ( @@ -34933,6 +34966,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating{ icon_state = "platingdmg3" }, @@ -35197,7 +35231,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 5 }, /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) @@ -35212,6 +35246,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/central) "jCA" = ( @@ -35277,11 +35312,6 @@ }, /turf/open/floor/plasteel, /area/security/brig) -"jDk" = ( -/obj/machinery/suit_storage_unit/standard_unit, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel/dark, -/area/escapepodbay) "jDo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -35407,15 +35437,15 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "jFQ" = ( @@ -35439,12 +35469,10 @@ "jGz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/port) "jGB" = ( @@ -35611,6 +35639,9 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "jJC" = ( @@ -35714,7 +35745,6 @@ /turf/open/floor/plasteel, /area/construction/mining/aux_base) "jMV" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "1-8" }, @@ -36076,7 +36106,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) "jVb" = ( @@ -36177,9 +36206,9 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/effect/mapping_helpers/mail_sorting/science/toxins, /obj/structure/disposalpipe/sorting/mail{ - dir = 1; - sortTypes = list("24","25") + dir = 1 }, /turf/open/floor/plasteel/white, /area/science/research) @@ -36343,9 +36372,6 @@ "jZx" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, /obj/structure/cable{ icon_state = "1-8" }, @@ -36357,6 +36383,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/crew_quarters/locker) "kao" = ( @@ -36484,19 +36511,6 @@ }, /turf/open/floor/plasteel, /area/security/prison) -"kdn" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "12" - }, -/obj/machinery/atmospherics/pipe/layer_manifold{ - dir = 4 - }, -/turf/open/floor/plating, -/area/escapepodbay) "kdv" = ( /obj/effect/turf_decal/bot_white, /obj/effect/decal/cleanable/dirt, @@ -36698,6 +36712,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft) "khF" = ( @@ -36940,7 +36955,6 @@ name = "Aft Hall APC"; pixel_x = -25 }, -/obj/structure/disposalpipe/segment, /obj/structure/cable, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 8 @@ -37188,6 +37202,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft) "kqw" = ( @@ -37343,6 +37358,18 @@ }, /turf/open/floor/plasteel, /area/security/prison/hallway) +"ksE" = ( +/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ + dir = 4 + }, +/obj/machinery/advanced_airlock_controller{ + pixel_y = 24 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/plating, +/area/escapepodbay) "ksQ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -37894,10 +37921,6 @@ /turf/open/floor/plating, /area/maintenance/disposal) "kEF" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 4; - sortType = 20 - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, @@ -37911,6 +37934,10 @@ icon_state = "2-8" }, /obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/mail_sorting/service/kitchen, +/obj/structure/disposalpipe/sorting/mail{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "kEH" = ( @@ -37947,21 +37974,6 @@ /obj/structure/lattice/catwalk, /turf/closed/wall/r_wall, /area/engine/atmos/distro) -"kGn" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) "kGQ" = ( /obj/machinery/camera{ c_tag = "Locker Room Toilets"; @@ -37994,7 +38006,6 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "1-2" }, @@ -38004,6 +38015,9 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 }, +/obj/structure/disposalpipe/junction{ + dir = 2 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "kHt" = ( @@ -38124,18 +38138,6 @@ /obj/item/toy/figure/curator, /turf/open/floor/plasteel/cult, /area/library) -"kKA" = ( -/obj/machinery/light_switch{ - pixel_x = -24 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/turf/open/floor/plasteel, -/area/escapepodbay) "kKK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -38157,7 +38159,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 1 }, /obj/effect/turf_decal/trimline/white/filled/corner/lower, @@ -38384,6 +38385,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/wood, /area/bridge/meeting_room) "kOd" = ( @@ -38835,7 +38837,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 4 }, /turf/open/floor/plasteel, @@ -38849,7 +38850,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 1 }, /turf/open/floor/plasteel, @@ -38876,10 +38876,6 @@ /turf/open/floor/plasteel, /area/construction/mining/aux_base) "laB" = ( -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 4; - sortType = 7 - }, /obj/effect/turf_decal/loading_area{ dir = 8 }, @@ -38895,6 +38891,10 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 4 + }, +/obj/effect/mapping_helpers/mail_sorting/security/general, /turf/open/floor/plasteel, /area/security/main) "laN" = ( @@ -38993,6 +38993,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/crew_quarters/locker) "lbX" = ( @@ -39018,11 +39019,6 @@ }, /turf/open/floor/plating, /area/crew_quarters/heads/cmo) -"ldA" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel/dark, -/area/escapepodbay) "ldU" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "hop"; @@ -39105,9 +39101,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -39139,6 +39132,9 @@ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "lfA" = ( @@ -39275,10 +39271,10 @@ /obj/machinery/light{ dir = 1 }, -/obj/structure/disposaloutlet, /obj/structure/disposalpipe/trunk{ dir = 2 }, +/obj/machinery/disposal/bin/tagger, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "lit" = ( @@ -39671,6 +39667,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating{ icon_state = "platingdmg3" }, @@ -39727,6 +39726,9 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "lnS" = ( @@ -39814,6 +39816,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) "lpn" = ( @@ -39924,6 +39927,16 @@ }, /turf/open/floor/plasteel/white, /area/medical/virology) +"lsn" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plasteel, +/area/escapepodbay) "lsK" = ( /turf/closed/wall/r_wall, /area/construction) @@ -39965,6 +39978,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/plasteel, /area/engine/foyer) "lth" = ( @@ -40198,6 +40214,9 @@ /obj/effect/turf_decal/trimline/brown/filled/corner/lower{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "lyW" = ( @@ -40461,7 +40480,6 @@ /turf/open/floor/plasteel, /area/hallway/primary/starboard) "lEr" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, @@ -40484,10 +40502,6 @@ /obj/structure/sign/warning/securearea{ pixel_x = -32 }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 2; - sortType = 11 - }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 8 }, @@ -40533,13 +40547,13 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "lGw" = ( -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/brown/filled/corner/lower{ dir = 1 }, /obj/effect/turf_decal/trimline/brown/filled/corner/lower{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/quartermaster/office) "lGB" = ( @@ -40562,6 +40576,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/central) "lHg" = ( @@ -40856,6 +40871,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/quartermaster/sorting) "lME" = ( @@ -40898,11 +40914,12 @@ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/purple/filled/corner/lower, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) "lND" = ( -/obj/structure/disposalpipe/sorting/mail{ - sortType = 23 +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) @@ -41122,13 +41139,6 @@ }, /turf/open/floor/plating, /area/construction) -"lSM" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/science/misc_lab) "lSN" = ( /obj/structure/cable{ icon_state = "4-8" @@ -41183,6 +41193,7 @@ dir = 8; pixel_y = -22 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) "lUh" = ( @@ -41577,6 +41588,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "mcr" = ( @@ -41587,7 +41601,6 @@ /turf/open/floor/wood, /area/bridge/meeting_room) "mcw" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -41607,7 +41620,6 @@ /turf/open/water/safe, /area/hydroponics/garden) "mcK" = ( -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ dir = 8 }, @@ -41634,7 +41646,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "4-8" }, @@ -41644,6 +41655,9 @@ /obj/effect/turf_decal/trimline/purple/filled/corner/lower{ dir = 4 }, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/misc_lab) "mdx" = ( @@ -41902,10 +41916,6 @@ /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating, /area/maintenance/fore) -"mit" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, -/area/engine/foyer) "miL" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -42284,10 +42294,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/disposalpipe/sorting/mail{ - dir = 8; - sortType = 22 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -42297,6 +42303,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/effect/mapping_helpers/mail_sorting/service/janitor_closet, +/obj/structure/disposalpipe/sorting/mail{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/aft) "moT" = ( @@ -42916,16 +42926,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"mAt" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/plasteel, -/area/escapepodbay) "mAv" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -42935,9 +42935,6 @@ /area/space/nearstation) "mAz" = ( /obj/machinery/holopad, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -42947,6 +42944,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/foyer) "mAA" = ( @@ -43418,9 +43418,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ icon_state = "2-4" }, @@ -43428,6 +43425,10 @@ /obj/effect/turf_decal/trimline/purple/filled/corner/lower{ dir = 4 }, +/obj/effect/mapping_helpers/mail_sorting/science/robotics, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 2 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) "mHx" = ( @@ -43668,6 +43669,7 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/crew_quarters/locker) "mNg" = ( @@ -43714,15 +43716,16 @@ /turf/open/floor/plasteel/dark, /area/security/prison) "mNI" = ( -/obj/structure/disposalpipe/sorting/mail{ - sortType = 15 - }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 4 }, /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 1 }, +/obj/effect/mapping_helpers/mail_sorting/service/hop_office, +/obj/structure/disposalpipe/sorting/mail{ + dir = 2 + }, /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) "mNK" = ( @@ -44054,6 +44057,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/central) "mTO" = ( @@ -44112,6 +44116,17 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/exit) +"mUs" = ( +/obj/structure/rack, +/obj/item/tank/internals/oxygen, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/bag/sheetsnatcher, +/obj/item/melee/sledgehammer, +/obj/item/storage/bag/trash, +/obj/item/broom, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/dark, +/area/escapepodbay) "mUA" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -44247,15 +44262,6 @@ }, /turf/open/floor/plasteel/white, /area/storage/tech) -"mXa" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/escapepodbay) "mXm" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -44266,6 +44272,9 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/plating, /area/maintenance/port) "mXr" = ( @@ -44725,7 +44734,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, -/obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "1-2" }, @@ -44792,6 +44800,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/central) "nfe" = ( @@ -44947,7 +44956,6 @@ /turf/open/floor/engine, /area/science/xenobiology) "niA" = ( -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 8 }, @@ -44965,7 +44973,6 @@ c_tag = "Aft Primary Hallway 2"; dir = 4 }, -/obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "1-2" }, @@ -45100,13 +45107,12 @@ /turf/open/floor/plasteel, /area/security/prison) "nmL" = ( -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 1; - sortType = 2 - }, /obj/effect/turf_decal/trimline/brown/warning/lower{ dir = 8 }, +/obj/structure/disposalpipe/sorting/wrap/flip{ + dir = 1 + }, /turf/open/floor/plasteel, /area/quartermaster/sorting) "nmP" = ( @@ -45194,10 +45200,10 @@ /turf/open/floor/plasteel, /area/security/brig) "npb" = ( -/obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ dir = 8 }, +/obj/machinery/disposal/bin/tagger, /turf/open/floor/plasteel, /area/crew_quarters/heads/chief) "npK" = ( @@ -45258,10 +45264,6 @@ /turf/open/floor/plasteel, /area/security/checkpoint/medical) "nqF" = ( -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 4; - sortType = 8 - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/structure/cable{ @@ -45270,6 +45272,10 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/effect/mapping_helpers/mail_sorting/security/hos_office, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/main) "nqN" = ( @@ -45318,9 +45324,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 1 }, @@ -45511,7 +45514,6 @@ /obj/structure/sign/departments/minsky/engineering/engineering{ pixel_x = -32 }, -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 8 }, @@ -45536,12 +45538,12 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/foyer) "nvA" = ( @@ -45735,16 +45737,6 @@ }, /turf/closed/wall, /area/medical/paramedic) -"nza" = ( -/obj/structure/chair{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/escapepodbay) -"nzd" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) "nzs" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/machinery/light/small{ @@ -46001,6 +45993,13 @@ /obj/effect/spawner/structure/window/plasma/reinforced/shutter, /turf/open/floor/plating, /area/engine/atmos/mix) +"nDj" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel, +/area/escapepodbay) "nDk" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, @@ -46519,15 +46518,6 @@ /obj/effect/turf_decal/trimline/green/filled/line/lower, /turf/open/floor/plasteel, /area/hydroponics/garden) -"nPK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/escapepodbay) "nQi" = ( /obj/structure/window/reinforced{ dir = 4 @@ -47041,6 +47031,15 @@ }, /turf/open/floor/plasteel, /area/security/checkpoint/service) +"nYC" = ( +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -26 + }, +/obj/machinery/suit_storage_unit/standard_unit, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/dark, +/area/escapepodbay) "nZd" = ( /obj/structure/table/wood/fancy, /obj/item/reagent_containers/food/condiment/saltshaker{ @@ -47096,7 +47095,6 @@ /turf/open/floor/plasteel, /area/security/prison/hallway) "oaG" = ( -/obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, /obj/machinery/airalarm{ pixel_y = 24 @@ -47104,6 +47102,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 5 }, +/obj/machinery/disposal/bin/tagger, /turf/open/floor/plasteel, /area/quartermaster/office) "oaO" = ( @@ -47173,10 +47172,10 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/machinery/disposal/bin, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, +/obj/machinery/disposal/bin/tagger, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/cmo) "ocg" = ( @@ -47582,9 +47581,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/plasteel, /area/quartermaster/storage) "okN" = ( @@ -47658,9 +47654,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/turf_decal/trimline/brown/filled/corner/lower, /obj/effect/turf_decal/trimline/brown/filled/corner/lower{ dir = 4 @@ -47705,6 +47698,7 @@ /obj/effect/turf_decal/trimline/brown/filled/corner/lower{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/central) "onb" = ( @@ -48140,6 +48134,9 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "ovp" = ( @@ -48585,15 +48582,6 @@ }, /turf/open/floor/plating, /area/engine/atmos/distro) -"oAP" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -26 - }, -/obj/machinery/suit_storage_unit/standard_unit, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel/dark, -/area/escapepodbay) "oBt" = ( /obj/machinery/cell_charger, /obj/structure/table, @@ -48704,22 +48692,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) -"oEi" = ( -/obj/machinery/power/apc{ - areastring = "/area/escapepodbay"; - dir = 8; - name = "Podbay APC"; - pixel_x = -25 - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/railing/corner, -/obj/effect/turf_decal/stripes/corner, -/turf/open/floor/plasteel, -/area/escapepodbay) "oEy" = ( /obj/item/kirbyplants/random, /obj/machinery/light, @@ -49178,6 +49150,9 @@ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "oNF" = ( @@ -49367,11 +49342,11 @@ /area/science/xenobiology) "oRG" = ( /obj/structure/table, -/obj/machinery/cell_charger, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 3; name = "3maintenance loot spawner" }, +/obj/machinery/cell_charger, /turf/open/floor/plating, /area/maintenance/starboard/fore) "oRI" = ( @@ -49389,20 +49364,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plasteel, /area/security/prison) -"oSg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/trimline/blue/filled/line/lower{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "oSq" = ( /obj/structure/cable{ icon_state = "1-2" @@ -49643,13 +49604,6 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, /area/quartermaster/storage) -"oXD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/plasteel, -/area/escapepodbay) "oXE" = ( /obj/structure/sign/departments/restroom{ pixel_x = 32 @@ -49707,9 +49661,7 @@ /area/quartermaster/miningdock) "oYF" = ( /obj/effect/turf_decal/trimline/white/filled/line/lower, -/obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220 - }, +/obj/effect/turf_decal/trimline/secred/warning/lower, /turf/open/floor/plasteel, /area/hallway/secondary/exit) "oYU" = ( @@ -49747,10 +49699,6 @@ }, /turf/open/water/safe, /area/hydroponics/garden) -"oZm" = ( -/obj/machinery/recycler, -/turf/open/floor/plating/airless, -/area/escapepodbay) "oZu" = ( /obj/item/paper_bin{ pixel_x = 1; @@ -50054,6 +50002,9 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/plasteel, /area/science/misc_lab) "phd" = ( @@ -50658,21 +50609,6 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) -"pqB" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/machinery/light, -/obj/structure/rack, -/obj/item/tank/internals/oxygen, -/obj/item/storage/toolbox/mechanical, -/obj/item/storage/bag/sheetsnatcher, -/obj/item/melee/sledgehammer, -/obj/item/storage/bag/trash, -/obj/item/broom, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel/dark, -/area/escapepodbay) "pqE" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -50705,7 +50641,6 @@ dir = 1 }, /obj/machinery/door/firedoor/border_only, -/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) "prd" = ( @@ -50811,9 +50746,7 @@ "psO" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/trimline/white/filled/line/lower, -/obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220 - }, +/obj/effect/turf_decal/trimline/secred/warning/lower, /turf/open/floor/plasteel, /area/hallway/secondary/exit) "pth" = ( @@ -51199,6 +51132,10 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/effect/mapping_helpers/mail_sorting/service/hop_office, +/obj/structure/disposalpipe/sorting/mail{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "pzg" = ( @@ -51509,6 +51446,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/central) "pEf" = ( @@ -51581,13 +51519,16 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/mail_sorting/supply/cargo_bay, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 1 + }, /turf/open/floor/plasteel, /area/quartermaster/office) "pFh" = ( @@ -51648,9 +51589,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -51660,6 +51598,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "pGs" = ( @@ -51856,24 +51797,19 @@ icon_state = "0-4" }, /obj/item/radio/intercom{ - anyai = 1; freerange = 1; listening = 0; name = "Custom Channel"; pixel_y = -27 }, /obj/item/radio/intercom{ - anyai = 1; - broadcasting = 0; freerange = 1; frequency = 1447; name = "Private Channel"; pixel_y = 20 }, /obj/item/radio/intercom{ - broadcasting = 0; freerange = 1; - listening = 1; name = "Common Channel"; pixel_y = -37 }, @@ -51917,6 +51853,12 @@ }, /turf/open/floor/plasteel/white, /area/science/xenobiology) +"pMy" = ( +/obj/structure/chair{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/escapepodbay) "pNc" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plasteel, @@ -51996,9 +51938,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/plasteel, /area/quartermaster/office) "pPt" = ( @@ -52031,16 +51970,15 @@ /turf/open/space/basic, /area/solar/port/fore) "pQc" = ( -/obj/structure/disposaloutlet{ - desc = "An outlet for the pneumatic disposal system. One-way so you can't throw your virus down the tubes."; - name = "Mail Outlet" - }, /obj/structure/disposalpipe/trunk{ dir = 8 }, /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 1 }, +/obj/machinery/disposal/bin/tagger{ + name = "sample delivery unit" + }, /turf/open/floor/plasteel/white, /area/medical/virology) "pQd" = ( @@ -52097,6 +52035,22 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"pQy" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Escape Podbay" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/ramp_middle, +/turf/open/floor/plasteel, +/area/escapepodbay) "pQS" = ( /obj/structure/window/reinforced, /obj/structure/chair/stool{ @@ -52124,6 +52078,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/central) "pRg" = ( @@ -52137,9 +52092,6 @@ c_tag = "Port Hallway"; dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -52278,6 +52230,9 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "pTI" = ( @@ -52429,9 +52384,6 @@ codes_txt = "patrol;next_patrol=AIE"; location = "AftH" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -52441,9 +52393,6 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "pWH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -52453,6 +52402,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/plasteel, /area/science/misc_lab) "pWK" = ( @@ -52463,6 +52415,15 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/crew_quarters/fitness) +"pWM" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/escapepodbay) "pXe" = ( /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -52535,9 +52496,6 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "pXV" = ( @@ -52560,12 +52518,12 @@ /obj/structure/plasticflaps{ opacity = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/medbay/central) "pYm" = ( @@ -52619,16 +52577,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel/white, /area/engine/atmos/mix) -"pZF" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 2; - sortType = 14 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft_starboard) "pZI" = ( /obj/machinery/atmospherics/pipe/manifold/yellow/hidden, /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ @@ -52905,6 +52853,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) "qgA" = ( @@ -52917,9 +52866,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ icon_state = "1-4" }, @@ -53083,6 +53029,9 @@ /obj/effect/turf_decal/trimline/secred/filled/corner/lower{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "qiP" = ( @@ -53114,12 +53063,6 @@ }, /turf/open/floor/plasteel/white, /area/science/xenobiology) -"qjc" = ( -/obj/structure/disposalpipe/sorting/mail{ - sortType = 10 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft_starboard) "qjq" = ( /obj/machinery/ai/data_core, /obj/structure/ethernet_cable{ @@ -53425,14 +53368,6 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/medical/psych) -"qot" = ( -/obj/effect/turf_decal/bot, -/obj/structure/reagent_dispensers/fueltank, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/science/misc_lab) "qov" = ( /obj/structure/sign/warning/electricshock, /turf/closed/wall/r_wall, @@ -53456,6 +53391,9 @@ /obj/effect/turf_decal/trimline/purple/filled/corner/lower{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/misc_lab) "qoQ" = ( @@ -53652,9 +53590,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/plasteel, /area/quartermaster/storage) "qtS" = ( @@ -53721,10 +53656,10 @@ /obj/machinery/light_switch{ pixel_y = -23 }, -/obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ dir = 1 }, +/obj/machinery/disposal/bin/tagger, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) "quT" = ( @@ -53778,6 +53713,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) "qvO" = ( @@ -53837,6 +53773,12 @@ /obj/effect/spawner/lootdrop/maintenance/three, /turf/open/floor/plating, /area/maintenance/port/fore) +"qxE" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/escapepodbay) "qyo" = ( /obj/machinery/camera{ c_tag = "Central Primary Hallway South"; @@ -53859,9 +53801,6 @@ /area/hallway/primary/central) "qyp" = ( /obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) "qyG" = ( @@ -54090,6 +54029,10 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/mail_sorting/medbay/virology, +/obj/structure/disposalpipe/sorting/mail{ + dir = 2 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) "qEA" = ( @@ -54224,11 +54167,6 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/secondarydatacore) -"qGo" = ( -/obj/structure/table, -/obj/item/storage/toolbox/mechanical, -/turf/open/floor/plasteel/dark, -/area/escapepodbay) "qGt" = ( /obj/structure/cable{ icon_state = "1-2" @@ -54278,19 +54216,9 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/turf_decal/trimline/brown/filled/line/lower, /turf/open/floor/plasteel, /area/quartermaster/storage) -"qGI" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "qGJ" = ( /obj/machinery/advanced_airlock_controller{ pixel_y = 24 @@ -54405,7 +54333,6 @@ /turf/open/floor/plasteel/white, /area/medical/storage) "qHR" = ( -/obj/effect/spawner/structure/window/reinforced/shutter, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -54418,6 +54345,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/spawner/structure/window/reinforced/shutter, /turf/open/floor/plating, /area/maintenance/starboard/fore) "qIr" = ( @@ -54429,6 +54357,10 @@ /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 4 }, +/obj/item/stack/packageWrap{ + pixel_x = -9; + pixel_y = 11 + }, /turf/open/floor/plasteel/white, /area/medical/virology) "qIs" = ( @@ -54637,9 +54569,6 @@ "qKZ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ icon_state = "2-4" }, @@ -54839,6 +54768,10 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/quartermaster/storage) +"qOf" = ( +/obj/machinery/computer/shipbreaker, +/turf/open/floor/plasteel/dark, +/area/escapepodbay) "qOl" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -55144,6 +55077,9 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "qTP" = ( @@ -55599,6 +55535,9 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/bridge) "rcL" = ( @@ -55625,7 +55564,6 @@ /obj/machinery/status_display/evac{ pixel_x = -32 }, -/obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "1-2" }, @@ -55831,6 +55769,9 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "rhn" = ( @@ -55887,9 +55828,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/plasteel, /area/quartermaster/storage) "riJ" = ( @@ -55972,7 +55910,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -55997,6 +55934,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) "rkj" = ( @@ -56016,6 +55954,16 @@ }, /turf/open/floor/plating, /area/storage/tech) +"rkA" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "shipbreaking" + }, +/obj/structure/railing{ + dir = 10 + }, +/turf/open/floor/plating/airless, +/area/escapepodbay) "rkM" = ( /obj/structure/closet, /turf/open/floor/plating, @@ -56072,6 +56020,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) "rmz" = ( @@ -56087,13 +56036,13 @@ "rmD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/aft) "rmT" = ( @@ -56184,9 +56133,6 @@ c_tag = "Port Hallway 3"; dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/plasteel, /area/hallway/primary/port) "roY" = ( @@ -56387,6 +56333,9 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/plasteel, /area/engine/foyer) "rss" = ( @@ -56535,9 +56484,7 @@ /area/engine/atmos/distro) "rwm" = ( /obj/effect/turf_decal/delivery, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) "rwt" = ( @@ -56600,7 +56547,6 @@ /turf/open/floor/plasteel/white, /area/medical/sleeper) "rxa" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "4-8" }, @@ -56672,13 +56618,6 @@ /obj/structure/sign/departments/minsky/research/research, /turf/closed/wall/r_wall, /area/science/lab) -"ryg" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/plasteel, -/area/escapepodbay) "rym" = ( /obj/machinery/vending/coffee, /obj/effect/turf_decal/siding/wood/thin{ @@ -57209,10 +57148,6 @@ }, /turf/open/floor/plasteel, /area/quartermaster/storage) -"rHP" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "rHV" = ( /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -57222,6 +57157,15 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) +"rIf" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/escapepodbay) "rIo" = ( /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/trimline/white/arrow_ccw{ @@ -58255,6 +58199,12 @@ }, /turf/open/floor/catwalk_floor/telecomms, /area/ai_monitored/secondarydatacore) +"rZM" = ( +/obj/machinery/light, +/obj/machinery/suit_storage_unit/standard_unit, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/dark, +/area/escapepodbay) "rZU" = ( /obj/machinery/light{ dir = 8; @@ -58573,23 +58523,6 @@ }, /turf/open/floor/plasteel/white, /area/science/xenobiology) -"sfF" = ( -/obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/trimline/engiyellow/filled/line/lower, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "sfG" = ( /obj/machinery/camera{ c_tag = "Brig East" @@ -58703,6 +58636,9 @@ /obj/effect/turf_decal/trimline/purple/filled/corner/lower{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/misc_lab) "sha" = ( @@ -59213,7 +59149,9 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 8 }, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/plasteel, /area/quartermaster/office) "stn" = ( @@ -59434,9 +59372,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/mapping_helpers/mail_sorting/security/detectives_office, /obj/structure/disposalpipe/sorting/mail/flip{ - dir = 1; - sortType = 30 + dir = 1 }, /turf/open/floor/plating, /area/maintenance/fore) @@ -59478,13 +59416,15 @@ "szx" = ( /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, -/obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "1-8" }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "sAl" = ( @@ -59572,9 +59512,9 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, +/obj/effect/mapping_helpers/mail_sorting/science/xenobiology, /obj/structure/disposalpipe/sorting/mail/flip{ - dir = 4; - sortType = 28 + dir = 4 }, /turf/open/floor/plasteel/white, /area/science/xenobiology) @@ -59598,9 +59538,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/turf_decal/trimline/brown/filled/corner/lower, /turf/open/floor/plasteel, /area/quartermaster/storage) @@ -59929,6 +59866,16 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/dark, /area/science/xenobiology) +"sHo" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/plasteel, +/area/escapepodbay) "sHq" = ( /obj/structure/lattice/catwalk, /obj/structure/cable/yellow{ @@ -60008,12 +59955,10 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "sIY" = ( @@ -60046,11 +59991,6 @@ /obj/effect/turf_decal/trimline/neutral, /turf/open/floor/plasteel/dark, /area/engine/atmos/foyer) -"sJy" = ( -/obj/structure/lattice/catwalk, -/obj/structure/marker_beacon, -/turf/open/space/basic, -/area/space/nearstation) "sJG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -60117,13 +60057,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/theatre) -"sLc" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, -/area/escapepodbay) "sLg" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -60228,9 +60161,14 @@ }, /turf/open/floor/plasteel, /area/engine/foyer) -"sMS" = ( -/obj/structure/lattice/catwalk, -/turf/closed/wall, +"sNd" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/plasteel, /area/escapepodbay) "sNL" = ( /obj/structure/closet/crate{ @@ -60312,6 +60250,18 @@ }, /turf/open/floor/plasteel, /area/security/prison) +"sOQ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/trimline/purple/filled/line/lower{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel, +/area/hallway/primary/aft_starboard) "sPc" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -60394,7 +60344,9 @@ /turf/open/floor/plasteel, /area/engine/atmos/distro) "sSb" = ( -/obj/machinery/disposal/bin, +/obj/machinery/disposal/bin{ + name = "sample disposal unit" + }, /obj/structure/sign/warning/deathsposal{ pixel_y = -32 }, @@ -60655,18 +60607,6 @@ }, /turf/open/floor/plasteel, /area/engine/atmos/distro) -"sWS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "sXg" = ( /obj/structure/closet/secure_closet/brig, /obj/effect/turf_decal/bot_red, @@ -60763,6 +60703,9 @@ /obj/effect/turf_decal/trimline/green/filled/line/lower{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "sXE" = ( @@ -60816,13 +60759,13 @@ "sYd" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "1-2" }, /obj/structure/cable{ icon_state = "2-8" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/aft) "sYf" = ( @@ -61402,6 +61345,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) "tiH" = ( @@ -61732,16 +61676,15 @@ "tpg" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/sorting/mail{ - dir = 8; - sortType = 11 - }, /obj/structure/cable{ icon_state = "4-8" }, /obj/structure/cable{ icon_state = "1-8" }, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/aft) "tpA" = ( @@ -61836,6 +61779,19 @@ }, /turf/open/floor/wood, /area/library) +"tro" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/ramp_middle{ + dir = 1 + }, +/turf/open/floor/plasteel/stairs{ + dir = 1 + }, +/area/escapepodbay) "trt" = ( /obj/structure/grille/broken, /turf/open/floor/plating, @@ -61937,6 +61893,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft) "ttn" = ( @@ -61975,6 +61932,24 @@ }, /turf/open/floor/plasteel/dark, /area/engine/atmos/storage) +"tuy" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "tuR" = ( /obj/machinery/door/poddoor/preopen{ id = "barshutters"; @@ -62195,6 +62170,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft) "tzt" = ( @@ -62400,9 +62376,6 @@ /obj/machinery/light{ dir = 8 }, -/obj/structure/disposalpipe/junction/flip{ - dir = 2 - }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 8 }, @@ -62607,6 +62580,9 @@ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "tHB" = ( @@ -62798,6 +62774,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/port/aft) "tKv" = ( @@ -63044,9 +63021,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/turf_decal/trimline/brown/filled/corner/lower{ dir = 1 }, @@ -63160,7 +63134,6 @@ /turf/open/floor/plasteel, /area/engine/engineering) "tQD" = ( -/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) "tQU" = ( @@ -63214,10 +63187,10 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/aft) "tRq" = ( @@ -63497,7 +63470,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) "tXG" = ( @@ -63760,6 +63732,9 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/plating, /area/maintenance/port) "ucA" = ( @@ -63772,6 +63747,14 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload) +"ucB" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "shipbreaking" + }, +/obj/structure/railing, +/turf/open/floor/plating/airless, +/area/escapepodbay) "ucC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -63800,12 +63783,14 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/plasteel/dark, /area/bridge) "ucR" = ( /obj/machinery/computer/atmos_sim{ - dir = 4; - mode = 1 + dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line/lower, /turf/open/floor/plasteel/white, @@ -63843,15 +63828,9 @@ }, /turf/open/floor/plasteel/freezer, /area/crew_quarters/toilet) -"udv" = ( -/obj/machinery/conveyor{ - dir = 4; - id = "shipbreaking" - }, -/obj/structure/railing{ - dir = 10 - }, -/turf/open/floor/plating/airless, +"udt" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel, /area/escapepodbay) "udy" = ( /obj/machinery/light_switch{ @@ -63872,22 +63851,6 @@ }, /turf/open/floor/plasteel, /area/security/checkpoint/service) -"udJ" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Escape Podbay" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/ramp_middle, -/turf/open/floor/plasteel, -/area/escapepodbay) "udM" = ( /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 1 @@ -64293,6 +64256,9 @@ icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "unB" = ( @@ -64659,6 +64625,7 @@ /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/central) "uvN" = ( @@ -64704,6 +64671,11 @@ }, /turf/open/floor/plating, /area/security/prison) +"uxv" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/dark, +/area/escapepodbay) "uxA" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating{ @@ -64898,10 +64870,6 @@ /obj/machinery/processor, /turf/open/floor/plasteel/white, /area/security/prison) -"uBt" = ( -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, -/area/escapepodbay) "uBw" = ( /obj/machinery/door/window/eastright{ dir = 8; @@ -64980,6 +64948,22 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) +"uDq" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/door/airlock/external{ + name = "External Access"; + req_access_txt = "12" + }, +/turf/open/floor/plating, +/area/escapepodbay) "uDL" = ( /obj/structure/closet/l3closet/virology, /obj/effect/turf_decal/trimline/green/filled/line/lower{ @@ -65103,6 +65087,9 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "uFW" = ( @@ -65350,6 +65337,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/central) "uJu" = ( @@ -65733,6 +65721,9 @@ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "uQj" = ( @@ -66011,6 +66002,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/central) "uWP" = ( @@ -66182,6 +66174,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/engine/foyer) "uZz" = ( @@ -66576,9 +66569,6 @@ "vhz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -66588,6 +66578,9 @@ /obj/effect/turf_decal/trimline/blue/warning/lower{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "vhB" = ( @@ -66769,6 +66762,7 @@ /obj/machinery/door/firedoor/border_only{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) "vli" = ( @@ -66864,7 +66858,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 4 }, /turf/open/floor/plasteel, @@ -67038,6 +67031,21 @@ /obj/structure/cable, /turf/open/floor/plating, /area/security/brig) +"vpf" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "vpm" = ( /obj/machinery/requests_console{ announcementConsole = 1; @@ -67059,6 +67067,9 @@ /obj/effect/turf_decal/trimline/brown/filled/corner/lower{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/quartermaster/office) "vqa" = ( @@ -67098,6 +67109,9 @@ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "vra" = ( @@ -67106,6 +67120,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/central) "vrm" = ( @@ -67310,7 +67325,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "2-8" }, @@ -67318,6 +67332,9 @@ /obj/effect/turf_decal/trimline/blue/filled/corner/lower{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "vvd" = ( @@ -68119,18 +68136,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) -"vHW" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/machinery/airalarm{ - pixel_y = 24 - }, -/turf/open/floor/plasteel, -/area/escapepodbay) "vHX" = ( /obj/machinery/requests_console{ department = "Security"; @@ -68240,9 +68245,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -68250,6 +68252,10 @@ icon_state = "1-8" }, /obj/effect/turf_decal/trimline/blue/filled/corner/lower, +/obj/effect/mapping_helpers/mail_sorting/medbay/chemistry, +/obj/structure/disposalpipe/sorting/mail{ + dir = 8 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "vIP" = ( @@ -68396,14 +68402,14 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 4; - sortType = 29 - }, /obj/structure/cable{ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/effect/mapping_helpers/mail_sorting/service/law_office, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/fore) "vMp" = ( @@ -68565,13 +68571,13 @@ /turf/open/floor/plating, /area/maintenance/aft) "vOQ" = ( -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/starboard/fore) "vOS" = ( @@ -68657,10 +68663,6 @@ }, /turf/open/floor/plasteel, /area/security/checkpoint/science) -"vQP" = ( -/obj/machinery/vending/cola/random, -/turf/open/floor/plasteel/dark, -/area/escapepodbay) "vQR" = ( /obj/machinery/power/tracker, /obj/structure/cable/yellow{ @@ -68719,18 +68721,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) -"vSX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/escapepodbay) "vTi" = ( /obj/item/shard, /obj/structure/disposalpipe/segment{ @@ -68832,6 +68822,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) "vUs" = ( @@ -68893,16 +68884,16 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 10 }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 8; - sortType = 4 - }, /obj/structure/cable{ icon_state = "2-8" }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 8 + }, +/obj/effect/mapping_helpers/mail_sorting/engineering/general, /turf/open/floor/plating, /area/maintenance/port/aft) "vVA" = ( @@ -68910,7 +68901,6 @@ dir = 4; pixel_x = -24 }, -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 8 }, @@ -69042,6 +69032,10 @@ /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 4 }, +/obj/effect/mapping_helpers/mail_sorting/medbay/cmo_office, +/obj/structure/disposalpipe/sorting/mail{ + dir = 2 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft_starboard) "vYi" = ( @@ -69349,22 +69343,6 @@ }, /turf/open/floor/plasteel, /area/storage/tools) -"wcP" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/door/airlock/external{ - name = "External Access"; - req_access_txt = "12" - }, -/turf/open/floor/plating, -/area/escapepodbay) "wcU" = ( /obj/structure/chair/stool{ pixel_y = 8 @@ -69380,27 +69358,8 @@ /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/plasteel, /area/hallway/primary/port) -"wdr" = ( -/obj/machinery/conveyor_switch/oneway{ - id = "shipbreaking"; - name = "shipbreaking recycler conveyer" - }, -/turf/open/floor/plating/airless, -/area/escapepodbay) -"wdv" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/escapepodbay) "wdx" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -25 @@ -69526,9 +69485,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -69766,9 +69722,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/disposalpipe/junction{ - dir = 1 - }, +/obj/structure/disposalpipe/segment, /turf/open/floor/wood/parquet, /area/crew_quarters/bar) "wkK" = ( @@ -70315,13 +70269,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"wvQ" = ( -/obj/structure/disposalpipe/sorting/mail{ - dir = 8; - sortType = 15 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) "wvX" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, @@ -70367,7 +70314,6 @@ /obj/machinery/requests_console{ department = "AI"; departmentType = 5; - pixel_x = 0; pixel_y = -32 }, /turf/open/floor/circuit/telecomms/server, @@ -70511,12 +70457,27 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/port) "wyC" = ( /obj/effect/spawner/structure/window/reinforced/shutter, /turf/open/floor/plating, /area/engine/engineering) +"wyJ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/trimline/blue/filled/line/lower{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "wzr" = ( /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -70571,6 +70532,9 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "wBd" = ( @@ -70979,11 +70943,11 @@ /turf/open/floor/engine, /area/maintenance/disposal/incinerator) "wLb" = ( -/obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 1 }, +/obj/machinery/disposal/bin/tagger, /turf/open/floor/plasteel, /area/quartermaster/qm) "wLh" = ( @@ -71555,6 +71519,7 @@ icon_state = "1-2" }, /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft) "wXq" = ( @@ -71753,6 +71718,18 @@ "wZD" = ( /turf/open/floor/plasteel/white, /area/science/nanite) +"wZR" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/escapepodbay) "xaj" = ( /obj/structure/window/reinforced/tinted{ dir = 4 @@ -71856,7 +71833,6 @@ /turf/open/floor/plasteel/white, /area/science/xenobiology) "xdf" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -72083,6 +72059,9 @@ /obj/effect/turf_decal/trimline/green/filled/corner/lower{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "xhr" = ( @@ -72153,6 +72132,9 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/misc_lab) "xiL" = ( @@ -72221,6 +72203,14 @@ }, /turf/open/floor/plasteel, /area/engine/atmos/distro) +"xjO" = ( +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/camera{ + c_tag = "Escape Podbay"; + dir = 8 + }, +/turf/open/floor/plasteel, +/area/escapepodbay) "xjZ" = ( /obj/item/kirbyplants/random, /obj/machinery/light, @@ -72397,6 +72387,10 @@ }, /turf/open/floor/plasteel/dark, /area/tcommsat/storage) +"xnF" = ( +/obj/machinery/vending/cola/random, +/turf/open/floor/plasteel/dark, +/area/escapepodbay) "xnM" = ( /obj/machinery/light, /obj/structure/sign/warning/electricshock{ @@ -72520,7 +72514,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/aft) "xqh" = ( @@ -72684,16 +72677,10 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, /turf/open/floor/plasteel, /area/quartermaster/storage) "xsy" = ( /obj/machinery/light, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/plasteel, /area/hallway/primary/port) "xsA" = ( @@ -72721,14 +72708,6 @@ }, /turf/open/floor/plating, /area/maintenance/fore) -"xtJ" = ( -/obj/effect/turf_decal/bot, -/obj/structure/reagent_dispensers/watertank, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/science/misc_lab) "xtP" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible, /obj/effect/turf_decal/siding/thinplating{ @@ -72747,9 +72726,6 @@ /turf/open/floor/wood, /area/bridge/meeting_room) "xuE" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -73438,7 +73414,7 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, -/obj/machinery/disposal/bin, +/obj/machinery/disposal/bin/tagger, /turf/open/floor/wood, /area/lawoffice) "xHc" = ( @@ -73461,6 +73437,8 @@ pixel_x = 5; pixel_y = 6 }, +/obj/item/stack/packageWrap, +/obj/item/stack/packageWrap, /turf/open/floor/plasteel/dark, /area/science/xenobiology) "xHA" = ( @@ -73507,9 +73485,6 @@ /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "xIJ" = ( -/obj/structure/disposalpipe/junction/flip{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, @@ -73523,6 +73498,9 @@ icon_state = "2-8" }, /obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "xIP" = ( @@ -73632,6 +73610,18 @@ /obj/item/kirbyplants/random, /turf/open/floor/carpet, /area/library) +"xLf" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/trimline/brown/filled/line/lower{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "xLm" = ( /obj/structure/table, /obj/effect/turf_decal/trimline/purple/filled/corner/lower{ @@ -73647,12 +73637,6 @@ }, /turf/open/floor/plasteel/dark, /area/bridge) -"xLB" = ( -/obj/machinery/light, -/obj/machinery/suit_storage_unit/standard_unit, -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel/dark, -/area/escapepodbay) "xLR" = ( /obj/structure/table, /obj/item/flashlight/lamp/green{ @@ -73717,9 +73701,6 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, /obj/structure/cable{ icon_state = "2-8" }, @@ -73727,6 +73708,9 @@ icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/plating, /area/maintenance/port) "xNM" = ( @@ -73781,7 +73765,6 @@ dir = 6 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 6 }, /turf/open/floor/plasteel, @@ -73820,6 +73803,9 @@ /obj/effect/turf_decal/trimline/green/filled/corner/lower{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "xPn" = ( @@ -73938,7 +73924,6 @@ /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) "xRO" = ( -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 8 }, @@ -74256,6 +74241,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/engine/foyer) "xYL" = ( @@ -74348,6 +74334,21 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/hallway/primary/fore) +"yaD" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/light, +/obj/structure/rack, +/obj/item/tank/internals/oxygen, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/bag/sheetsnatcher, +/obj/item/melee/sledgehammer, +/obj/item/storage/bag/trash, +/obj/item/broom, +/obj/effect/turf_decal/bot, +/turf/open/floor/plasteel/dark, +/area/escapepodbay) "yaO" = ( /obj/structure/table, /obj/item/radio/off, @@ -74428,12 +74429,10 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, /obj/effect/turf_decal/trimline/brown/filled/corner/lower{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/quartermaster/office) "ycE" = ( @@ -74553,12 +74552,6 @@ /obj/machinery/door/airlock/maintenance_hatch, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"yfg" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/aft) "yfj" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 1 @@ -74668,9 +74661,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/turf_decal/trimline/brown/filled/corner/lower{ dir = 8 }, @@ -74962,6 +74952,9 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "ylH" = ( @@ -92052,7 +92045,7 @@ cgh qLe foq xhk -dVM +jGz fJy eRb jEA @@ -92567,7 +92560,7 @@ azF azF xPb fnx -aOl +aLE aPA aQL aSg @@ -93851,7 +93844,7 @@ aDo aIN aBQ wAX -dVM +jGz jGz eRz lbI @@ -93859,7 +93852,7 @@ kad gaP gzV mNd -hqB +aXp igL dgL khj @@ -94109,14 +94102,14 @@ qLM aBQ cSu aLE -aOv +aLE eUx -aQQ -aQQ -gbo -gBZ -bbc -aXp +aQN +aQN +aTw +aUU +dqM +aQN bEb igL jKb @@ -94366,7 +94359,7 @@ cpY aBQ cmb ehE -aOl +aLE aPA aQP aQN @@ -94623,7 +94616,7 @@ aIX aKm cSu aLE -aOl +aLE eVv aQR aQN @@ -94879,8 +94872,8 @@ aLe aIW cAt cno -dvH -eaG +aLE +aLE aPA fnG aQN @@ -95137,7 +95130,7 @@ aIZ aKm cSu aLE -aOl +aLE aPA aQT aQN @@ -95394,7 +95387,7 @@ aPQ aPQ cLH dwe -eec +dwe aPA aXt aXt @@ -95651,7 +95644,7 @@ aJb aKp cSu aLE -aOl +aLE aPG aPG aPG @@ -95908,7 +95901,7 @@ aIU aKp cSu aLK -aOl +aLE eVD aQU fCx @@ -96677,7 +96670,7 @@ pAl orJ kVU aSs -cSu +dif aLE pRh aPG @@ -97725,11 +97718,11 @@ bgA bhW oaG ycm -bbR -enf -bnA -bnA ngZ +enf +bbR +bbR +bbR bbR wqH moT @@ -100276,9 +100269,9 @@ cBd hSJ fvP szx -dSD -eUU cSf +eUU +dSD fnZ vra gIN @@ -100296,8 +100289,8 @@ jCo iUv mTN uJc -iKU -iKU +xLf +xLf lyU gmo iKU @@ -100540,7 +100533,7 @@ aJq aJq tPj aJq -jAv +vpf aJq bqK aJq @@ -100797,7 +100790,7 @@ wwt wwt wwt knK -jAv +vpf sUD iFn wwt @@ -101054,7 +101047,7 @@ bOS bOS bOS inP -jAv +vpf dLQ aZM aZM @@ -101591,7 +101584,7 @@ bmr bmr nyD aJq -jrs +tuy wTy gXs aaa @@ -103133,7 +103126,7 @@ bmr bmr inP aJq -bEP +jrs wTy gXs aaa @@ -103904,7 +103897,7 @@ pJB aJw inP aJq -sfF +rPH mlj aaa gXs @@ -104425,7 +104418,7 @@ dzo ylh dzo ylh -kGn +dzo njY rdj jMV @@ -104677,16 +104670,16 @@ hsn sYk doM dff -nzd -nzd -nzd +sKA +sKA +sKA xqf -nzd -wvQ sKA sKA sKA -yfg +sKA +sKA +sKA sKA sKA jlo @@ -105983,9 +105976,9 @@ dJK pzK aiv mAz -mit +aiv lEr -mit +aiv nvp cdC cfb @@ -108019,9 +108012,9 @@ aJq gSj tRp rmD -hUr -hUr -hUr +gLC +gLC +gLC sYd tpg nBp @@ -108526,10 +108519,10 @@ lFZ lFZ iyO lEJ -hRy -hRy -qGI -rHP +lFZ +lFZ +yfj +aJq bBx tRF aJw @@ -108781,13 +108774,13 @@ aJq aJq dym aJq -sWS -dHx +bBx +aJq aJq aJq aJq ddb -sWS +bBx cBV aJw xkZ @@ -109039,10 +109032,10 @@ meG kxF vhz kHq -oSg -meG +wyJ +wyJ ctJ -meG +wyJ uvE pTm bCz @@ -117747,7 +117740,7 @@ syq syq alP aoq -qHR +ece alP alP alP @@ -118285,8 +118278,8 @@ tQD jUX tQD tQD -qjc -pZF +lND +tXk rxa iZX tQD @@ -118520,7 +118513,7 @@ uaL aty anf anf -xNu +iqP aty anf rdi @@ -118538,15 +118531,15 @@ qfN jKG jrX bNV -vXA +iuW tit -vXA +iuW lpm vXA mHl rki qgr -bcR +sOQ eHD lUd qvj @@ -123968,7 +123961,7 @@ bTl akD bQZ bZZ -lSM +bZZ gFN fWQ lAB @@ -124482,7 +124475,7 @@ bTl cum bQZ bZZ -lSM +bZZ gFN woT wkN @@ -124739,7 +124732,7 @@ caY aRd bQZ alN -qot +alN gFN iKk oGM @@ -124996,7 +124989,7 @@ bTl bTl bQZ alX -xtJ +alX gFN xLm oGM @@ -125458,10 +125451,10 @@ aaa gXs xJr iEt -kKA -oEi -eHw -udJ +hHb +bQx +tro +pQy guW rZU mUk @@ -125696,7 +125689,7 @@ aaa aaa aaa aaa -sJy +doP pEf pEf pEf @@ -125709,15 +125702,15 @@ pEf pEf pEf pEf -sJy +doP gXs gXs ptH ptH -ryg -oXD -sLc -pqB +hwn +hld +nDj +yaD ptH aOb aPq @@ -125967,14 +125960,14 @@ xiq qcN xiq pEf -wdr +iOc gXs xJr -qGo -bDq -nPK -uBt -isG +bbz +qxE +sNd +udt +mUs ptH aMZ aMZ @@ -126224,14 +126217,14 @@ xiq qcN xiq pEf -udv +rkA gXs xJr -huK -jfE -nPK -uBt -isG +qOf +fxr +sNd +udt +mUs ptH eVK kAe @@ -126481,14 +126474,14 @@ xiq qcN xiq pEf -gBj +ucB aaa xJr -aFB -bDq -gXf -gTc -mAt +bAj +qxE +pWM +sHo +lsn ptH odE tHk @@ -126738,14 +126731,14 @@ xiq qcN xiq pEf -gBj +ucB gXs ptH ptH -vHW -nPK -uBt -oAP +aNZ +sNd +udt +nYC ptH odE aPq @@ -126995,14 +126988,14 @@ xiq qcN qcN pEf -gBj +ucB aaa xJr -nza -bDq -nPK -uBt -jDk +pMy +qxE +sNd +udt +atS ptH odE thb @@ -127252,14 +127245,14 @@ xiq xiq xiq pEf -gBj +ucB gXs xJr -nza -vSX -cHM -uBt -xLB +pMy +wZR +joc +udt +rZM ptH mrq xZK @@ -127509,14 +127502,14 @@ xiq qcN xiq pEf -oZm +gcL aaa xJr -vQP -cuF -eqH -mXa -wdv +xnF +iGZ +xjO +iOa +rIf ptH aRW aRW @@ -127766,14 +127759,14 @@ qcN qcN qcN pEf -wdr +iOc gXs ptH ptH -wcP +uDq ptH -ldA -ldA +uxv +uxv ptH aaf aRW @@ -128009,7 +128002,7 @@ aaa aaa aaa aaa -sJy +doP pEf pEf pEf @@ -128022,12 +128015,12 @@ pEf pEf pEf pEf -sJy +doP pEf pEf pEf -sMS -eRg +adN +ksE xJr dgz dgz @@ -128284,7 +128277,7 @@ aaa gXs pEf xJr -kdn +jcd xJr gXs aaa diff --git a/code/__DEFINES/pipe_construction.dm b/code/__DEFINES/pipe_construction.dm index 19aabe23d012..efcd15f7e71c 100644 --- a/code/__DEFINES/pipe_construction.dm +++ b/code/__DEFINES/pipe_construction.dm @@ -6,6 +6,7 @@ #define PIPE_UNARY 4 //4 directions: N, S, E, W #define PIPE_ONEDIR 5 //1 direction: N/S/E/W #define PIPE_UNARY_FLIPPABLE 6 //8 directions: N/S/E/W/N-flipped/S-flipped/E-flipped/W-flipped +#define PIPE_ONEDIR_FLIPPABLE 7 //2 direction: N/S/E/W, N-flipped/S-flipped/E-flipped/W-flipped //Disposal pipe relative connection directions #define DISP_DIR_BASE 0 diff --git a/code/__DEFINES/sort_types.dm b/code/__DEFINES/sort_types.dm new file mode 100644 index 000000000000..75c1629a03e3 --- /dev/null +++ b/code/__DEFINES/sort_types.dm @@ -0,0 +1,32 @@ +#define SORT_TYPE_WASTE 0 +///All unwrapped items and untagged parcels get picked up by a junction with this sortType. Usually leads to the recycler. +#define SORT_TYPE_DISPOSALS 1 +#define SORT_TYPE_CARGO_BAY 2 +#define SORT_TYPE_QM_OFFICE 3 +#define SORT_TYPE_ENGINEERING 4 +#define SORT_TYPE_CE_OFFICE 5 +#define SORT_TYPE_ATMOSPHERICS 6 +#define SORT_TYPE_SECURITY 7 +#define SORT_TYPE_HOS_OFFICE 8 +#define SORT_TYPE_MEDBAY 9 +#define SORT_TYPE_CMO_OFFICE 10 +#define SORT_TYPE_CHEMISTRY 11 +#define SORT_TYPE_RESEARCH 12 +#define SORT_TYPE_RD_OFFICE 13 +#define SORT_TYPE_ROBOTICS 14 +#define SORT_TYPE_HOP_OFFICE 15 +#define SORT_TYPE_LIBRARY 16 +#define SORT_TYPE_CHAPEL 17 +#define SORT_TYPE_THEATER 18 +#define SORT_TYPE_BAR 19 +#define SORT_TYPE_KITCHEN 20 +#define SORT_TYPE_HYDROPONICS 21 +#define SORT_TYPE_JANITOR_CLOSET 22 +#define SORT_TYPE_GENETICS 23 +#define SORT_TYPE_EXPERIMENTOR_LAB 24 +#define SORT_TYPE_TOXINS 25 +#define SORT_TYPE_DORMITORIES 26 +#define SORT_TYPE_VIROLOGY 27 +#define SORT_TYPE_XENOBIOLOGY 28 +#define SORT_TYPE_LAW_OFFICE 29 +#define SORT_TYPE_DETECTIVES_OFFICE 30 diff --git a/code/game/objects/items/RPD.dm b/code/game/objects/items/RPD.dm index 2b640acfc6ff..7604082c7f76 100644 --- a/code/game/objects/items/RPD.dm +++ b/code/game/objects/items/RPD.dm @@ -57,6 +57,7 @@ GLOBAL_LIST_INIT(disposal_pipe_recipes, list( new /datum/pipe_info/disposal("Junction", /obj/structure/disposalpipe/junction, PIPE_TRIN_M), new /datum/pipe_info/disposal("Y-Junction", /obj/structure/disposalpipe/junction/yjunction), new /datum/pipe_info/disposal("Sort Junction", /obj/structure/disposalpipe/sorting/mail, PIPE_TRIN_M), + new /datum/pipe_info/disposal("Rotator", /obj/structure/disposalpipe/rotator, PIPE_ONEDIR_FLIPPABLE), new /datum/pipe_info/disposal("Trunk", /obj/structure/disposalpipe/trunk), new /datum/pipe_info/disposal("Bin", /obj/machinery/disposal/bin, PIPE_ONEDIR), new /datum/pipe_info/disposal("Outlet", /obj/structure/disposaloutlet), @@ -134,6 +135,8 @@ GLOBAL_LIST_INIT(fluid_duct_recipes, list( if(PIPE_UNARY_FLIPPABLE) dirs = list("[NORTH]" = "North", "[NORTHEAST]" = "North Flipped", "[EAST]" = "East", "[SOUTHEAST]" = "East Flipped", "[SOUTH]" = "South", "[SOUTHWEST]" = "South Flipped", "[WEST]" = "West", "[NORTHWEST]" = "West Flipped") + if(PIPE_ONEDIR_FLIPPABLE) + dirs = list("[SOUTH]" = name, "[SOUTHEAST]" = "[name] Flipped") var/list/rows = list() @@ -141,7 +144,7 @@ GLOBAL_LIST_INIT(fluid_duct_recipes, list( var/i = 0 for(var/dir in dirs) var/numdir = text2num(dir) - var/flipped = ((dirtype == PIPE_TRIN_M) || (dirtype == PIPE_UNARY_FLIPPABLE)) && (numdir in GLOB.diagonals) + var/flipped = ((dirtype == PIPE_TRIN_M) || (dirtype == PIPE_UNARY_FLIPPABLE) || (dirtype == PIPE_ONEDIR_FLIPPABLE)) && (ISDIAGONALDIR(numdir)) row["previews"] += list(list("selected" = (numdir == selected_dir), "dir" = dir2text(numdir), "dir_name" = dirs[dir], "icon_state" = icon_state, "flipped" = flipped)) if(i++ || dirtype == PIPE_ONEDIR) rows += list(row) diff --git a/code/modules/mapping/mail_sort_helpers.dm b/code/modules/mapping/mail_sort_helpers.dm new file mode 100644 index 000000000000..614d2586304e --- /dev/null +++ b/code/modules/mapping/mail_sort_helpers.dm @@ -0,0 +1,124 @@ +/obj/effect/mapping_helpers/mail_sorting + icon_state = "sort_type_helper" + late = TRUE + var/sort_type = SORT_TYPE_WASTE + +/obj/effect/mapping_helpers/mail_sorting/Initialize(mapload) + ..() + return INITIALIZE_HINT_LATELOAD + +/obj/effect/mapping_helpers/mail_sorting/LateInitialize() + var/obj/structure/disposalpipe/sorting/mail/mail_sorter = locate(/obj/structure/disposalpipe/sorting/mail) in loc + if(mail_sorter) + mail_sorter.sortTypes |= sort_type + else + log_mapping("[src] failed to find a mail sorting disposal pipe at [AREACOORD(src)]") + qdel(src) + +/obj/effect/mapping_helpers/mail_sorting/supply + icon_state = "sort_type_helper_sup" + +/obj/effect/mapping_helpers/mail_sorting/supply/disposals + sort_type = SORT_TYPE_DISPOSALS + +/obj/effect/mapping_helpers/mail_sorting/supply/cargo_bay + sort_type = SORT_TYPE_CARGO_BAY + +/obj/effect/mapping_helpers/mail_sorting/supply/qm_office + sort_type = SORT_TYPE_QM_OFFICE + +/obj/effect/mapping_helpers/mail_sorting/engineering + icon_state = "sort_type_helper_eng" + +/obj/effect/mapping_helpers/mail_sorting/engineering/general + sort_type = SORT_TYPE_ENGINEERING + +/obj/effect/mapping_helpers/mail_sorting/engineering/ce_office + sort_type = SORT_TYPE_CE_OFFICE + +/obj/effect/mapping_helpers/mail_sorting/engineering/atmospherics + sort_type = SORT_TYPE_ATMOSPHERICS + +/obj/effect/mapping_helpers/mail_sorting/security + icon_state = "sort_type_helper_sec" + +/obj/effect/mapping_helpers/mail_sorting/security/general + sort_type = SORT_TYPE_SECURITY + +/obj/effect/mapping_helpers/mail_sorting/security/hos_office + sort_type = SORT_TYPE_HOS_OFFICE + +/obj/effect/mapping_helpers/mail_sorting/security/detectives_office + sort_type = SORT_TYPE_DETECTIVES_OFFICE + +/obj/effect/mapping_helpers/mail_sorting/medbay + icon_state = "sort_type_helper_med" + +/obj/effect/mapping_helpers/mail_sorting/medbay/general + sort_type = SORT_TYPE_MEDBAY + +/obj/effect/mapping_helpers/mail_sorting/medbay/cmo_office + sort_type = SORT_TYPE_CMO_OFFICE + +/obj/effect/mapping_helpers/mail_sorting/medbay/chemistry + sort_type = SORT_TYPE_CHEMISTRY + +/obj/effect/mapping_helpers/mail_sorting/medbay/virology + sort_type = SORT_TYPE_VIROLOGY + +/obj/effect/mapping_helpers/mail_sorting/science + icon_state = "sort_type_helper_sci" + +/obj/effect/mapping_helpers/mail_sorting/science/research + sort_type = SORT_TYPE_RESEARCH + +/obj/effect/mapping_helpers/mail_sorting/science/rd_office + sort_type = SORT_TYPE_RD_OFFICE + +/obj/effect/mapping_helpers/mail_sorting/science/robotics + sort_type = SORT_TYPE_ROBOTICS + +/obj/effect/mapping_helpers/mail_sorting/science/genetics + sort_type = SORT_TYPE_GENETICS + +/obj/effect/mapping_helpers/mail_sorting/science/experimentor_lab + sort_type = SORT_TYPE_EXPERIMENTOR_LAB + +/obj/effect/mapping_helpers/mail_sorting/science/toxins + sort_type = SORT_TYPE_TOXINS + +/obj/effect/mapping_helpers/mail_sorting/science/xenobiology + sort_type = SORT_TYPE_XENOBIOLOGY + +/obj/effect/mapping_helpers/mail_sorting/service + icon_state = "sort_type_helper_serv" + +/obj/effect/mapping_helpers/mail_sorting/service/hop_office + sort_type = SORT_TYPE_HOP_OFFICE + +/obj/effect/mapping_helpers/mail_sorting/service/library + sort_type = SORT_TYPE_LIBRARY + +/obj/effect/mapping_helpers/mail_sorting/service/chapel + sort_type = SORT_TYPE_CHAPEL + +/obj/effect/mapping_helpers/mail_sorting/service/theater + sort_type = SORT_TYPE_THEATER + +/obj/effect/mapping_helpers/mail_sorting/service/bar + sort_type = SORT_TYPE_BAR + +/obj/effect/mapping_helpers/mail_sorting/service/kitchen + sort_type = SORT_TYPE_KITCHEN + +/obj/effect/mapping_helpers/mail_sorting/service/hydroponics + sort_type = SORT_TYPE_HYDROPONICS + +/obj/effect/mapping_helpers/mail_sorting/service/janitor_closet + sort_type = SORT_TYPE_JANITOR_CLOSET + +/obj/effect/mapping_helpers/mail_sorting/service/dormitories + sort_type = SORT_TYPE_DORMITORIES + +/obj/effect/mapping_helpers/mail_sorting/service/law_office + sort_type = SORT_TYPE_LAW_OFFICE diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm index 537198986cbc..a3c8e609f38a 100644 --- a/code/modules/recycling/disposal/bin.dm +++ b/code/modules/recycling/disposal/bin.dm @@ -19,6 +19,7 @@ var/pressure_charging = TRUE // True if flush handle is pulled var/flush = FALSE + /// The attached pipe trunk var/obj/structure/disposalpipe/trunk/trunk = null /// True if flushing in progress @@ -110,7 +111,7 @@ return place_item_in_disposal(I, user) update_appearance() - return 1 //no afterattack + return TRUE //no afterattack else return ..() @@ -271,22 +272,80 @@ desc = "A pneumatic waste disposal unit." icon_state = "disposal" base_icon_state = "disposal" + /// Reference to the mounted destination tagger for disposal bins with one mounted. + var/obj/item/destTagger/mounted_tagger // attack by item places it in to disposal /obj/machinery/disposal/bin/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/storage/bag/trash)) //Not doing component overrides because this is a specific type. - var/obj/item/storage/bag/trash/T = I - var/datum/component/storage/STR = T.GetComponent(/datum/component/storage) + if(istype(I, /obj/item/storage/bag/trash)) //Not doing component overrides because this is a specific type. + var/obj/item/storage/bag/trash/b = I + var/datum/component/storage/STR = b.GetComponent(/datum/component/storage) to_chat(user, span_warning("You empty the bag.")) - for(var/obj/item/O in T.contents) + for(var/obj/item/O in b.contents) STR.remove_from_storage(O,src) - T.update_appearance() + b.update_appearance() update_appearance() + if(istype(I, /obj/item/destTagger)) + return else return ..() // handle machine interaction +/obj/machinery/disposal/bin/attackby_secondary(obj/item/I, mob/user, params) + if(istype(I, /obj/item/destTagger)) + var/obj/item/destTagger/new_tagger = I + if(mounted_tagger) + balloon_alert(user, "already has a tagger!") + return + if(HAS_TRAIT(new_tagger, TRAIT_NODROP) || !user.transferItemToLoc(new_tagger, src)) + balloon_alert(user, "stuck to your hand!") + return + new_tagger.moveToNullspace() + user.visible_message(span_notice("[user] snaps \the [new_tagger] onto [src]!")) + balloon_alert(user, "tagger returned") + playsound(src, 'sound/machines/click.ogg', 50, TRUE) + mounted_tagger = new_tagger + update_appearance() + return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN + else + return ..() + +/obj/machinery/disposal/bin/attack_hand_secondary(mob/user, list/modifiers) + . = ..() + if(!mounted_tagger) + balloon_alert(user, "no destination tagger!") + return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN + if(!user.put_in_hands(mounted_tagger)) + balloon_alert(user, "destination tagger falls!") + mounted_tagger = null + return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN + user.visible_message(span_notice("[user] unhooks the [mounted_tagger] from [src].")) + balloon_alert(user, "tagger pulled") + playsound(src, 'sound/machines/click.ogg', 60, TRUE) + mounted_tagger = null + update_appearance(UPDATE_OVERLAYS) + return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN + + +/obj/machinery/disposal/bin/examine(mob/user) + . = ..() + if(isnull(mounted_tagger)) + . += span_notice("The destination tagger mount is empty.") + else + . += span_notice("\The [mounted_tagger] is hanging on the side. Right Click to remove.") + +/obj/machinery/disposal/bin/Destroy() + if(!isnull(mounted_tagger)) + QDEL_NULL(mounted_tagger) + return ..() + +/obj/machinery/disposal/bin/on_deconstruction(disassembled) + . = ..() + if(!isnull(mounted_tagger)) + mounted_tagger.forceMove(drop_location()) + mounted_tagger = null + /obj/machinery/disposal/bin/AltClick(mob/user) . = ..() if(!user.canUseTopic(src, TRUE)) @@ -375,7 +434,10 @@ //flush handle if(flush) - . += "[base_icon_state]-handle" + . += "[base_icon_state]-dispover-handle" + + if(mounted_tagger) + . += "tagger_mount" //only handle is shown if no power if(stat & NOPOWER || panel_open) @@ -383,21 +445,25 @@ //check for items in disposal - occupied light if(contents.len > 0) - . += "[base_icon_state]-full" - . += emissive_appearance(icon, "[base_icon_state]-full", src, alpha = src.alpha) + . += "[base_icon_state]-dispover-full" + . += emissive_appearance(icon, "[base_icon_state]-dispover-full", src, alpha = src.alpha) //charging and ready light if(pressure_charging) - . += "[base_icon_state]-charge" - . += emissive_appearance(icon, "[base_icon_state]-charge-glow", src, alpha = src.alpha) + . += "[base_icon_state]-dispover-charge" + . += emissive_appearance(icon, "[base_icon_state]-dispover-charge-glow", src, alpha = src.alpha) else if(full_pressure) - . += "[base_icon_state]-ready" - . += emissive_appearance(icon, "[base_icon_state]-ready-glow", src, alpha = src.alpha) + . += "[base_icon_state]-dispover-ready" + . += emissive_appearance(icon, "[base_icon_state]-dispover-ready-glow", src, alpha = src.alpha) /obj/machinery/disposal/bin/proc/do_flush() set waitfor = FALSE flush() +/obj/machinery/disposal/bin/tagger/Initialize(mapload, obj/structure/disposalconstruct/make_from) + mounted_tagger = new /obj/item/destTagger(null) + return ..() + //timed process //charge the gas reservoir and perform flush if ready /obj/machinery/disposal/bin/process(delta_time) @@ -510,8 +576,5 @@ /obj/mecha/CanEnterDisposals() return -/obj/machinery/disposal/bin/newHolderDestination(obj/structure/disposalholder/H) - H.destinationTag = 1 -/obj/machinery/disposal/deliveryChute/newHolderDestination(obj/structure/disposalholder/H) - H.destinationTag = 1 + diff --git a/code/modules/recycling/disposal/holder.dm b/code/modules/recycling/disposal/holder.dm index faff4adf8df9..b92d81532d35 100644 --- a/code/modules/recycling/disposal/holder.dm +++ b/code/modules/recycling/disposal/holder.dm @@ -108,6 +108,11 @@ if(ismob(AM)) var/mob/M = AM M.reset_perspective(src) // if a client mob, update eye to follow this holder + + if(destinationTag == 0 && other.destinationTag != 0) + destinationTag = other.destinationTag + if(!tomail && other.tomail) + tomail = TRUE qdel(other) diff --git a/code/modules/recycling/disposal/pipe.dm b/code/modules/recycling/disposal/pipe.dm index 14ab8777e3f7..aa3ccab1f350 100644 --- a/code/modules/recycling/disposal/pipe.dm +++ b/code/modules/recycling/disposal/pipe.dm @@ -311,3 +311,18 @@ /obj/structure/disposalpipe/broken/deconstruct() qdel(src) + +/obj/structure/disposalpipe/rotator + icon_state = "pipe-r1" + initialize_dirs = DISP_DIR_LEFT | DISP_DIR_RIGHT | DISP_DIR_FLIP + flip_type = /obj/structure/disposalpipe/rotator/flip + /// In what direction the atom travels. + var/direction_angle = -90 + +/obj/structure/disposalpipe/rotator/nextdir(obj/structure/disposalholder/holder) + return turn(holder.dir, direction_angle) + +/obj/structure/disposalpipe/rotator/flip + icon_state = "pipe-r2" + flip_type = /obj/structure/disposalpipe/rotator + direction_angle = 90 diff --git a/icons/effects/mapping_helpers.dmi b/icons/effects/mapping_helpers.dmi index fbfa1cf6d5b6..1bc499aaaf14 100644 Binary files a/icons/effects/mapping_helpers.dmi and b/icons/effects/mapping_helpers.dmi differ diff --git a/icons/obj/atmospherics/pipes/disposal.dmi b/icons/obj/atmospherics/pipes/disposal.dmi index e8bd6ef2ef69..953d4e2adf9a 100644 Binary files a/icons/obj/atmospherics/pipes/disposal.dmi and b/icons/obj/atmospherics/pipes/disposal.dmi differ diff --git a/yogstation.dme b/yogstation.dme index 1e46d857a7b1..85a7eceac8ff 100644 --- a/yogstation.dme +++ b/yogstation.dme @@ -138,6 +138,7 @@ #include "code\__DEFINES\security.dm" #include "code\__DEFINES\shuttles.dm" #include "code\__DEFINES\sight.dm" +#include "code\__DEFINES\sort_types.dm" #include "code\__DEFINES\sound.dm" #include "code\__DEFINES\space.dm" #include "code\__DEFINES\spaceman_dmm.dm" @@ -2765,6 +2766,7 @@ #include "code\modules\lighting\lighting_source.dm" #include "code\modules\lighting\lighting_turf.dm" #include "code\modules\lighting\static_lighting_area.dm" +#include "code\modules\mapping\mail_sort_helpers.dm" #include "code\modules\mapping\map_template.dm" #include "code\modules\mapping\mapping_helpers.dm" #include "code\modules\mapping\minimap.dm"