From ad5620118c2efdcbbf7e423bc26db64677ced58e Mon Sep 17 00:00:00 2001 From: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com> Date: Fri, 17 Jul 2026 09:22:48 +0300 Subject: [PATCH] Making disposals mail sorting mapping less frustrating (#32218) * mail sorting helpers && mail sorting code tweaks - Added mail helpers - Added defines for mail tagger locations - FUCKED sort_type_txt * Update mapping_helpers.dmi * Update deltastation.dmm * Update deltastation.dmm * Update cerestation.dmm * Update metastation.dmm * Update emeraldstation.dmm * Update boxstation.dmm * Update boxstation.dmm * Update mail_sorting_helpers.dm --- _maps/map_files/stations/boxstation.dmm | 127 ++++++----- _maps/map_files/stations/cerestation.dmm | 221 +++++++++---------- _maps/map_files/stations/deltastation.dmm | 98 ++++---- _maps/map_files/stations/emeraldstation.dmm | 140 ++++++------ _maps/map_files/stations/metastation.dmm | 204 ++++++----------- code/__DEFINES/tagger_locations.dm | 36 +++ code/_globalvars/lists/flavor_misc.dm | 14 -- code/modules/mapping/mail_sorting_helpers.dm | 50 +++++ code/modules/recycling/disposal.dm | 28 --- icons/effects/mapping_helpers.dmi | Bin 19684 -> 22112 bytes paradise.dme | 2 + 11 files changed, 456 insertions(+), 464 deletions(-) create mode 100644 code/__DEFINES/tagger_locations.dm create mode 100644 code/modules/mapping/mail_sorting_helpers.dm diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index d4b23d57980..9543ca62370 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -2336,13 +2336,16 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/brig) "alb" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "1-2" }, /obj/effect/turf_decal/tiles/department/security/corner{ dir = 8 }, +/obj/structure/disposalpipe/sortjunction{ + dir = 1 + }, +/obj/effect/mapping_helpers/sortjunc_helper/security, /turf/simulated/floor/plasteel/dark, /area/station/security/brig) "ale" = ( @@ -2930,9 +2933,9 @@ /area/station/science/toxins/test) "anx" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 2; - sort_type_txt = "14" + dir = 2 }, +/obj/effect/mapping_helpers/sortjunc_helper/robotics, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) "any" = ( @@ -26976,10 +26979,11 @@ /turf/simulated/floor/plasteel/white, /area/station/medical/medbay2) "bZQ" = ( -/obj/structure/disposalpipe/junction{ +/obj/effect/turf_decal/tiles/department/medical/side, +/obj/effect/mapping_helpers/sortjunc_helper/morgue, +/obj/structure/disposalpipe/sortjunction{ dir = 8 }, -/obj/effect/turf_decal/tiles/department/medical/side, /turf/simulated/floor/plasteel/white, /area/station/medical/medbay2) "bZR" = ( @@ -42465,11 +42469,11 @@ /area/station/aisat/hall) "dmu" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 2; - sort_type_txt = "12" + dir = 2 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/mapping_helpers/sortjunc_helper/research, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) "dmv" = ( @@ -45535,14 +45539,14 @@ "ecs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction{ - dir = 8; - sort_type_txt = "9" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, /obj/effect/turf_decal/tiles/department/medical, +/obj/effect/mapping_helpers/sortjunc_helper/medbay, /turf/simulated/floor/plasteel/white, /area/station/medical/medbay2) "ecy" = ( @@ -46235,10 +46239,10 @@ pixel_y = -28 }, /obj/structure/disposalpipe/sortjunction{ - dir = 8; - sort_type_txt = "1" + dir = 8 }, /obj/machinery/alarm/directional/south, +/obj/effect/mapping_helpers/sortjunc_helper/disposals, /turf/simulated/floor/plasteel, /area/station/hallway/primary/port/east) "epQ" = ( @@ -47605,8 +47609,7 @@ dir = 4 }, /obj/structure/disposalpipe/sortjunction{ - dir = 1; - sort_type_txt = "7" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -47617,6 +47620,7 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/effect/mapping_helpers/sortjunc_helper/hos_office, /turf/simulated/floor/plasteel/dark, /area/station/security/brig) "eWA" = ( @@ -48503,9 +48507,9 @@ dir = 8 }, /obj/structure/disposalpipe/sortjunction{ - dir = 2; - sort_type_txt = "24" + dir = 2 }, +/obj/effect/mapping_helpers/sortjunc_helper/detective, /turf/simulated/floor/plasteel/fakestairs{ dir = 1 }, @@ -48920,11 +48924,11 @@ /area/station/maintenance/disposal) "fzc" = ( /obj/structure/disposalpipe/sortjunction{ - dir = 4; - sort_type_txt = "21" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/mapping_helpers/sortjunc_helper/hydroponics, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) "fzd" = ( @@ -50224,13 +50228,13 @@ dir = 8 }, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 2; - sort_type_txt = "5" + dir = 2 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/turf_decal/tiles/department/engineering/side{ dir = 8 }, +/obj/effect/mapping_helpers/sortjunc_helper/ce_office, /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft/south) "gdQ" = ( @@ -52131,10 +52135,6 @@ /obj/machinery/door/firedoor{ dir = 4 }, -/obj/structure/disposalpipe/sortjunction{ - dir = 1; - sort_type_txt = "8" - }, /obj/structure/cable{ icon_state = "1-2" }, @@ -52151,6 +52151,7 @@ /obj/effect/turf_decal/tiles/department/security/side{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel/dark, /area/station/security/brig) "gUm" = ( @@ -53896,13 +53897,13 @@ "hIR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 1; - sort_type_txt = "2" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/sortjunc_helper/cargo_bay, /turf/simulated/floor/plasteel, /area/station/supply/sorting) "hIZ" = ( @@ -54222,9 +54223,9 @@ icon_state = "1-8" }, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 1; - sort_type_txt = "3" + dir = 1 }, +/obj/effect/mapping_helpers/sortjunc_helper/qm_office, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) "hQo" = ( @@ -55259,13 +55260,13 @@ /area/station/maintenance/fore) "ipf" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 8; - sort_type_txt = "10" + dir = 8 }, /obj/machinery/light{ dir = 1 }, /obj/effect/turf_decal/tiles/department/medical/side, +/obj/effect/mapping_helpers/sortjunc_helper/cmo_office, /turf/simulated/floor/plasteel/white, /area/station/medical/medbay2) "ipr" = ( @@ -57911,9 +57912,6 @@ /obj/machinery/door/firedoor{ dir = 4 }, -/obj/structure/disposalpipe/segment/corner{ - dir = 8 - }, /obj/machinery/door/airlock/security/glass{ id_tag = "BrigRight"; name = "Brig Foyer Right Entrance"; @@ -58479,8 +58477,7 @@ /area/station/hallway/secondary/entry/north) "jKM" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 4; - sort_type_txt = "17" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -58489,6 +58486,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/effect/mapping_helpers/sortjunc_helper/chapel, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) "jKZ" = ( @@ -59079,12 +59077,11 @@ "jVw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/sortjunction{ - sort_type_txt = "19" - }, +/obj/structure/disposalpipe/sortjunction, /obj/structure/cable/extra_insulated{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/sortjunc_helper/bar, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) "jVA" = ( @@ -59352,8 +59349,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction{ - dir = 8; - sort_type_txt = "11" + dir = 8 }, /obj/structure/cable{ icon_state = "2-8" @@ -59362,6 +59358,7 @@ icon_state = "1-2" }, /obj/effect/turf_decal/tiles/department/medical, +/obj/effect/mapping_helpers/sortjunc_helper/chemistry, /turf/simulated/floor/plasteel/white, /area/station/medical/sleeper) "kdy" = ( @@ -61484,9 +61481,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 2; - sort_type_txt = "14" + dir = 2 }, +/obj/effect/mapping_helpers/sortjunc_helper/robotics, /turf/simulated/floor/plasteel/white, /area/station/science/robotics) "kYZ" = ( @@ -64918,11 +64915,11 @@ /area/station/maintenance/asmaint) "mBJ" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 2; - sort_type_txt = "16" + dir = 2 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/mapping_helpers/sortjunc_helper/library, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) "mCc" = ( @@ -68578,8 +68575,7 @@ dir = 8 }, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 2; - sort_type_txt = "6" + dir = 2 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -68590,6 +68586,7 @@ /obj/effect/turf_decal/tiles/department/engineering/side{ dir = 8 }, +/obj/effect/mapping_helpers/sortjunc_helper/atmospherics, /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft/south) "ojs" = ( @@ -69077,8 +69074,7 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction{ - dir = 1; - sort_type_txt = "12" + dir = 1 }, /obj/structure/cable{ icon_state = "2-4" @@ -69089,6 +69085,7 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/effect/mapping_helpers/sortjunc_helper/research, /turf/simulated/floor/plasteel/white, /area/station/science/hallway) "otW" = ( @@ -71129,8 +71126,7 @@ /area/station/maintenance/asmaint) "pqW" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 8; - sort_type_txt = "4" + dir = 8 }, /obj/structure/railing/corner{ dir = 4 @@ -71144,6 +71140,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/engineering, /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft/south) "prd" = ( @@ -73109,10 +73106,10 @@ /turf/simulated/floor/plasteel, /area/station/supply/expedition) "qkk" = ( -/obj/structure/disposalpipe/segment/corner{ +/obj/effect/turf_decal/tiles/department/security/corner, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tiles/department/security/corner, /turf/simulated/floor/plasteel/dark, /area/station/security/brig) "qky" = ( @@ -73166,12 +73163,12 @@ dir = 1 }, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 2; - sort_type_txt = "13" + dir = 2 }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/sortjunc_helper/rd_office, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) "qlY" = ( @@ -75150,8 +75147,7 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/sortjunction{ - dir = 4; - sort_type_txt = "20" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -75159,6 +75155,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/kitchen, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) "raH" = ( @@ -79151,12 +79148,12 @@ dir = 9 }, /obj/structure/disposalpipe/sortjunction{ - dir = 2; - sort_type_txt = "22" + dir = 2 }, /obj/structure/cable/extra_insulated{ icon_state = "1-8" }, +/obj/effect/mapping_helpers/sortjunc_helper/janitor, /turf/simulated/floor/plating, /area/station/maintenance/fore) "sRk" = ( @@ -79166,9 +79163,9 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/sortjunction{ - dir = 8; - sort_type_txt = "18" + dir = 8 }, +/obj/effect/mapping_helpers/sortjunc_helper/captains_office, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/south) "sRR" = ( @@ -81254,9 +81251,9 @@ /area/station/maintenance/apmaint) "tQe" = ( /obj/structure/disposalpipe/sortjunction{ - dir = 4; - sort_type_txt = "13" + dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/rd_office, /turf/simulated/floor/plasteel/white, /area/station/science/hallway) "tQm" = ( @@ -82105,11 +82102,11 @@ /area/station/engineering/hardsuitstorage) "ukw" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 2; - sort_type_txt = "23" + dir = 2 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/mapping_helpers/sortjunc_helper/genetics, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "ukQ" = ( @@ -86073,12 +86070,12 @@ /area/station/maintenance/apmaint2) "wcQ" = ( /obj/structure/disposalpipe/sortjunction{ - dir = 8; - sort_type_txt = "15" + dir = 8 }, /obj/structure/sign/public/restroom{ pixel_y = -32 }, +/obj/effect/mapping_helpers/sortjunc_helper/hop_office, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/south) "wcW" = ( diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index fab56cf76fc..0038d51c7a3 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -19078,12 +19078,12 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/sortjunction{ - dir = 1; - sort_type_txt = "2" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/turf_decal/tiles/department/cargo/corner, +/obj/effect/mapping_helpers/sortjunc_helper/cargo_bay, /turf/simulated/floor/plasteel/dark, /area/station/supply/office) "cVL" = ( @@ -19417,9 +19417,9 @@ dir = 4 }, /obj/structure/disposalpipe/sortjunction{ - dir = 2; - sort_type_txt = "17" + dir = 2 }, +/obj/effect/mapping_helpers/sortjunc_helper/chapel, /turf/simulated/floor/plasteel/dark, /area/station/service/chapel) "cYB" = ( @@ -20073,9 +20073,9 @@ icon_state = "1-4" }, /obj/structure/disposalpipe/sortjunction{ - dir = 8; - sort_type_txt = "23" + dir = 8 }, +/obj/effect/mapping_helpers/sortjunc_helper/genetics, /turf/simulated/floor/plasteel/white, /area/station/science/hallway) "det" = ( @@ -23005,12 +23005,12 @@ /area/station/hallway/primary/port/south) "dHs" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 1; - sort_type_txt = "12" + dir = 1 }, /obj/effect/turf_decal/tiles/department/science/corner{ dir = 8 }, +/obj/effect/mapping_helpers/sortjunc_helper/research, /turf/simulated/floor/plasteel/white, /area/station/science/rnd) "dHN" = ( @@ -27362,10 +27362,10 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/sortjunction{ - dir = 4; - sort_type_txt = "24" + dir = 4 }, /obj/effect/turf_decal/tiles/neutral, +/obj/effect/mapping_helpers/sortjunc_helper/detective, /turf/simulated/floor/plasteel, /area/station/security/lobby) "eFI" = ( @@ -28978,9 +28978,9 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/sortjunction{ - dir = 2; - sort_type_txt = "4" + dir = 2 }, +/obj/effect/mapping_helpers/sortjunc_helper/engineering, /turf/simulated/floor/plasteel/white, /area/station/medical/medbay) "eWu" = ( @@ -29402,9 +29402,9 @@ name = "custom placement" }, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 1; - sort_type_txt = "6" + dir = 1 }, +/obj/effect/mapping_helpers/sortjunc_helper/atmospherics, /turf/simulated/floor/plating, /area/station/maintenance/disposal/east) "fcW" = ( @@ -31589,13 +31589,13 @@ /area/station/maintenance/command/starboard) "fCc" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 4; - sort_type_txt = "14" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/mapping_helpers/sortjunc_helper/robotics, /turf/simulated/floor/plasteel/white, /area/station/science/rnd) "fCg" = ( @@ -37085,8 +37085,7 @@ pixel_y = 32 }, /obj/structure/disposalpipe/sortjunction{ - dir = 4; - sort_type_txt = "22" + dir = 4 }, /obj/structure/cable{ icon_state = "2-8" @@ -37094,6 +37093,7 @@ /obj/effect/turf_decal/tiles/neutral/corner{ dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/janitor, /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/west) "gRg" = ( @@ -38184,9 +38184,9 @@ dir = 8 }, /obj/structure/disposalpipe/sortjunction{ - dir = 2; - sort_type_txt = "5" + dir = 2 }, +/obj/effect/mapping_helpers/sortjunc_helper/ce_office, /turf/simulated/floor/plasteel/white, /area/station/medical/medbay) "hec" = ( @@ -38430,9 +38430,9 @@ dir = 4 }, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 2; - sort_type_txt = "8" + dir = 2 }, +/obj/effect/mapping_helpers/sortjunc_helper/security, /turf/simulated/floor/plasteel/dark, /area/station/security/brig) "hhh" = ( @@ -40383,9 +40383,9 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/sortjunction{ - dir = 4; - sort_type_txt = "9" + dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/medbay, /turf/simulated/floor/plasteel/white, /area/station/medical/sleeper) "hAJ" = ( @@ -41276,12 +41276,12 @@ dir = 4 }, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 8; - sort_type_txt = "14" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/robotics, /turf/simulated/floor/plasteel/white, /area/station/science/hallway) "hKn" = ( @@ -41295,9 +41295,9 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/sortjunction{ - dir = 2; - sort_type_txt = "6" + dir = 2 }, +/obj/effect/mapping_helpers/sortjunc_helper/atmospherics, /turf/simulated/floor/plasteel/white, /area/station/medical/medbay) "hKu" = ( @@ -42890,9 +42890,9 @@ /area/station/maintenance/service/aft_starboard) "iaT" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 2; - sort_type_txt = "19" + dir = 2 }, +/obj/effect/mapping_helpers/sortjunc_helper/bar, /turf/simulated/floor/plating, /area/station/maintenance/disposal/southwest) "iaW" = ( @@ -43222,9 +43222,9 @@ /area/station/science/misc_lab) "idV" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 1; - sort_type_txt = "5" + dir = 1 }, +/obj/effect/mapping_helpers/sortjunc_helper/ce_office, /turf/simulated/floor/plating, /area/station/maintenance/disposal/east) "idX" = ( @@ -43987,9 +43987,9 @@ /area/station/hallway/primary/fore/north) "imM" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 4; - sort_type_txt = "25" + dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/morgue, /turf/simulated/floor/plating, /area/station/maintenance/disposal/east) "imO" = ( @@ -44387,9 +44387,9 @@ /area/station/maintenance/service/fore_port) "ira" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 4; - sort_type_txt = "12" + dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/research, /turf/simulated/floor/plating, /area/station/maintenance/disposal/south) "irc" = ( @@ -51943,9 +51943,9 @@ /area/station/hallway/primary/central/west) "jTA" = ( /obj/structure/disposalpipe/sortjunction{ - dir = 4; - sort_type_txt = "1" + dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/disposals, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -53938,9 +53938,9 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/sortjunction{ - dir = 8; - sort_type_txt = "10" + dir = 8 }, +/obj/effect/mapping_helpers/sortjunc_helper/cmo_office, /turf/simulated/floor/plasteel/white, /area/station/medical/medbay) "ksl" = ( @@ -56694,14 +56694,14 @@ /area/station/maintenance/disposal/southwest) "kUK" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 1; - sort_type_txt = "20" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/extra_insulated{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/sortjunc_helper/kitchen, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -58767,9 +58767,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 2; - sort_type_txt = "7" + dir = 2 }, +/obj/effect/mapping_helpers/sortjunc_helper/hos_office, /turf/simulated/floor/plasteel/dark, /area/station/security/brig) "lqv" = ( @@ -59292,9 +59292,9 @@ /area/station/service/hydroponics) "lvP" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 4; - sort_type_txt = "10" + dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/cmo_office, /turf/simulated/floor/plating, /area/station/maintenance/disposal/east) "lvV" = ( @@ -65209,8 +65209,7 @@ /area/station/maintenance/disposal/external/southeast) "mKZ" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 8; - sort_type_txt = "16" + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -65218,6 +65217,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/effect/mapping_helpers/sortjunc_helper/library, /turf/simulated/floor/plating, /area/station/maintenance/service/fore_port) "mLd" = ( @@ -65348,12 +65348,12 @@ /area/station/service/kitchen) "mMG" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 8; - sort_type_txt = "18" + dir = 8 }, /obj/machinery/light/small{ dir = 1 }, +/obj/effect/mapping_helpers/sortjunc_helper/captains_office, /turf/simulated/floor/plating, /area/station/maintenance/disposal/north) "mMH" = ( @@ -66153,14 +66153,14 @@ /area/station/hallway/primary/fore/north) "mXz" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 1; - sort_type_txt = "21" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/extra_insulated{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/sortjunc_helper/hydroponics, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -69917,9 +69917,9 @@ /area/station/engineering/control) "nPH" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 2; - sort_type_txt = "20" + dir = 2 }, +/obj/effect/mapping_helpers/sortjunc_helper/kitchen, /turf/simulated/floor/plating, /area/station/maintenance/disposal/southwest) "nPI" = ( @@ -70913,9 +70913,9 @@ /area/station/maintenance/science/port) "oaD" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 8; - sort_type_txt = "8" + dir = 8 }, +/obj/effect/mapping_helpers/sortjunc_helper/security, /turf/simulated/floor/plating, /area/station/maintenance/disposal/north) "oaE" = ( @@ -72540,10 +72540,10 @@ /area/station/public/arcade) "orH" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 8; - sort_type_txt = "15" + dir = 8 }, /obj/structure/sign/poster/contraband/random/directional/north, +/obj/effect/mapping_helpers/sortjunc_helper/hop_office, /turf/simulated/floor/plating, /area/station/maintenance/disposal/north) "orO" = ( @@ -75721,9 +75721,9 @@ icon_state = "2-4" }, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 8; - sort_type_txt = "13" + dir = 8 }, +/obj/effect/mapping_helpers/sortjunc_helper/rd_office, /turf/simulated/floor/plasteel/white, /area/station/science/hallway) "pbc" = ( @@ -78329,12 +78329,12 @@ /area/station/maintenance/disposal/southwest) "pEA" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 2; - sort_type_txt = "16" + dir = 2 }, /obj/machinery/light/small{ dir = 8 }, +/obj/effect/mapping_helpers/sortjunc_helper/library, /turf/simulated/floor/plating, /area/station/maintenance/disposal/southwest) "pEB" = ( @@ -78560,8 +78560,7 @@ /area/station/maintenance/maintcentral) "pIs" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 8; - sort_type_txt = "5" + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -78569,6 +78568,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/effect/mapping_helpers/sortjunc_helper/ce_office, /turf/simulated/floor/plasteel/dark, /area/station/engineering/engine_foyer) "pIx" = ( @@ -82545,9 +82545,9 @@ /area/station/maintenance/service/fore_port) "qDH" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 4; - sort_type_txt = "23" + dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/genetics, /turf/simulated/floor/plating, /area/station/maintenance/disposal/south) "qDP" = ( @@ -84770,9 +84770,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/sortjunction{ - dir = 8; - sort_type_txt = "18" + dir = 8 }, +/obj/effect/mapping_helpers/sortjunc_helper/captains_office, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "raV" = ( @@ -85753,9 +85753,9 @@ "rpk" = ( /obj/structure/sign/poster/contraband/random/directional/west, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 2; - sort_type_txt = "21" + dir = 2 }, +/obj/effect/mapping_helpers/sortjunc_helper/hydroponics, /turf/simulated/floor/plating, /area/station/maintenance/disposal/southwest) "rpm" = ( @@ -88934,9 +88934,9 @@ /area/station/maintenance/fsmaint) "rXV" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 1; - sort_type_txt = "4" + dir = 1 }, +/obj/effect/mapping_helpers/sortjunc_helper/engineering, /turf/simulated/floor/plating, /area/station/maintenance/disposal/east) "rYd" = ( @@ -90831,9 +90831,9 @@ /area/station/maintenance/abandonedbar) "stC" = ( /obj/structure/disposalpipe/sortjunction{ - dir = 4; - sort_type_txt = "24" + dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/detective, /turf/simulated/floor/plating, /area/station/maintenance/disposal/west) "stF" = ( @@ -95184,9 +95184,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/disposalpipe/sortjunction/reversed{ - dir = 2; - sort_type_txt = "16" +/obj/structure/disposalpipe/segment/corner{ + dir = 1 }, /turf/simulated/floor/carpet/green, /area/station/service/library) @@ -95772,11 +95771,11 @@ dir = 4 }, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 1; - sort_type_txt = "15" + dir = 1 }, /obj/item/paper_bin/nanotrasen, /obj/item/pen/multi/fountain, +/obj/effect/mapping_helpers/sortjunc_helper/hop_office, /turf/simulated/floor/plasteel/dark, /area/station/command/meeting_room) "txD" = ( @@ -99883,9 +99882,9 @@ "uqM" = ( /obj/effect/decal/cleanable/cobweb, /obj/structure/disposalpipe/sortjunction{ - dir = 4; - sort_type_txt = "7" + dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/hos_office, /turf/simulated/floor/plating, /area/station/maintenance/disposal/west) "uqP" = ( @@ -100330,9 +100329,9 @@ dir = 8 }, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 8; - sort_type_txt = "7" + dir = 8 }, +/obj/effect/mapping_helpers/sortjunc_helper/hos_office, /turf/simulated/floor/plating, /area/station/maintenance/disposal/north) "uvD" = ( @@ -101166,8 +101165,7 @@ /area/station/supply/lobby) "uEj" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 1; - sort_type_txt = "6" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -101180,13 +101178,14 @@ /obj/effect/turf_decal/tiles/department/engineering/side{ dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/atmospherics, /turf/simulated/floor/plasteel/dark, /area/station/engineering/engine_foyer) "uEm" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 4; - sort_type_txt = "13" + dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/rd_office, /turf/simulated/floor/plating, /area/station/maintenance/disposal/south) "uEp" = ( @@ -103210,9 +103209,9 @@ /area/station/maintenance/starboard) "vbE" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 4; - sort_type_txt = "9" + dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/medbay, /turf/simulated/floor/plating, /area/station/maintenance/disposal/east) "vbF" = ( @@ -103474,9 +103473,9 @@ /area/station/hallway/primary/fore/north) "vek" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 2; - sort_type_txt = "17" + dir = 2 }, +/obj/effect/mapping_helpers/sortjunc_helper/chapel, /turf/simulated/floor/plating, /area/station/maintenance/disposal/southwest) "veo" = ( @@ -107045,9 +107044,9 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 4; - sort_type_txt = "14" + dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/robotics, /turf/simulated/floor/plating, /area/station/maintenance/disposal/south) "vQM" = ( @@ -109697,9 +109696,9 @@ /area/station/ai_monitored/storage/eva) "wvm" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 4; - sort_type_txt = "11" + dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/chemistry, /turf/simulated/floor/plating, /area/station/maintenance/disposal/east) "wvr" = ( @@ -110182,8 +110181,7 @@ dir = 1 }, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 8; - sort_type_txt = "19" + dir = 8 }, /obj/effect/turf_decal/tiles/department/virology/corner{ dir = 8 @@ -110191,6 +110189,7 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/effect/mapping_helpers/sortjunc_helper/bar, /turf/simulated/floor/plasteel, /area/station/hallway/primary/port/north) "wAL" = ( @@ -111206,10 +111205,10 @@ /area/station/security/prisonlockers) "wKR" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 8; - sort_type_txt = "22" + dir = 8 }, /obj/machinery/alarm/directional/north, +/obj/effect/mapping_helpers/sortjunc_helper/janitor, /turf/simulated/floor/plating, /area/station/maintenance/disposal/north) "wLd" = ( @@ -112057,13 +112056,13 @@ icon_state = "2-4" }, /obj/structure/disposalpipe/sortjunction{ - dir = 1; - sort_type_txt = "3" + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/qm_office, /turf/simulated/floor/plasteel/dark, /area/station/supply/office) "wUh" = ( @@ -112480,9 +112479,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/sortjunction{ - dir = 2; - sort_type_txt = "11" + dir = 2 }, +/obj/effect/mapping_helpers/sortjunc_helper/chemistry, /turf/simulated/floor/plasteel/white, /area/station/medical/sleeper) "wYa" = ( @@ -113214,12 +113213,12 @@ dir = 4 }, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 8; - sort_type_txt = "4" + dir = 8 }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/sortjunc_helper/engineering, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "xgt" = ( @@ -115680,9 +115679,9 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/sortjunction{ - dir = 8; - sort_type_txt = "25" + dir = 8 }, +/obj/effect/mapping_helpers/sortjunc_helper/morgue, /turf/simulated/floor/plasteel/dark, /area/station/medical/morgue) "xIP" = ( @@ -116750,9 +116749,9 @@ /area/station/engineering/break_room/secondary) "xUm" = ( /obj/structure/disposalpipe/sortjunction{ - dir = 4; - sort_type_txt = "8" + dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/security, /turf/simulated/floor/plating, /area/station/maintenance/disposal/west) "xUt" = ( @@ -117852,12 +117851,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 1; - sort_type_txt = "12" + dir = 1 }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/sortjunc_helper/research, /turf/simulated/floor/plasteel/white, /area/station/science/hallway) "yjw" = ( diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index 0d40760649a..6e4f917eb3b 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -6190,13 +6190,13 @@ dir = 8 }, /obj/structure/disposalpipe/sortjunction{ - dir = 1; - sort_type_txt = "9" + dir = 1 }, /obj/structure/cable{ icon_state = "1-2" }, /obj/effect/turf_decal/tiles/neutral/corner, +/obj/effect/mapping_helpers/sortjunc_helper/medbay, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/se) "aBf" = ( @@ -16683,13 +16683,13 @@ dir = 4 }, /obj/structure/disposalpipe/sortjunction{ - sort_type_txt = "6"; dir = 8 }, /obj/effect/turf_decal/stripes/white/line, /obj/effect/turf_decal/tiles/department/engineering/corner{ dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/atmospherics, /turf/simulated/floor/plasteel, /area/station/hallway/primary/port/north) "bpZ" = ( @@ -20876,7 +20876,6 @@ /area/station/engineering/break_room) "bGH" = ( /obj/structure/disposalpipe/sortjunction{ - sort_type_txt = "4"; dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -20889,6 +20888,7 @@ icon_state = "2-4" }, /obj/effect/turf_decal/tiles/neutral, +/obj/effect/mapping_helpers/sortjunc_helper/engineering, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "bGI" = ( @@ -42638,14 +42638,14 @@ /area/station/medical/psych) "dog" = ( /obj/structure/disposalpipe/sortjunction{ - dir = 8; - sort_type_txt = "3" + dir = 8 }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall14"; location = "hall13" }, /obj/effect/turf_decal/tiles/neutral, +/obj/effect/mapping_helpers/sortjunc_helper/qm_office, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/north) "doj" = ( @@ -51160,9 +51160,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction{ - dir = 1; - sort_type_txt = "8" + dir = 1 }, +/obj/effect/mapping_helpers/sortjunc_helper/security, /turf/simulated/floor/plasteel/dark, /area/station/security/brig) "fbF" = ( @@ -51769,12 +51769,12 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/sortjunction{ - dir = 4; - sort_type_txt = "24" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/turf_decal/tiles/department/security/corner, +/obj/effect/mapping_helpers/sortjunc_helper/detective, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) "fnL" = ( @@ -53648,8 +53648,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 1; - sort_type_txt = "18" + dir = 1 }, /obj/structure/cable{ icon_state = "1-2" @@ -53658,6 +53657,7 @@ /obj/effect/turf_decal/tiles/neutral/corner{ dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/captains_office, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/ne) "fTC" = ( @@ -58831,13 +58831,13 @@ /area/station/maintenance/incinerator) "ibg" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 1; - sort_type_txt = "2" + dir = 1 }, /obj/structure/cable{ icon_state = "1-8" }, /obj/effect/turf_decal/tiles/neutral, +/obj/effect/mapping_helpers/sortjunc_helper/cargo_bay, /turf/simulated/floor/plasteel, /area/station/supply/sorting) "ibh" = ( @@ -62662,9 +62662,9 @@ dir = 4 }, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 4; - sort_type_txt = "16" + dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/library, /turf/simulated/floor/plasteel, /area/station/maintenance/port) "jIB" = ( @@ -64715,12 +64715,12 @@ dir = 4 }, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 1; - sort_type_txt = "25" + dir = 1 }, /obj/structure/cable{ icon_state = "2-8" }, +/obj/effect/mapping_helpers/sortjunc_helper/morgue, /turf/simulated/floor/plasteel/white, /area/station/medical/medbay) "kxJ" = ( @@ -66910,9 +66910,9 @@ dir = 4 }, /obj/structure/disposalpipe/sortjunction{ - dir = 2; - sort_type_txt = "13" + dir = 2 }, +/obj/effect/mapping_helpers/sortjunc_helper/rd_office, /turf/simulated/floor/plasteel/white, /area/station/science/research) "lrt" = ( @@ -67812,8 +67812,7 @@ /area/station/maintenance/electrical/fore_starboard) "lKO" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 2; - sort_type_txt = "21" + dir = 2 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -67824,6 +67823,7 @@ /obj/structure/cable/extra_insulated{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/sortjunc_helper/hydroponics, /turf/simulated/floor/plating, /area/station/maintenance/fore) "lKR" = ( @@ -68389,9 +68389,9 @@ icon_state = "1-8" }, /obj/structure/disposalpipe/sortjunction{ - dir = 8; - sort_type_txt = "9" + dir = 8 }, +/obj/effect/mapping_helpers/sortjunc_helper/medbay, /turf/simulated/floor/plasteel/white, /area/station/medical/medbay) "lYt" = ( @@ -71438,9 +71438,7 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/structure/disposalpipe/sortjunction{ - sort_type_txt = "5" - }, +/obj/structure/disposalpipe/sortjunction, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, @@ -71455,6 +71453,7 @@ dir = 10; initialize_directions = 10 }, +/obj/effect/mapping_helpers/sortjunc_helper/ce_office, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "nhq" = ( @@ -72645,12 +72644,12 @@ dir = 4 }, /obj/structure/disposalpipe/sortjunction{ - dir = 4; - sort_type_txt = "14" + dir = 4 }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/sortjunc_helper/robotics, /turf/simulated/floor/plasteel/dark, /area/station/science/robotics) "nIC" = ( @@ -72819,8 +72818,7 @@ /area/station/security/permabrig) "nNA" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 8; - sort_type_txt = "19" + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -72828,6 +72826,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/effect/mapping_helpers/sortjunc_helper/bar, /turf/simulated/floor/plasteel, /area/station/maintenance/fore) "nNL" = ( @@ -74256,9 +74255,9 @@ icon_state = "2-8" }, /obj/structure/disposalpipe/sortjunction{ - dir = 1; - sort_type_txt = "7" + dir = 1 }, +/obj/effect/mapping_helpers/sortjunc_helper/hos_office, /turf/simulated/floor/plasteel/dark, /area/station/security/brig) "oqS" = ( @@ -75940,10 +75939,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 1; - sort_type_txt = "20" + dir = 1 }, /obj/effect/turf_decal/tiles/neutral, +/obj/effect/mapping_helpers/sortjunc_helper/kitchen, /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/east) "oXw" = ( @@ -78812,8 +78811,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction{ - dir = 8; - sort_type_txt = "22" + dir = 8 }, /obj/structure/cable{ icon_state = "1-4" @@ -78821,6 +78819,7 @@ /obj/effect/turf_decal/tiles/department/virology/corner{ dir = 1 }, +/obj/effect/mapping_helpers/sortjunc_helper/janitor, /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/north) "qdQ" = ( @@ -79795,12 +79794,12 @@ /area/station/command/office/hos) "qAH" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 2; - sort_type_txt = "12" + dir = 2 }, /obj/effect/turf_decal/tiles/department/science/corner{ dir = 8 }, +/obj/effect/mapping_helpers/sortjunc_helper/research, /turf/simulated/floor/plasteel/white, /area/station/science/research) "qAK" = ( @@ -80577,9 +80576,9 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/sortjunction{ - dir = 8; - sort_type_txt = "10" + dir = 8 }, +/obj/effect/mapping_helpers/sortjunc_helper/cmo_office, /turf/simulated/floor/plasteel/white, /area/station/medical/medbay) "qRl" = ( @@ -82418,8 +82417,7 @@ dir = 4 }, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 4; - sort_type_txt = "15" + dir = 4 }, /obj/structure/cable{ icon_state = "1-2" @@ -82431,6 +82429,7 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/effect/mapping_helpers/sortjunc_helper/hop_office, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/sw) "ryd" = ( @@ -85120,12 +85119,11 @@ "syw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/sortjunction{ - sort_type_txt = "17" - }, +/obj/structure/disposalpipe/sortjunction, /obj/structure/cable{ icon_state = "2-4" }, +/obj/effect/mapping_helpers/sortjunc_helper/chapel, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) "syB" = ( @@ -90400,9 +90398,9 @@ dir = 4 }, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 1; - sort_type_txt = "11" + dir = 1 }, +/obj/effect/mapping_helpers/sortjunc_helper/chemistry, /turf/simulated/floor/plasteel/white, /area/station/medical/medbay) "utP" = ( @@ -91597,9 +91595,9 @@ "uTx" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/sortjunction{ - dir = 1; - sort_type_txt = "1" + dir = 1 }, +/obj/effect/mapping_helpers/sortjunc_helper/disposals, /turf/simulated/floor/plating, /area/station/maintenance/fore2) "uTD" = ( diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm index c5989e00171..9221aa7bec6 100644 --- a/_maps/map_files/stations/emeraldstation.dmm +++ b/_maps/map_files/stations/emeraldstation.dmm @@ -441,12 +441,12 @@ dir = 4 }, /obj/structure/disposalpipe/sortjunction{ - dir = 4; - sort_type_txt = "23" + dir = 4 }, /obj/effect/turf_decal/tiles/department/science/corner{ dir = 1 }, +/obj/effect/mapping_helpers/sortjunc_helper/genetics, /turf/simulated/floor/plasteel/white, /area/station/science/research) "ahA" = ( @@ -553,6 +553,7 @@ /obj/effect/turf_decal/tiles/department/cargo/corner{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/station/supply/office) "aiM" = ( @@ -774,9 +775,9 @@ dir = 4 }, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 4; - sort_type_txt = "18" + dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/captains_office, /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/north) "akP" = ( @@ -2638,7 +2639,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tiles/department/cargo/corner{ dir = 1 }, @@ -2646,6 +2646,9 @@ pixel_x = -32; pixel_y = 32 }, +/obj/structure/disposalpipe/segment/corner{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/station/supply/office) "aDk" = ( @@ -3569,7 +3572,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/structure/disposalpipe/segment/corner{ dir = 4 }, /turf/simulated/floor/plasteel, @@ -14541,9 +14544,9 @@ dir = 1 }, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 8; - sort_type_txt = "1" + dir = 8 }, +/obj/effect/mapping_helpers/sortjunc_helper/disposals, /turf/simulated/floor/plasteel, /area/station/supply/storage) "cTM" = ( @@ -15791,9 +15794,9 @@ /area/station/science/research) "dgx" = ( /obj/structure/disposalpipe/sortjunction{ - dir = 4; - sort_type_txt = "24" + dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/detective, /turf/simulated/floor/carpet/grimey, /area/station/security/detective) "dgy" = ( @@ -22965,12 +22968,12 @@ dir = 10 }, /obj/structure/disposalpipe/sortjunction{ - dir = 1; - sort_type_txt = "14" + dir = 1 }, /obj/structure/cable/extra_insulated{ icon_state = "2-8" }, +/obj/effect/mapping_helpers/sortjunc_helper/robotics, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "eEi" = ( @@ -24063,9 +24066,9 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/sortjunction{ - dir = 4; - sort_type_txt = "8" + dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/security, /turf/simulated/floor/plasteel/dark, /area/station/security/brig) "ePo" = ( @@ -27151,6 +27154,15 @@ /obj/effect/turf_decal/tiles/department/security/checker, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) +"fsi" = ( +/obj/effect/turf_decal/tiles/department/cargo/corner{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/station/supply/office) "fsn" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -37690,9 +37702,9 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 4; - sort_type_txt = "15" + dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/hop_office, /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/north) "hxZ" = ( @@ -40641,12 +40653,12 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction{ - dir = 8; - sort_type_txt = "22" + dir = 8 }, /obj/structure/cable/extra_insulated{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/sortjunc_helper/janitor, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "idX" = ( @@ -48316,10 +48328,10 @@ dir = 1 }, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 1; - sort_type_txt = "6" + dir = 1 }, /obj/machinery/hologram/holopad, +/obj/effect/mapping_helpers/sortjunc_helper/atmospherics, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/west) "jFw" = ( @@ -53988,9 +54000,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction{ - dir = 8; - sort_type_txt = "10" + dir = 8 }, +/obj/effect/mapping_helpers/sortjunc_helper/cmo_office, /turf/simulated/floor/plasteel/white, /area/station/medical/medbay2) "kMt" = ( @@ -61442,9 +61454,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction{ - dir = 2; - sort_type_txt = "25" + dir = 2 }, +/obj/effect/mapping_helpers/sortjunc_helper/morgue, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "mqR" = ( @@ -62486,8 +62498,7 @@ /area/station/maintenance/abandoned_garden) "mBX" = ( /obj/structure/disposalpipe/sortjunction{ - dir = 2; - sort_type_txt = "2" + dir = 2 }, /obj/machinery/light_switch{ dir = 8; @@ -62495,6 +62506,7 @@ pixel_x = 24; pixel_y = -5 }, +/obj/effect/mapping_helpers/sortjunc_helper/cargo_bay, /turf/simulated/floor/plasteel, /area/station/supply/sorting) "mCa" = ( @@ -63980,10 +63992,10 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction{ - dir = 2; - sort_type_txt = "11" + dir = 2 }, /obj/effect/turf_decal/tiles/department/medical, +/obj/effect/mapping_helpers/sortjunc_helper/chemistry, /turf/simulated/floor/plasteel/white, /area/station/medical/sleeper) "mSh" = ( @@ -68521,9 +68533,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/disposalpipe/segment/corner{ - dir = 1 - }, /obj/effect/turf_decal/tiles/department/cargo/corner{ dir = 1 }, @@ -83828,9 +83837,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 2; - sort_type_txt = "17" + dir = 2 }, +/obj/effect/mapping_helpers/sortjunc_helper/chapel, /turf/simulated/floor/carpet/black, /area/station/service/chapel) "qIH" = ( @@ -84578,9 +84587,9 @@ dir = 8 }, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 8; - sort_type_txt = "16" + dir = 8 }, +/obj/effect/mapping_helpers/sortjunc_helper/library, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "qQH" = ( @@ -87982,6 +87991,7 @@ /obj/effect/turf_decal/tiles/department/cargo/side{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/station/supply/office) "ryL" = ( @@ -89736,8 +89746,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction{ - dir = 2; - sort_type_txt = "21" + dir = 2 }, /obj/structure/cable{ icon_state = "1-2" @@ -89745,6 +89754,7 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/effect/mapping_helpers/sortjunc_helper/hydroponics, /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft) "rOG" = ( @@ -92635,8 +92645,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction{ - dir = 2; - sort_type_txt = "20" + dir = 2 }, /obj/structure/cable{ icon_state = "1-2" @@ -92644,6 +92653,7 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/effect/mapping_helpers/sortjunc_helper/kitchen, /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft) "stj" = ( @@ -93792,9 +93802,9 @@ dir = 4 }, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 4; - sort_type_txt = "5" + dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/ce_office, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "sEM" = ( @@ -94612,9 +94622,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 1; - sort_type_txt = "4" + dir = 1 }, +/obj/effect/mapping_helpers/sortjunc_helper/engineering, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/west) "sMI" = ( @@ -96743,6 +96753,7 @@ /obj/effect/turf_decal/tiles/department/cargo/corner{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/station/supply/office) "tiK" = ( @@ -98944,9 +98955,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction{ - dir = 8; - sort_type_txt = "9" + dir = 8 }, +/obj/effect/mapping_helpers/sortjunc_helper/medbay, /turf/simulated/floor/plasteel/white, /area/station/medical/medbay2) "tEP" = ( @@ -100009,12 +100020,13 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ icon_state = "2-4" }, +/obj/structure/disposalpipe/sortjunction/reversed{ + dir = 4 + }, +/obj/effect/mapping_helpers/sortjunc_helper/qm_office, /turf/simulated/floor/plasteel, /area/station/supply/office) "tPW" = ( @@ -101641,9 +101653,9 @@ icon_state = "1-8" }, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 4; - sort_type_txt = "7" + dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/hos_office, /turf/simulated/floor/plasteel/dark, /area/station/security/brig) "ugh" = ( @@ -104887,12 +104899,12 @@ /area/station/engineering/smes) "uOW" = ( /obj/structure/disposalpipe/sortjunction{ - dir = 4; - sort_type_txt = "17" + dir = 4 }, /obj/effect/turf_decal/tiles/department/engineering/corner{ dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/chapel, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/west) "uOX" = ( @@ -105687,9 +105699,9 @@ dir = 4 }, /obj/structure/disposalpipe/sortjunction{ - dir = 2; - sort_type_txt = "12" + dir = 2 }, +/obj/effect/mapping_helpers/sortjunc_helper/research, /turf/simulated/floor/plasteel/white, /area/station/science/research) "uWP" = ( @@ -108097,12 +108109,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 1; - sort_type_txt = "19" + dir = 1 }, /obj/structure/cable/extra_insulated{ icon_state = "1-2" }, +/obj/effect/mapping_helpers/sortjunc_helper/bar, /turf/simulated/floor/plating, /area/station/maintenance/aft2) "vxs" = ( @@ -115538,10 +115550,10 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction{ - dir = 4; - sort_type_txt = "13" + dir = 4 }, /obj/effect/turf_decal/tiles/department/science/corner, +/obj/effect/mapping_helpers/sortjunc_helper/rd_office, /turf/simulated/floor/plasteel/white, /area/station/science/research) "wXG" = ( @@ -116176,6 +116188,9 @@ /obj/effect/turf_decal/tiles/department/cargo/corner{ dir = 1 }, +/obj/structure/disposalpipe/segment/corner{ + dir = 2 + }, /turf/simulated/floor/plasteel, /area/station/supply/office) "xfs" = ( @@ -119842,12 +119857,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/turf_decal/tiles/department/cargo/side{ dir = 8 }, +/obj/structure/disposalpipe/sortjunction{ + dir = 8 + }, +/obj/effect/mapping_helpers/sortjunc_helper/qm_office, /turf/simulated/floor/plasteel, /area/station/supply/office) "xRU" = ( @@ -142211,7 +142227,7 @@ uaE nMq izP nRF -eZs +fsi aNc tiJ aiE diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index 742cccfc18e..887dd64c25b 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -765,10 +765,9 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/sortjunction{ - sort_type_txt = "4" - }, +/obj/structure/disposalpipe/sortjunction, /obj/effect/landmark/start/engineer, +/obj/effect/mapping_helpers/sortjunc_helper/engineering, /turf/simulated/floor/plasteel, /area/station/engineering/engine_foyer) "ajQ" = ( @@ -5143,10 +5142,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/disposalpipe/sortjunction{ - dir = 4; - sort_type_txt = "22" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -5156,6 +5151,9 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/east) "aOx" = ( @@ -9254,7 +9252,6 @@ /area/station/engineering/engine_foyer) "bku" = ( /obj/machinery/alarm/directional/west, -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tiles/neutral/corner{ dir = 8 }, @@ -13464,12 +13461,12 @@ icon_state = "1-4" }, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 4; - sort_type_txt = "22" + dir = 4 }, /obj/effect/turf_decal/tiles/neutral/corner{ dir = 8 }, +/obj/effect/mapping_helpers/sortjunc_helper/janitor, /turf/simulated/floor/plasteel, /area/station/public/fitness) "bCU" = ( @@ -19544,8 +19541,7 @@ /area/station/medical/paramedic) "cjA" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 2; - sort_type_txt = "10" + dir = 2 }, /obj/structure/cable{ icon_state = "4-8" @@ -19556,6 +19552,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/cmo_office, /turf/simulated/floor/plasteel/white, /area/station/medical/medbay) "cjB" = ( @@ -25801,13 +25798,6 @@ /obj/effect/turf_decal/tiles/department/medical, /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft/south) -"cQu" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tiles/neutral/corner, -/turf/simulated/floor/plasteel, -/area/station/hallway/primary/fore/east) "cQw" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 4 @@ -28374,8 +28364,7 @@ icon_state = "1-4" }, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 2; - sort_type_txt = "8" + dir = 2 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -28383,6 +28372,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/effect/mapping_helpers/sortjunc_helper/security, /turf/simulated/floor/plasteel/dark, /area/station/security/prison) "dkk" = ( @@ -28851,8 +28841,7 @@ /area/station/hallway/secondary/entry/west) "dsr" = ( /obj/structure/disposalpipe/sortjunction{ - dir = 1; - sort_type_txt = "19" + dir = 1 }, /obj/structure/cable{ icon_state = "1-2" @@ -28860,6 +28849,7 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/effect/mapping_helpers/sortjunc_helper/bar, /turf/simulated/floor/wood, /area/station/service/bar) "dsz" = ( @@ -29413,9 +29403,6 @@ /turf/simulated/floor/plasteel, /area/station/engineering/transmission_laser) "dEB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/sign/poster/official/random/directional/south, /obj/effect/turf_decal/tiles/neutral/corner, /turf/simulated/floor/plasteel, @@ -32321,12 +32308,12 @@ dir = 8 }, /obj/structure/disposalpipe/sortjunction{ - dir = 1; - sort_type_txt = "15" + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/effect/mapping_helpers/sortjunc_helper/hop_office, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/nw) "eCH" = ( @@ -33384,14 +33371,13 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/disposalpipe/sortjunction{ - sort_type_txt = "5" - }, +/obj/structure/disposalpipe/sortjunction, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/sortjunc_helper/ce_office, /turf/simulated/floor/plasteel, /area/station/engineering/engine_foyer) "eUb" = ( @@ -34672,9 +34658,6 @@ /turf/simulated/floor/plasteel/dark, /area/station/engineering/engine/reactor) "fmR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/extinguisher_cabinet{ name = "south bump"; pixel_y = -30 @@ -38327,9 +38310,9 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 8; - sort_type_txt = "3" + dir = 8 }, +/obj/effect/mapping_helpers/sortjunc_helper/qm_office, /turf/simulated/floor/plasteel, /area/station/hallway/supply) "gzv" = ( @@ -38788,9 +38771,9 @@ /area/station/security/prison) "gGC" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 2; - sort_type_txt = "25" + dir = 2 }, +/obj/effect/mapping_helpers/sortjunc_helper/morgue, /turf/simulated/floor/plasteel/white, /area/station/medical/medbay) "gGK" = ( @@ -40687,13 +40670,6 @@ /obj/effect/decal/cleanable/glass, /turf/simulated/floor/plating, /area/station/maintenance/port) -"hmQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tiles/neutral/corner, -/turf/simulated/floor/plasteel, -/area/station/hallway/primary/fore/west) "hmR" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, @@ -43116,8 +43092,7 @@ /area/station/maintenance/fore2) "icA" = ( /obj/structure/disposalpipe/sortjunction{ - dir = 1; - sort_type_txt = "9" + dir = 1 }, /obj/structure/cable/extra_insulated{ icon_state = "1-2" @@ -43128,6 +43103,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/effect/mapping_helpers/sortjunc_helper/medbay, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "icI" = ( @@ -43901,7 +43877,6 @@ /turf/simulated/floor/plasteel/dark, /area/station/engineering/control) "itj" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, @@ -44906,9 +44881,6 @@ /turf/simulated/floor/plasteel, /area/station/supply/office) "iGn" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Fore-West Hallway 1"; dir = 1 @@ -45252,9 +45224,9 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/structure/disposalpipe/sortjunction{ - dir = 1; - sort_type_txt = "7" + dir = 1 }, +/obj/effect/mapping_helpers/sortjunc_helper/hos_office, /turf/simulated/floor/plasteel/dark, /area/station/security/brig) "iKT" = ( @@ -47364,12 +47336,12 @@ /area/station/security/permabrig) "jwv" = ( /obj/structure/disposalpipe/sortjunction{ - dir = 4; - sort_type_txt = "1" + dir = 4 }, /obj/effect/turf_decal/tiles/department/cargo/corner{ dir = 8 }, +/obj/effect/mapping_helpers/sortjunc_helper/disposals, /turf/simulated/floor/plasteel, /area/station/hallway/supply) "jwN" = ( @@ -47886,7 +47858,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/sortjunction/reversed{ - sort_type_txt = "14"; dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -47901,6 +47872,7 @@ /obj/effect/turf_decal/tiles/department/science/corner{ dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/robotics, /turf/simulated/floor/plasteel/white, /area/station/science/research) "jFi" = ( @@ -48055,13 +48027,6 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel, /area/station/hallway/supply/port) -"jHa" = ( -/obj/structure/disposalpipe/segment/corner{ - dir = 1 - }, -/obj/effect/turf_decal/tiles/neutral/corner, -/turf/simulated/floor/plasteel, -/area/station/hallway/primary/fore/west) "jHc" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -49785,16 +49750,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) -"kdr" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tiles/neutral/corner{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/station/hallway/primary/fore/west) "kdt" = ( /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/effect/mapping_helpers/airlock/autoname, @@ -54832,7 +54787,6 @@ /turf/simulated/floor/plasteel/white, /area/station/science/robotics) "lJG" = ( -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tiles/neutral/corner{ dir = 8 }, @@ -55218,9 +55172,6 @@ /area/station/maintenance/medmaint) "lRg" = ( /obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/turf_decal/tiles/neutral/corner, /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/west) @@ -56585,9 +56536,6 @@ /obj/machinery/light{ dir = 8 }, -/obj/structure/disposalpipe/segment/corner{ - dir = 1 - }, /obj/effect/turf_decal/tiles/neutral/corner{ dir = 8 }, @@ -57883,8 +57831,7 @@ /area/station/maintenance/fpmaint) "mPq" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 8; - sort_type_txt = "6" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -57901,6 +57848,7 @@ /obj/effect/turf_decal/tiles/department/engineering/corner{ dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/atmospherics, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) "mPr" = ( @@ -59138,7 +59086,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/junction, /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/west) "nhP" = ( @@ -59342,8 +59290,7 @@ /area/station/security/execution) "nkU" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 2; - sort_type_txt = "13" + dir = 2 }, /obj/structure/cable{ icon_state = "1-2" @@ -59360,6 +59307,7 @@ /obj/effect/turf_decal/tiles/department/science/corner{ dir = 8 }, +/obj/effect/mapping_helpers/sortjunc_helper/rd_office, /turf/simulated/floor/plasteel/white, /area/station/science/research) "nli" = ( @@ -61329,7 +61277,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment/corner, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/west) "nVp" = ( @@ -63721,9 +63671,9 @@ icon_state = "1-4" }, /obj/structure/disposalpipe/sortjunction{ - sort_type_txt = "23"; dir = 8 }, +/obj/effect/mapping_helpers/sortjunc_helper/genetics, /turf/simulated/floor/plasteel/white, /area/station/science/research) "oNn" = ( @@ -64059,9 +64009,9 @@ icon_state = "2-8" }, /obj/structure/disposalpipe/sortjunction{ - dir = 4; - sort_type_txt = "17" + dir = 4 }, +/obj/effect/mapping_helpers/sortjunc_helper/detective, /turf/simulated/floor/plasteel/dark, /area/station/security/brig) "oRx" = ( @@ -66411,9 +66361,6 @@ /turf/simulated/floor/plating, /area/station/maintenance/xenobio_south) "pHH" = ( -/obj/structure/disposalpipe/segment/corner{ - dir = 8 - }, /obj/machinery/power/apc/directional/south, /obj/structure/cable, /obj/effect/turf_decal/tiles/neutral/corner, @@ -67016,9 +66963,9 @@ /area/station/maintenance/medmaint) "pRD" = ( /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 8; - sort_type_txt = "12" + dir = 8 }, +/obj/effect/mapping_helpers/sortjunc_helper/research, /turf/simulated/floor/plasteel/white, /area/station/science/rnd) "pRE" = ( @@ -67341,14 +67288,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=5-Customs"; location = "4-Customs" }, +/obj/structure/disposalpipe/segment/corner{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/west) "pXb" = ( @@ -69787,9 +69733,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 2; - sort_type_txt = "21" + dir = 2 }, +/obj/effect/mapping_helpers/sortjunc_helper/hydroponics, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/se) "qPI" = ( @@ -69799,9 +69745,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/east) "qPJ" = ( @@ -73343,8 +73286,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 2; - sort_type_txt = "19" + dir = 2 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -73355,6 +73297,7 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/effect/mapping_helpers/sortjunc_helper/kitchen, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/east) "rUG" = ( @@ -75787,12 +75730,12 @@ dir = 4 }, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 8; - sort_type_txt = "17" + dir = 8 }, /obj/structure/cable/extra_insulated{ icon_state = "4-8" }, +/obj/effect/mapping_helpers/sortjunc_helper/chapel, /turf/simulated/floor/plating, /area/station/maintenance/aft) "sKT" = ( @@ -76735,9 +76678,9 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/sortjunction{ - dir = 1; - sort_type_txt = "2" + dir = 1 }, +/obj/effect/mapping_helpers/sortjunc_helper/cargo_bay, /turf/simulated/floor/plasteel, /area/station/hallway/supply) "taS" = ( @@ -76818,7 +76761,6 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/fsmaint) "tbP" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/status_display{ layer = 4; pixel_x = -32 @@ -82903,9 +82845,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/disposalpipe/sortjunction/reversed{ - sort_type_txt = "11" - }, +/obj/structure/disposalpipe/sortjunction/reversed, +/obj/effect/mapping_helpers/sortjunc_helper/chemistry, /turf/simulated/floor/plasteel/white, /area/station/medical/medbay) "vds" = ( @@ -83971,12 +83912,12 @@ dir = 8 }, /obj/structure/disposalpipe/sortjunction{ - dir = 1; - sort_type_txt = "16" + dir = 1 }, /obj/structure/cable/extra_insulated{ icon_state = "1-4" }, +/obj/effect/mapping_helpers/sortjunc_helper/library, /turf/simulated/floor/plating, /area/station/maintenance/fore2) "vud" = ( @@ -84905,9 +84846,6 @@ /area/station/security/permabrig) "vIF" = ( /obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/sign/directions/medical{ pixel_y = -24; dir = 4 @@ -87796,13 +87734,13 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction/reversed{ - dir = 2; - sort_type_txt = "20" + dir = 2 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-8" }, +/obj/effect/mapping_helpers/sortjunc_helper/kitchen, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/east) "wFE" = ( @@ -88146,7 +88084,6 @@ /turf/simulated/floor/plasteel, /area/station/security/lobby) "wLu" = ( -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tiles/neutral/corner{ dir = 8 }, @@ -90203,12 +90140,11 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/sortjunction{ - sort_type_txt = "18" - }, +/obj/structure/disposalpipe/sortjunction, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/effect/mapping_helpers/sortjunc_helper/captains_office, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/east) "xpF" = ( @@ -91470,8 +91406,7 @@ /area/station/hallway/secondary/bridge) "xLw" = ( /obj/structure/disposalpipe/sortjunction{ - dir = 4; - sort_type_txt = "20" + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -91485,6 +91420,7 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/effect/mapping_helpers/sortjunc_helper/kitchen, /turf/simulated/floor/wood, /area/station/service/bar) "xLA" = ( @@ -108307,7 +108243,7 @@ hBM ghi bce nVo -kdr +mpx tbP itj bku @@ -108573,7 +108509,7 @@ dma dma dma pXa -jHa +xqq vdD vpx jBk @@ -109344,7 +109280,7 @@ ddV aOA yhJ rbK -hmQ +xqq vdD wTu iBA @@ -109858,7 +109794,7 @@ hvG aOA gCg xgu -hmQ +xqq nrY nrY nrY @@ -110115,7 +110051,7 @@ lIM lIM roI rbK -hmQ +xqq nrY bpE xYE @@ -110372,7 +110308,7 @@ mtd lIM bUs rbK -hmQ +xqq nrY cdL lNJ @@ -111143,7 +111079,7 @@ lIM lIM cJI sTC -cQu +tDA nrY nrY nrY @@ -111400,7 +111336,7 @@ aaa cnN vaL sTC -cQu +tDA sYX bCf ibB diff --git a/code/__DEFINES/tagger_locations.dm b/code/__DEFINES/tagger_locations.dm new file mode 100644 index 00000000000..4f3ccf3075f --- /dev/null +++ b/code/__DEFINES/tagger_locations.dm @@ -0,0 +1,36 @@ +//List of possible tagger locations for junctions mail sorting +//I assume you, DON'T fuck with order, it'll break everything +#define TAGGER_LOCATION_DISPOSALS 1 +#define TAGGER_LOCATION_CARGO_BAY 2 +#define TAGGER_LOCATION_QM_OFFICE 3 +#define TAGGER_LOCATION_ENGINEERING 4 +#define TAGGER_LOCATION_CE_OFFICE 5 +#define TAGGER_LOCATION_ATMOSPHERICS 6 +#define TAGGER_LOCATION_HOS_OFFICE 7 +#define TAGGER_LOCATION_SECURITY 8 +#define TAGGER_LOCATION_MEDBAY 9 +#define TAGGER_LOCATION_CMO_OFFICE 10 +#define TAGGER_LOCATION_CHEMISTRY 11 +#define TAGGER_LOCATION_RESEARCH 12 +#define TAGGER_LOCATION_RD_OFFICE 13 +#define TAGGER_LOCATION_ROBOTICS 14 +#define TAGGER_LOCATION_HOP_OFFICE 15 +#define TAGGER_LOCATION_LIBRARY 16 +#define TAGGER_LOCATION_CHAPEL 17 +#define TAGGER_LOCATION_CAPTAIN_OFFICE 18 +#define TAGGER_LOCATION_BAR 19 +#define TAGGER_LOCATION_KITCHEN 20 +#define TAGGER_LOCATION_HYDROPONICS 21 +#define TAGGER_LOCATION_JANITOR 22 +#define TAGGER_LOCATION_GENETICS 23 +#define TAGGER_LOCATION_DETECTIVE 24 +#define TAGGER_LOCATION_MORGUE 25 + +//Again, if you don't want to fuck up disposals, add to this list, and don't change the order. +//If you insist on changing the order, you'll have to change every sort junction to reflect the new order. --Pete +GLOBAL_LIST_INIT(TAGGERLOCATIONS, list("Disposals", + "Cargo Bay", "QM Office", "Engineering", "CE Office", + "Atmospherics", "HoS Office", "Security", "Medbay", + "CMO Office", "Chemistry", "Research", "RD Office", + "Robotics", "HoP Office", "Library", "Chapel", "Captain's Office", + "Bar", "Kitchen", "Hydroponics", "Janitor Closet","Genetics", "Detective", "Morgue")) diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index f9c5a101f04..97a7b997261 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -28,20 +28,6 @@ GLOBAL_LIST_EMPTY(socks_f) //stores only socks name //Alt Heads GLOBAL_LIST_EMPTY(alt_heads_list) //stores /datum/sprite_accessory/alt_heads indexed by name -// Reference list for disposal sort junctions. Set the sort_type_txt variable on disposal sort junctions to -// the index of the sort department that you want. For example, adding "2" to sort_type_txt will reroute all packages -// tagged for the Cargo Bay. Multiple destinations can be added by separating them with ;, like "2;8" for Cargo Bay and Security. - -//If you don't want to fuck up disposals, add to this list, and don't change the order. -//If you insist on changing the order, you'll have to change every sort junction to reflect the new order. --Pete - -GLOBAL_LIST_INIT(TAGGERLOCATIONS, list("Disposals", - "Cargo Bay", "QM Office", "Engineering", "CE Office", - "Atmospherics", "HoS Office", "Security", "Medbay", - "CMO Office", "Chemistry", "Research", "RD Office", - "Robotics", "HoP Office", "Library", "Chapel", "Captain's Office", - "Bar", "Kitchen", "Hydroponics", "Janitor Closet","Genetics", "Detective", "Morgue")) - GLOBAL_LIST_INIT(greek_letters, list("Alpha", "Beta", "Gamma", "Delta", "Epsilon", "Zeta", "Eta", "Theta", "Iota", "Kappa", "Lambda", "Mu", "Nu", "Xi", "Omicron", "Pi", "Rho", "Sigma", "Tau", "Upsilon", "Phi", diff --git a/code/modules/mapping/mail_sorting_helpers.dm b/code/modules/mapping/mail_sorting_helpers.dm new file mode 100644 index 00000000000..5af71ecac01 --- /dev/null +++ b/code/modules/mapping/mail_sorting_helpers.dm @@ -0,0 +1,50 @@ +//Disposal delivery helpers +//Just slap em above sorting junction and they will set their sorting tag by themselves +/obj/effect/mapping_helpers/sortjunc_helper + icon_state = "mail_sorting" + late = TRUE + var/sort_type = list() + +/obj/effect/mapping_helpers/sortjunc_helper/Initialize(mapload) + . = ..() + var/obj/structure/disposalpipe/sortjunction/mail_sorter = locate(/obj/structure/disposalpipe/sortjunction) in loc + if(mail_sorter) + mail_sorter.sort_type = sort_type + mail_sorter.update_appearance(UPDATE_NAME|UPDATE_DESC) + else + log_world("[src] failed to find a sorting junction pipe at [AREACOORD(src)]") + qdel(src) + +#define MAILSORTINGHELPERS(helper_type, sort_id, icon) \ + /obj/effect/mapping_helpers/sortjunc_helper/##helper_type { \ + sort_type = sort_id; \ + icon_state = icon; \ + } + +MAILSORTINGHELPERS(disposals, list(TAGGER_LOCATION_DISPOSALS), "mail_sorting_sup") +MAILSORTINGHELPERS(cargo_bay, list(TAGGER_LOCATION_CARGO_BAY), "mail_sorting_sup") +MAILSORTINGHELPERS(qm_office, list(TAGGER_LOCATION_QM_OFFICE), "mail_sorting_com") +MAILSORTINGHELPERS(engineering, list(TAGGER_LOCATION_ENGINEERING), "mail_sorting_eng") +MAILSORTINGHELPERS(ce_office, list(TAGGER_LOCATION_CE_OFFICE), "mail_sorting_com") +MAILSORTINGHELPERS(atmospherics, list(TAGGER_LOCATION_ATMOSPHERICS), "mail_sorting_eng") +MAILSORTINGHELPERS(hos_office, list(TAGGER_LOCATION_HOS_OFFICE), "mail_sorting_com") +MAILSORTINGHELPERS(security, list(TAGGER_LOCATION_SECURITY), "mail_sorting_sec") +MAILSORTINGHELPERS(medbay, list(TAGGER_LOCATION_MEDBAY), "mail_sorting_med") +MAILSORTINGHELPERS(cmo_office, list(TAGGER_LOCATION_CMO_OFFICE), "mail_sorting_com") +MAILSORTINGHELPERS(chemistry, list(TAGGER_LOCATION_CHEMISTRY), "mail_sorting_med") +MAILSORTINGHELPERS(research, list(TAGGER_LOCATION_RESEARCH), "mail_sorting_sci") +MAILSORTINGHELPERS(rd_office, list(TAGGER_LOCATION_RD_OFFICE), "mail_sorting_com") +MAILSORTINGHELPERS(robotics, list(TAGGER_LOCATION_ROBOTICS), "mail_sorting_sci") +MAILSORTINGHELPERS(hop_office, list(TAGGER_LOCATION_HOP_OFFICE), "mail_sorting_com") +MAILSORTINGHELPERS(library, list(TAGGER_LOCATION_LIBRARY), "mail_sorting_serv") +MAILSORTINGHELPERS(chapel, list(TAGGER_LOCATION_CHAPEL), "mail_sorting_serv") +MAILSORTINGHELPERS(captains_office, list(TAGGER_LOCATION_CAPTAIN_OFFICE), "mail_sorting_com") +MAILSORTINGHELPERS(bar, list(TAGGER_LOCATION_BAR), "mail_sorting_serv") +MAILSORTINGHELPERS(kitchen, list(TAGGER_LOCATION_KITCHEN), "mail_sorting_serv") +MAILSORTINGHELPERS(hydroponics, list(TAGGER_LOCATION_HYDROPONICS), "mail_sorting_serv") +MAILSORTINGHELPERS(janitor, list(TAGGER_LOCATION_JANITOR), "mail_sorting_serv") +MAILSORTINGHELPERS(genetics, list(TAGGER_LOCATION_GENETICS), "mail_sorting_sci") +MAILSORTINGHELPERS(detective, list(TAGGER_LOCATION_DETECTIVE), "mail_sorting_sec") +MAILSORTINGHELPERS(morgue, list(TAGGER_LOCATION_MORGUE), "mail_sorting_med") + +#undef MAILSORTINGHELPERS diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index bd31f4ccf98..d86935440b4 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -1181,7 +1181,6 @@ name = "disposal sort junction" icon_state = "pipe-j1s" var/list/sort_type = list(1) - var/sort_type_txt //Look at the list called TAGGERLOCATIONS in /code/_globalvars/lists/flavor_misc.dm and cry var/posdir = 0 var/negdir = 0 var/sortdir = 0 @@ -1204,37 +1203,10 @@ /obj/structure/disposalpipe/sortjunction/Initialize(mapload) . = ..() updatedir() - if(mapload) - parse_sort_destinations() update_appearance(UPDATE_NAME|UPDATE_DESC) update() return -/obj/structure/disposalpipe/sortjunction/proc/parse_sort_destinations() - if(sort_type_txt == "1") - return - - var/list/sort_type_str = splittext(sort_type_txt, ";") - var/mapping_fail - - if(length(sort_type_str)) // Default to disposals if mapped with it along other destinations - if("1" in sort_type_str) - mapping_fail = "Mutually exclusive sort types in sort_type_txt" - else - var/new_sort_type = list() - for(var/x in sort_type_str) - var/n = text2num(x) - if(n) - new_sort_type |= n - if(length(new_sort_type)) - sort_type = new_sort_type - else - mapping_fail = "No sort types after parsing sort_type_txt" - else - mapping_fail = "Sort_type_txt is empty" - if(mapping_fail) - stack_trace("[src] mapped incorrectly at [x],[y],[z] - [mapping_fail]") - /obj/structure/disposalpipe/sortjunction/item_interaction(mob/living/user, obj/item/I, list/modifiers) if(..()) return ITEM_INTERACT_COMPLETE diff --git a/icons/effects/mapping_helpers.dmi b/icons/effects/mapping_helpers.dmi index 4dea033fd33931753ec13ad15f94bd7456e7c82a..fd694fe230f2912a6622899efd780856d380d302 100644 GIT binary patch literal 22112 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 literal 19684 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