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 4dea033fd33..fd694fe230f 100644 Binary files a/icons/effects/mapping_helpers.dmi and b/icons/effects/mapping_helpers.dmi differ diff --git a/paradise.dme b/paradise.dme index 55e784a221e..dee7109402c 100644 --- a/paradise.dme +++ b/paradise.dme @@ -144,6 +144,7 @@ #include "code\__DEFINES\supermatter_defines.dm" #include "code\__DEFINES\supply_defines.dm" #include "code\__DEFINES\surgery_defines.dm" +#include "code\__DEFINES\tagger_locations.dm" #include "code\__DEFINES\text_defines.dm" #include "code\__DEFINES\tg_cooldowns.dm" #include "code\__DEFINES\tgs.dm" @@ -2613,6 +2614,7 @@ #include "code\modules\mapping\base_map_datum.dm" #include "code\modules\mapping\dynamic_airlock_linker.dm" #include "code\modules\mapping\dynamic_airlocks.dm" +#include "code\modules\mapping\mail_sorting_helpers.dm" #include "code\modules\mapping\mapping_helpers.dm" #include "code\modules\mapping\merge_conflicts.dm" #include "code\modules\mapping\windoor_access_helpers.dm"