diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index 50f6f616a00..832cab39e87 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -3429,7 +3429,6 @@ /obj/structure/disposalpipe/sortjunction{ dir = 2; icon_state = "pipe-j2s"; - name = "Sci Robotics"; sort_type_txt = "14" }, /turf/simulated/floor/plasteel, @@ -49474,7 +49473,6 @@ /obj/structure/disposalpipe/sortjunction{ dir = 2; icon_state = "pipe-j2s"; - name = "Sci R&D"; sort_type_txt = "12" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -52635,7 +52633,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction{ dir = 8; - name = "Medbay Hall"; sort_type_txt = "9" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -53381,7 +53378,6 @@ }, /obj/structure/disposalpipe/sortjunction{ dir = 8; - name = "Disposals Maint"; sort_type_txt = "1" }, /turf/simulated/floor/plasteel, @@ -54036,7 +54032,6 @@ /obj/machinery/door/firedoor, /obj/structure/disposalpipe/sortjunction{ dir = 1; - name = "Brig Equipment Storage"; sort_type_txt = "8" }, /obj/structure/cable{ @@ -54613,7 +54608,6 @@ }, /obj/structure/disposalpipe/sortjunction{ dir = 1; - name = "Brig HoS Office"; sort_type_txt = "7" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -55585,7 +55579,6 @@ }, /obj/structure/disposalpipe/sortjunction{ dir = 2; - name = "Detective"; sort_type_txt = "24" }, /turf/simulated/floor/plasteel{ @@ -55932,7 +55925,6 @@ "fzc" = ( /obj/structure/disposalpipe/sortjunction{ dir = 4; - name = "Botany"; sort_type_txt = "21" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -57089,7 +57081,6 @@ }, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 2; - name = "Eng Chief Engineer's Office"; sort_type_txt = "5" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -60437,7 +60428,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 1; - name = "Sorting Office"; sort_type_txt = "2" }, /turf/simulated/floor/plasteel, @@ -60775,7 +60765,6 @@ }, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 1; - name = "QM Office"; sort_type_txt = "3" }, /turf/simulated/floor/plasteel, @@ -61694,7 +61683,6 @@ /obj/structure/disposalpipe/sortjunction{ dir = 8; icon_state = "pipe-j2s"; - name = "Med. CMO"; sort_type_txt = "10" }, /obj/machinery/light{ @@ -64417,7 +64405,6 @@ /obj/structure/disposalpipe/sortjunction{ dir = 4; icon_state = "pipe-j2s"; - name = "Chapel"; sort_type_txt = "17" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -64911,7 +64898,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/sortjunction{ - name = "Bar"; sort_type_txt = "19" }, /turf/simulated/floor/plating, @@ -65168,7 +65154,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction{ dir = 8; - name = "Med Chemistry"; sort_type_txt = "11" }, /obj/structure/cable{ @@ -67109,7 +67094,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 2; - name = "Sci Robotics"; sort_type_txt = "14" }, /turf/simulated/floor/plasteel{ @@ -70246,7 +70230,6 @@ /obj/structure/disposalpipe/sortjunction{ dir = 2; icon_state = "pipe-j2s"; - name = "Library"; sort_type_txt = "16" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -73491,7 +73474,6 @@ }, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 2; - name = "Eng Atmospherics"; sort_type_txt = "6" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -74025,7 +74007,6 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction{ dir = 1; - name = "Sci R&D"; sort_type_txt = "12" }, /obj/structure/cable{ @@ -76027,7 +76008,6 @@ /obj/structure/disposalpipe/sortjunction{ dir = 8; icon_state = "pipe-j2s"; - name = "Engineering Main"; sort_type_txt = "4" }, /obj/structure/railing/corner{ @@ -77872,7 +77852,6 @@ /obj/structure/disposalpipe/sortjunction{ dir = 2; icon_state = "pipe-j2s"; - name = "Sci RD Office 1"; sort_type_txt = "13" }, /obj/structure/cable{ @@ -79724,7 +79703,6 @@ }, /obj/structure/disposalpipe/sortjunction{ dir = 4; - name = "Kitchen"; sort_type_txt = "20" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -83342,7 +83320,6 @@ }, /obj/structure/disposalpipe/sortjunction{ dir = 2; - name = "Janitor"; sort_type_txt = "22" }, /turf/simulated/floor/plating, @@ -83357,7 +83334,6 @@ }, /obj/structure/disposalpipe/sortjunction{ dir = 8; - name = "Captain's Office"; sort_type_txt = "18" }, /turf/simulated/floor/plasteel, @@ -85224,7 +85200,6 @@ "tQe" = ( /obj/structure/disposalpipe/sortjunction{ dir = 4; - name = "Sci RD Office 1"; sort_type_txt = "13" }, /turf/simulated/floor/plasteel{ @@ -86050,7 +86025,6 @@ "ukw" = ( /obj/structure/disposalpipe/sortjunction/reversed{ dir = 2; - name = "Genetics"; sort_type_txt = "23" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -89593,7 +89567,6 @@ "wcQ" = ( /obj/structure/disposalpipe/sortjunction{ dir = 8; - name = "HoP Office"; sort_type_txt = "15" }, /turf/simulated/floor/plasteel, diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index 0208324f3d9..ba544bdc38e 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -1869,7 +1869,6 @@ "alM" = ( /obj/structure/disposalpipe/sortjunction/reversed{ dir = 8; - name = "disposal pipe - HoP Office"; sort_type_txt = "15" }, /obj/machinery/light/small{ @@ -6461,7 +6460,6 @@ }, /obj/structure/disposalpipe/sortjunction{ dir = 8; - name = "disposal pipe - HoS"; sort_type_txt = "7" }, /turf/simulated/floor/plasteel{ @@ -17376,7 +17374,6 @@ }, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 8; - name = "disposal pipe - Atmospherics"; sort_type_txt = "6" }, /turf/simulated/floor/plating, @@ -18185,7 +18182,6 @@ }, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 8; - name = "disposal pipe - CE Office"; sort_type_txt = "5" }, /turf/simulated/floor/plasteel{ @@ -21720,9 +21716,8 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/sortjunction/reversed{ - name = "disposal pipe - Medbay"; - sort_type_txt = "9"; - dir = 8 + dir = 8; + sort_type_txt = "9" }, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" @@ -26144,7 +26139,6 @@ "cNN" = ( /obj/structure/disposalpipe/sortjunction/reversed{ dir = 1; - name = "disposal pipe - CMO Office"; sort_type_txt = "10" }, /turf/simulated/floor/plating, @@ -29546,7 +29540,6 @@ }, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 8; - name = "disposal pipe - QM Office"; sort_type_txt = "3" }, /turf/simulated/floor/plasteel{ @@ -31071,7 +31064,6 @@ }, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 8; - name = "disposal pipe - RD Office"; sort_type_txt = "13" }, /obj/structure/cable/orange{ @@ -33616,7 +33608,6 @@ "dGr" = ( /obj/structure/disposalpipe/sortjunction/reversed{ dir = 2; - name = "disposal pipe - Library"; sort_type_txt = "16" }, /turf/simulated/floor/plating, @@ -33687,7 +33678,6 @@ "dHs" = ( /obj/structure/disposalpipe/sortjunction/reversed{ dir = 1; - name = "disposal pipe - Research"; sort_type_txt = "12" }, /turf/simulated/floor/plasteel{ @@ -34738,7 +34728,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 2; - name = "disposal pipe - Library"; sort_type_txt = "16" }, /turf/simulated/floor/carpet/green, @@ -34885,7 +34874,6 @@ "eag" = ( /obj/structure/disposalpipe/sortjunction/reversed{ dir = 1; - name = "disposal pipe - Atmospherics"; sort_type_txt = "6" }, /obj/structure/grille/broken, @@ -35468,7 +35456,6 @@ }, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 8; - name = "disposal pipe - Engineering"; sort_type_txt = "4" }, /turf/simulated/floor/plasteel{ @@ -36137,7 +36124,6 @@ "exL" = ( /obj/structure/disposalpipe/sortjunction/reversed{ dir = 1; - name = "disposal pipe - Medbay"; sort_type_txt = "9" }, /obj/item/wrench, @@ -39123,7 +39109,6 @@ }, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 4; - name = "disposal pipe - Robotics"; sort_type_txt = "14" }, /turf/simulated/floor/plasteel/white, @@ -43205,7 +43190,6 @@ "gZc" = ( /obj/structure/disposalpipe/sortjunction/reversed{ dir = 1; - name = "disposal pipe - Chemistry"; sort_type_txt = "11" }, /obj/structure/cable/orange{ @@ -43585,7 +43569,6 @@ }, /obj/structure/disposalpipe/sortjunction{ dir = 4; - name = "disposal pipe - Chapel"; sort_type_txt = "17" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -45515,7 +45498,6 @@ }, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 8; - name = "disposal pipe - Robotics"; sort_type_txt = "14" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -46663,7 +46645,6 @@ "idV" = ( /obj/structure/disposalpipe/sortjunction/reversed{ dir = 1; - name = "disposal pipe - CE Office"; sort_type_txt = "5" }, /turf/simulated/floor/plating, @@ -47563,7 +47544,6 @@ "ira" = ( /obj/structure/disposalpipe/sortjunction/reversed{ dir = 4; - name = "disposal pipe - Research"; sort_type_txt = "12" }, /obj/structure/cable/orange{ @@ -48138,7 +48118,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 4; - name = "disposal pipe - CMO Office"; sort_type_txt = "10" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -51610,7 +51589,6 @@ "jCE" = ( /obj/structure/disposalpipe/sortjunction/reversed{ dir = 1; - name = "disposal pipe - Kitchen"; sort_type_txt = "20" }, /turf/simulated/floor/plating{ @@ -53627,7 +53605,6 @@ "klh" = ( /obj/structure/disposalpipe/sortjunction/reversed{ dir = 2; - name = "disposal pipe - Hydroponics"; sort_type_txt = "21" }, /obj/structure/cable/orange{ @@ -56196,7 +56173,6 @@ /obj/effect/spawner/lootdrop/maintenance, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 4; - name = "disposal pipe - Morgue"; sort_type_txt = "25" }, /turf/simulated/floor/plating, @@ -57992,7 +57968,6 @@ "lye" = ( /obj/structure/disposalpipe/sortjunction{ dir = 8; - name = "disposal pipe - Morgue"; sort_type_txt = "25" }, /obj/structure/cable/orange{ @@ -58051,7 +58026,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 1; - name = "disposal pipe - Research"; sort_type_txt = "12" }, /obj/structure/cable/orange{ @@ -58948,7 +58922,6 @@ "lOw" = ( /obj/structure/disposalpipe/sortjunction{ dir = 4; - name = "disposal pipe - Chapel"; sort_type_txt = "17" }, /turf/simulated/floor/carpet/green, @@ -62216,7 +62189,6 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 8; - name = "disposal pipe - Hydroponics"; sort_type_txt = "21" }, /obj/structure/cable{ @@ -63498,7 +63470,6 @@ "noS" = ( /obj/structure/disposalpipe/sortjunction{ dir = 4; - name = "disposal pipe - HoS"; sort_type_txt = "7" }, /turf/simulated/floor/plating, @@ -65099,7 +65070,6 @@ "nPH" = ( /obj/structure/disposalpipe/sortjunction/reversed{ dir = 2; - name = "disposal pipe - Kitchen"; sort_type_txt = "20" }, /turf/simulated/floor/plating, @@ -65999,7 +65969,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/sortjunction{ dir = 2; - name = "disposal pipe - Genetics"; sort_type_txt = "23" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -66154,7 +66123,6 @@ }, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 1; - name = "disposal pipe - Atmospherics"; sort_type_txt = "6" }, /turf/simulated/floor/plasteel{ @@ -66777,7 +66745,6 @@ }, /obj/structure/disposalpipe/sortjunction{ dir = 4; - name = "disposal pipe - Detective"; sort_type_txt = "24" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -70465,7 +70432,6 @@ "pBh" = ( /obj/structure/disposalpipe/sortjunction/reversed{ dir = 4; - name = "disposal pipe - Robotics"; sort_type_txt = "14" }, /turf/simulated/floor/plating, @@ -70674,7 +70640,6 @@ "pEA" = ( /obj/structure/disposalpipe/sortjunction/reversed{ dir = 2; - name = "disposal pipe - Bar"; sort_type_txt = "19" }, /turf/simulated/floor/plating, @@ -71963,7 +71928,6 @@ /obj/structure/grille, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 8; - name = "disposal pipe - Custodials"; sort_type_txt = "22" }, /turf/simulated/floor/plating, @@ -75403,7 +75367,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/sortjunction{ dir = 8; - name = "disposal pipe - Captain's Office"; sort_type_txt = "18" }, /turf/simulated/floor/plasteel{ @@ -76109,7 +76072,6 @@ "rpk" = ( /obj/structure/disposalpipe/sortjunction/reversed{ dir = 2; - name = "disposal pipe - Chapel"; sort_type_txt = "17" }, /turf/simulated/floor/plating, @@ -76765,7 +76727,6 @@ "rCJ" = ( /obj/structure/disposalpipe/sortjunction/reversed{ dir = 1; - name = "disposal pipe - Genetics"; sort_type_txt = "23" }, /obj/structure/cable/orange{ @@ -77032,7 +76993,6 @@ "rIJ" = ( /obj/structure/disposalpipe/sortjunction/reversed{ dir = 8; - name = "disposal pipe - Captain's Office"; sort_type_txt = "18" }, /obj/effect/decal/cleanable/dirt, @@ -77904,7 +77864,6 @@ "rXV" = ( /obj/structure/disposalpipe/sortjunction/reversed{ dir = 1; - name = "disposal pipe - Engineering"; sort_type_txt = "4" }, /turf/simulated/floor/plating, @@ -79347,7 +79306,6 @@ "stC" = ( /obj/structure/disposalpipe/sortjunction{ dir = 4; - name = "disposal pipe - Detective"; sort_type_txt = "24" }, /turf/simulated/floor/plating, @@ -82226,7 +82184,6 @@ "tqm" = ( /obj/structure/disposalpipe/sortjunction/reversed{ dir = 1; - name = "disposal pipe - Chemistry"; sort_type_txt = "11" }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, @@ -82296,7 +82253,6 @@ }, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 8; - name = "disposal pipe - Engineering"; sort_type_txt = "4" }, /obj/item/assembly/mousetrap/armed, @@ -82680,7 +82636,6 @@ }, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 1; - name = "disposal pipe - HoP Office"; sort_type_txt = "15" }, /turf/simulated/floor/plasteel{ @@ -82877,7 +82832,6 @@ }, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 8; - name = "disposal pipe - Bar"; sort_type_txt = "19" }, /turf/simulated/floor/plasteel{ @@ -85300,7 +85254,6 @@ "uqM" = ( /obj/structure/disposalpipe/sortjunction{ dir = 4; - name = "disposal pipe - Security"; sort_type_txt = "8" }, /obj/effect/decal/cleanable/cobweb, @@ -85870,7 +85823,6 @@ }, /obj/structure/disposalpipe/sortjunction{ dir = 1; - name = "disposal pipe - Security"; sort_type_txt = "7" }, /turf/simulated/floor/plasteel{ @@ -86226,7 +86178,6 @@ "uEm" = ( /obj/structure/disposalpipe/sortjunction/reversed{ dir = 4; - name = "disposal pipe - RD Office"; sort_type_txt = "13" }, /turf/simulated/floor/plating, @@ -89790,7 +89741,6 @@ }, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 8; - name = "disposal pipe - Hydroponics"; sort_type_txt = "21" }, /turf/simulated/floor/plating{ @@ -89922,7 +89872,6 @@ "vHe" = ( /obj/structure/disposalpipe/sortjunction/reversed{ dir = 4; - name = "disposal pipe - CMO Office"; sort_type_txt = "10" }, /turf/simulated/floor/plasteel{ @@ -92777,7 +92726,6 @@ }, /obj/structure/disposalpipe/sortjunction{ dir = 4; - name = "disposal pipe - Library"; sort_type_txt = "16" }, /turf/simulated/floor/plating{ @@ -94623,9 +94571,8 @@ pixel_y = 32 }, /obj/structure/disposalpipe/sortjunction{ - name = "disposal pipe - Custodials"; - sort_type_txt = "22"; - dir = 4 + dir = 4; + sort_type_txt = "22" }, /obj/structure/cable/orange{ d1 = 4; @@ -95177,7 +95124,6 @@ }, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 8; - name = "disposal pipe - CE Office"; sort_type_txt = "5" }, /turf/simulated/floor/plating{ @@ -97058,7 +97004,6 @@ }, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 8; - name = "disposal pipe - Kitchen"; sort_type_txt = "20" }, /turf/simulated/floor/plasteel{ diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index 0ffcb4bf05a..03823bcfdc8 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -6965,7 +6965,6 @@ }, /obj/structure/disposalpipe/sortjunction{ dir = 1; - name = "Medbay Junction"; sort_type_txt = "9" }, /obj/structure/cable{ @@ -26101,7 +26100,7 @@ dir = 8; level = 3; name = "Distribution and Waste Monitor"; - autolink_sensors = list("mair_in_meter"="Mixed Air In","air_sensor"="Mixed Air Supply Tank","mair_out_meter"="Mixed Air Out","dloop_atm_meter"="Distribution Loop","wloop_atm_meter"="Waste Loop") + autolink_sensors = list("mair_in_meter" = "Mixed Air In", "air_sensor" = "Mixed Air Supply Tank", "mair_out_meter" = "Mixed Air Out", "dloop_atm_meter" = "Distribution Loop", "wloop_atm_meter" = "Waste Loop") }, /turf/simulated/floor/plasteel{ dir = 4; @@ -27246,7 +27245,6 @@ }, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 2; - name = "Bar Junction"; sort_type_txt = "19" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -57053,7 +57051,6 @@ "dog" = ( /obj/structure/disposalpipe/sortjunction{ dir = 8; - name = "Quartermaster Junction"; sort_type_txt = "3" }, /obj/machinery/navbeacon{ @@ -66004,7 +66001,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction{ dir = 8; - name = "Detective"; sort_type_txt = "24" }, /turf/simulated/floor/plasteel{ @@ -67942,7 +67938,6 @@ dir = 5 }, /obj/structure/disposalpipe/sortjunction{ - name = "Atmospherics Junction"; sort_type_txt = "6" }, /turf/simulated/floor/plasteel{ @@ -67974,7 +67969,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 1; - name = "Captain's Junction"; sort_type_txt = "18" }, /obj/structure/cable{ @@ -72197,7 +72191,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction{ dir = 1; - name = "HoS Junction"; sort_type_txt = "7" }, /turf/simulated/floor/plasteel{ @@ -73980,7 +73973,6 @@ }, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 4; - name = "Library Junction"; sort_type_txt = "16" }, /turf/simulated/floor/plasteel, @@ -75442,7 +75434,6 @@ }, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 1; - name = "Morgue"; sort_type_txt = "25" }, /turf/simulated/floor/plasteel/white, @@ -76909,7 +76900,6 @@ }, /obj/structure/disposalpipe/sortjunction{ dir = 2; - name = "RD Junction 1"; sort_type_txt = "13" }, /turf/simulated/floor/plasteel/white, @@ -77345,7 +77335,6 @@ }, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 8; - name = "Genetics"; sort_type_txt = "23" }, /obj/effect/landmark/lightsout, @@ -77936,7 +77925,6 @@ }, /obj/structure/disposalpipe/sortjunction{ dir = 8; - name = "Medbay Hall"; sort_type_txt = "9" }, /turf/simulated/floor/plasteel/white, @@ -80031,7 +80019,6 @@ dir = 4 }, /obj/structure/disposalpipe/sortjunction{ - name = "CE's Junction"; sort_type_txt = "5" }, /turf/simulated/floor/plasteel{ @@ -81065,7 +81052,6 @@ }, /obj/structure/disposalpipe/sortjunction{ dir = 4; - name = "Robotics Junction"; sort_type_txt = "14" }, /obj/effect/turf_decal/delivery, @@ -81963,7 +81949,6 @@ }, /obj/structure/disposalpipe/sortjunction{ dir = 1; - name = "Security Junction"; sort_type_txt = "8" }, /turf/simulated/floor/plasteel{ @@ -83317,7 +83302,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 1; - name = "Kitchen Junction"; sort_type_txt = "20" }, /turf/simulated/floor/plasteel{ @@ -84269,7 +84253,6 @@ }, /obj/structure/disposalpipe/sortjunction{ dir = 4; - name = "Chapel Junction"; sort_type_txt = "17" }, /obj/effect/turf_decal/stripes/line{ @@ -85891,7 +85874,6 @@ "qAH" = ( /obj/structure/disposalpipe/sortjunction/reversed{ dir = 2; - name = "Research Junction"; sort_type_txt = "12" }, /turf/simulated/floor/plasteel{ @@ -86341,7 +86323,6 @@ }, /obj/structure/disposalpipe/sortjunction{ dir = 8; - name = "Medbay CMO"; sort_type_txt = "10" }, /turf/simulated/floor/plasteel/white, @@ -87690,7 +87671,6 @@ }, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 4; - name = "HoP Junction"; sort_type_txt = "15" }, /obj/structure/cable{ @@ -88784,7 +88764,6 @@ }, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 1; - name = "Chemistry"; sort_type_txt = "11" }, /obj/structure/chair{ @@ -89072,7 +89051,6 @@ "sjA" = ( /obj/structure/disposalpipe/sortjunction/reversed{ dir = 8; - name = "Hydroponics Junction"; sort_type_txt = "21" }, /obj/structure/cable{ @@ -93992,7 +93970,6 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/sortjunction{ dir = 1; - name = "Disposals Maint"; sort_type_txt = "1" }, /turf/simulated/floor/plating, @@ -96962,7 +96939,6 @@ icon_state = "1-4" }, /obj/structure/disposalpipe/sortjunction{ - name = "Engineering Junction"; sort_type_txt = "4" }, /turf/simulated/floor/plasteel, @@ -99432,7 +99408,6 @@ }, /obj/structure/disposalpipe/sortjunction{ dir = 8; - name = "Custodial Junction"; sort_type_txt = "22" }, /obj/structure/cable{ diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index ddae62ae840..cfca5144b73 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -957,7 +957,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction{ - name = "Engineering Junction"; sort_type_txt = "4" }, /obj/effect/landmark/start/engineer, @@ -43987,7 +43986,6 @@ "dsr" = ( /obj/structure/disposalpipe/sortjunction{ dir = 1; - name = "Bar Junction"; sort_type_txt = "19" }, /obj/structure/cable{ @@ -46596,7 +46594,6 @@ }, /obj/structure/disposalpipe/sortjunction{ dir = 1; - name = "HoP Junction"; sort_type_txt = "15" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -47335,7 +47332,6 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/sortjunction{ - name = "CE's Junction"; sort_type_txt = "5" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -55251,7 +55247,6 @@ "icA" = ( /obj/structure/disposalpipe/sortjunction{ dir = 1; - name = "Medbay Junction"; sort_type_txt = "9" }, /obj/structure/cable{ @@ -57323,7 +57318,6 @@ /obj/structure/disposalpipe/sortjunction{ dir = 2; icon_state = "pipe-j2s"; - name = "HoS Junction"; sort_type_txt = "7" }, /turf/simulated/floor/plasteel, @@ -59338,7 +59332,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction{ dir = 1; - name = "Custodial Junction"; sort_type_txt = "22" }, /turf/simulated/floor/plasteel, @@ -63016,7 +63009,6 @@ }, /obj/structure/disposalpipe/sortjunction/reversed{ dir = 1; - name = "CMO's Junction"; sort_type_txt = "10" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -63354,7 +63346,6 @@ /obj/structure/disposalpipe/sortjunction{ dir = 8; icon_state = "pipe-j2s"; - name = "Chapel"; sort_type_txt = "17" }, /obj/effect/turf_decal/stripes/line, @@ -63503,7 +63494,6 @@ /obj/structure/disposalpipe/sortjunction{ dir = 1; icon_state = "pipe-j2s"; - name = "Disposals Junction"; sort_type_txt = "1" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -64224,7 +64214,6 @@ }, /obj/structure/disposalpipe/sortjunction{ dir = 1; - name = "Chemistry Junction"; sort_type_txt = "11" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -64661,7 +64650,6 @@ "maV" = ( /obj/structure/disposalpipe/sortjunction/reversed{ dir = 4; - name = "Security Junction"; sort_type_txt = "8" }, /turf/simulated/floor/plasteel{ @@ -66554,7 +66542,6 @@ /obj/structure/disposalpipe/sortjunction{ dir = 8; icon_state = "pipe-j2s"; - name = "Atmospherics Junction"; sort_type_txt = "6" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -68959,7 +68946,6 @@ "nLV" = ( /obj/structure/disposalpipe/sortjunction{ dir = 8; - name = "Research Junction"; sort_type_txt = "12" }, /obj/structure/cable{ @@ -76003,7 +75989,6 @@ /obj/structure/disposalpipe/sortjunction{ dir = 2; icon_state = "pipe-j2s"; - name = "Hydroponics Junction"; sort_type_txt = "21" }, /turf/simulated/floor/plasteel, @@ -78795,7 +78780,6 @@ /obj/structure/disposalpipe/sortjunction{ dir = 2; icon_state = "pipe-j2s"; - name = "Bar Junction"; sort_type_txt = "19" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -84498,7 +84482,6 @@ "uxV" = ( /obj/structure/disposalpipe/sortjunction{ dir = 1; - name = "Quartermaster Junction"; sort_type_txt = "3" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -84666,7 +84649,6 @@ /obj/structure/disposalpipe/sortjunction{ dir = 4; icon_state = "pipe-j2s"; - name = "Library Junction"; sort_type_txt = "16" }, /obj/effect/turf_decal/stripes/line{ @@ -85692,7 +85674,6 @@ "uXA" = ( /obj/structure/disposalpipe/sortjunction{ dir = 8; - name = "Robotics Junction"; sort_type_txt = "14" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -86171,9 +86152,8 @@ dir = 4 }, /obj/structure/disposalpipe/sortjunction/reversed{ - name = "Detective"; - sort_type_txt = "24"; - dir = 4 + dir = 4; + sort_type_txt = "24" }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -89295,7 +89275,6 @@ /obj/structure/disposalpipe/sortjunction{ dir = 2; icon_state = "pipe-j2s"; - name = "Kitchen Junction"; sort_type_txt = "20" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -90886,7 +90865,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction{ - name = "Captain's Junction"; sort_type_txt = "18" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -91811,7 +91789,6 @@ "xLw" = ( /obj/structure/disposalpipe/sortjunction{ dir = 4; - name = "Kitchen Junction"; sort_type_txt = "20" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -92346,7 +92323,6 @@ /obj/structure/disposalpipe/sortjunction{ dir = 2; icon_state = "pipe-j2s"; - name = "RD Junction"; sort_type_txt = "13" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 3b48076814e..8987a3064d0 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -1196,7 +1196,7 @@ updatedir() if(mapload) parse_sort_destinations() - update_appearance(UPDATE_DESC) + update_appearance(UPDATE_NAME|UPDATE_DESC) update() return diff --git a/tools/maplint/lints/sort_junction_names.yml b/tools/maplint/lints/sort_junction_names.yml new file mode 100644 index 00000000000..11a5d43c76d --- /dev/null +++ b/tools/maplint/lints/sort_junction_names.yml @@ -0,0 +1,4 @@ +help: "Sort Junctions update their own names. Do not varedit them." +/obj/structure/disposalpipe/sortjunction: + banned_variables: + - name