diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index e46882e98ad..9b4782887a0 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -9441,9 +9441,8 @@ /area/station/maintenance/abandoned_garden) "aHx" = ( /obj/structure/barricade/wooden, -/obj/machinery/door/airlock/maintenance{ - name = "Abandoned Garden" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/south, @@ -9451,9 +9450,8 @@ /area/station/maintenance/abandoned_garden) "aHy" = ( /obj/structure/barricade/wooden, -/obj/machinery/door/airlock/maintenance{ - name = "Abandoned Garden" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/autoname, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -19450,9 +19448,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/airlock/public/glass{ - name = "Pet Store" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/door/firedoor, /obj/structure/cable{ d1 = 4; @@ -45370,9 +45367,8 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/starboard) "ctw" = ( -/obj/machinery/door/airlock/virology/glass{ - name = "Virology" - }, +/obj/machinery/door/airlock/virology/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/medical/virology, /obj/structure/cable{ d1 = 4; @@ -45558,9 +45554,8 @@ /area/station/maintenance/port) "ctU" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Library" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plasteel/dark, /area/station/service/library) "ctV" = ( @@ -45578,9 +45573,8 @@ /area/station/legal/courtroom) "ctW" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Library" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -49579,9 +49573,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/airlock/multi_tile/glass{ - name = "Arcade" - }, +/obj/machinery/door/airlock/multi_tile/glass, +/obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "cEv" = ( @@ -53937,9 +53930,8 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass{ - name = "Barber Shop" - }, +/obj/machinery/door/airlock/glass, +/obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plasteel{ icon_state = "barber" }, @@ -65803,7 +65795,9 @@ /obj/item/folder/yellow, /obj/item/pen, /obj/machinery/door/window{ - name = "Atmospherics Desk"; + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk{ dir = 4 }, /obj/machinery/door/window{ @@ -69348,9 +69342,9 @@ "dKO" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/multi_tile/glass{ - dir = 2; - name = "Chapel" + dir = 2 }, +/obj/effect/mapping_helpers/airlock/autoname, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -74162,9 +74156,8 @@ /area/station/science/toxins/mixing) "eer" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Kitchen" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -74198,9 +74191,8 @@ /area/station/science/xenobiology) "egF" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research/glass{ - name = "Research and Development" - }, +/obj/machinery/door/airlock/research/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/science/research, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -74473,9 +74465,9 @@ id = "Magistrate" }, /obj/machinery/door/airlock/glass{ - id_tag = "magistrateofficedoor"; - name = "Magistrate's Office" + id_tag = "magistrateofficedoor" }, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/command/magistrate, /turf/simulated/floor/plasteel{ icon_state = "cult" @@ -74659,9 +74651,8 @@ /area/station/science/research) "ewt" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security{ - name = "Brig" - }, +/obj/machinery/door/airlock/security, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/doors, /obj/structure/disposalpipe/segment{ dir = 4 @@ -74769,9 +74760,8 @@ /turf/simulated/floor/plasteel/dark, /area/station/command/vault) "eBd" = ( -/obj/machinery/door/airlock/engineering{ - name = "Electrical Maintenance" - }, +/obj/machinery/door/airlock/engineering, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, @@ -75127,9 +75117,8 @@ /turf/simulated/floor/plasteel/white, /area/station/science/explab) "eQe" = ( -/obj/machinery/door/airlock/command{ - name = "Server Room" - }, +/obj/machinery/door/airlock/command, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/science/rd, /obj/structure/cable{ d1 = 4; @@ -75343,9 +75332,8 @@ }, /area/station/hallway/secondary/entry) "eZE" = ( -/obj/machinery/door/airlock{ - name = "Magistrate's Office" - }, +/obj/machinery/door/airlock, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/command/magistrate, /obj/machinery/door/firedoor, /obj/machinery/door/poddoor{ @@ -75475,9 +75463,8 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/mining{ - name = "Mining Dock" - }, +/obj/machinery/door/airlock/mining, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/supply/mining, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -75513,9 +75500,8 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/mining/glass{ - name = "Delivery Office" - }, +/obj/machinery/door/airlock/mining/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/supply/mail_sorting, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -76541,9 +76527,8 @@ /area/station/maintenance/apmaint) "fVR" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research/glass{ - name = "Xenobiology Lab" - }, +/obj/machinery/door/airlock/research/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /obj/structure/cable{ d1 = 1; @@ -76692,9 +76677,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/airlock/security{ - name = "Prisoner Processing" - }, +/obj/machinery/door/airlock/security, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/doors, /turf/simulated/floor/plasteel{ icon_state = "darkredfull" @@ -76795,9 +76779,8 @@ /area/station/maintenance/apmaint) "gjk" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/mining{ - name = "Mining Dock" - }, +/obj/machinery/door/airlock/mining, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/supply/mining, /obj/structure/disposalpipe/segment{ dir = 4 @@ -76997,9 +76980,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/airlock/glass{ - name = "Hydroponics" - }, +/obj/machinery/door/airlock/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/simulated/floor/plasteel, /area/station/service/hydroponics) @@ -77322,9 +77304,8 @@ /area/station/maintenance/port) "gHE" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research{ - name = "Xenobiology Lab" - }, +/obj/machinery/door/airlock/research, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /obj/structure/cable{ d1 = 1; @@ -77530,9 +77511,8 @@ }, /area/station/medical/medbay) "gOL" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Warden's Office" - }, +/obj/machinery/door/airlock/security/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/armory, /obj/machinery/door/firedoor, /obj/structure/cable{ @@ -78792,9 +78772,8 @@ /area/station/hallway/primary/aft) "hTD" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Security Checkpoint" - }, +/obj/machinery/door/airlock/security/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/simulated/floor/plasteel, /area/station/security/checkpoint/secondary) @@ -79959,9 +79938,8 @@ opacity = 0 }, /obj/effect/decal/warning_stripes/south, -/obj/machinery/door/airlock/security{ - name = "Prison Wing" - }, +/obj/machinery/door/airlock/security, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/brig, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -79979,9 +79957,8 @@ /obj/structure/table/reinforced, /obj/item/reagent_containers/food/condiment/peppermill, /obj/machinery/door/firedoor, -/obj/machinery/door/window{ - name = "Kitchen" - }, +/obj/machinery/door/window, +/obj/effect/mapping_helpers/airlock/windoor/autoname, /obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -80339,9 +80316,8 @@ /turf/simulated/floor/plating, /area/station/supply/qm) "jls" = ( -/obj/machinery/door/airlock/bananium{ - name = "Clown's Office" - }, +/obj/machinery/door/airlock/bananium, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/service/theatre, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -80565,9 +80541,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboardsolar) "jtF" = ( -/obj/machinery/door/airlock/tranquillite{ - name = "Mime's Office" - }, +/obj/machinery/door/airlock/tranquillite, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/service/theatre, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ @@ -80761,9 +80736,8 @@ }, /area/station/legal/magistrate) "jDT" = ( -/obj/machinery/door/airlock/virology{ - name = "Virology" - }, +/obj/machinery/door/airlock/virology, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/medical/virology, /obj/structure/cable{ d1 = 4; @@ -80962,9 +80936,8 @@ /area/station/hallway/primary/central) "jKE" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/mining/glass{ - name = "Cargo Bay" - }, +/obj/machinery/door/airlock/mining/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/supply/general, /turf/simulated/floor/plasteel, /area/station/supply/storage) @@ -81260,9 +81233,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/medical{ - name = "Morgue" - }, +/obj/machinery/door/airlock/medical, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/effect/mapping_helpers/airlock/access/all/medical/morgue, /obj/machinery/door/firedoor, @@ -81373,9 +81345,8 @@ /area/station/maintenance/starboardsolar) "kaO" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Solitary Confinement" - }, +/obj/machinery/door/airlock/security/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/brig, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -81955,9 +81926,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/airlock/security{ - name = "Prisoner Processing" - }, +/obj/machinery/door/airlock/security, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/doors, /obj/machinery/door/firedoor, /obj/structure/cable{ @@ -82047,9 +82017,9 @@ "kIF" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ - id_tag = "blueshieldofficedoor"; - name = "Blueshield's Office" + id_tag = "blueshieldofficedoor" }, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/command/blueshield, /obj/structure/cable{ d1 = 1; @@ -83948,9 +83918,8 @@ }, /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/research{ - name = "Toxins Mixing Room" - }, +/obj/machinery/door/airlock/research, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/science/tox, /turf/simulated/floor/plasteel, /area/station/science/toxins/mixing) @@ -84042,9 +84011,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/airlock/security{ - name = "Prisoner Processing" - }, +/obj/machinery/door/airlock/security, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/doors, /turf/simulated/floor/plasteel{ icon_state = "darkredfull" @@ -84168,9 +84136,8 @@ /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "mKU" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Solitary Confinement" - }, +/obj/machinery/door/airlock/security/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/brig, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -84663,9 +84630,8 @@ /area/station/command/office/rd) "mXc" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command/glass{ - name = "Bridge" - }, +/obj/machinery/door/airlock/command/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/command/general, /obj/structure/cable{ d1 = 4; @@ -85047,9 +85013,9 @@ /area/station/maintenance/aft) "nlA" = ( /obj/machinery/door/airlock/command{ - id_tag = "captainofficedoor"; - name = "Captain's Office" + id_tag = "captainofficedoor" }, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/command/captain, /obj/structure/cable{ d1 = 1; @@ -85075,9 +85041,8 @@ /turf/simulated/floor/wood, /area/station/maintenance/library) "nmr" = ( -/obj/machinery/door/airlock/glass{ - name = "Vacant Office" - }, +/obj/machinery/door/airlock/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -85129,9 +85094,8 @@ /area/station/maintenance/starboard) "nnP" = ( /obj/structure/table/reinforced, -/obj/machinery/door/window{ - name = "Kitchen" - }, +/obj/machinery/door/window, +/obj/effect/mapping_helpers/airlock/windoor/autoname, /obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen, /obj/item/reagent_containers/food/drinks/britcup, /obj/item/reagent_containers/food/condiment/saltshaker, @@ -85142,9 +85106,8 @@ }, /area/station/service/kitchen) "nnW" = ( -/obj/machinery/door/airlock/security{ - name = "Interrogation" - }, +/obj/machinery/door/airlock/security, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/any/security/forensics, /obj/effect/mapping_helpers/airlock/access/any/security/general, /obj/machinery/door/firedoor, @@ -85256,8 +85219,10 @@ /obj/machinery/door/firedoor, /obj/item/pen, /obj/machinery/door/window/classic/normal{ - dir = 4; - name = "Chemistry Desk" + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk{ + dir = 4 }, /obj/effect/mapping_helpers/airlock/windoor/access/any/medical/chemistry{ dir = 4 @@ -85282,9 +85247,8 @@ /turf/simulated/floor/plating, /area/station/security/processing) "nqH" = ( -/obj/machinery/door/airlock/glass{ - name = "Chapel Office" - }, +/obj/machinery/door/airlock/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -85576,9 +85540,8 @@ /area/station/engineering/break_room) "nEx" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering/glass{ - name = "Engineering" - }, +/obj/machinery/door/airlock/engineering/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /obj/structure/cable{ d1 = 1; @@ -85805,9 +85768,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "nNK" = ( -/obj/machinery/door/airlock{ - name = "Custodial Closet" - }, +/obj/machinery/door/airlock, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/service/janitor, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -86365,9 +86327,8 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/mining/glass{ - name = "Cargo Bay" - }, +/obj/machinery/door/airlock/mining/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/supply/general, /obj/structure/disposalpipe/segment{ dir = 4 @@ -86376,9 +86337,8 @@ /area/station/supply/storage) "olR" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/mining{ - name = "Mining Dock" - }, +/obj/machinery/door/airlock/mining, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/supply/mining, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -86885,9 +86845,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock/medical{ - name = "Morgue" - }, +/obj/machinery/door/airlock/medical, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/medical/morgue, /obj/machinery/door/poddoor/preopen{ id_tag = "Biohazard_medi"; @@ -86964,9 +86923,8 @@ "oHk" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/machinery/door/window{ - name = "Kitchen" - }, +/obj/machinery/door/window, +/obj/effect/mapping_helpers/airlock/windoor/autoname, /obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -87202,9 +87160,8 @@ /turf/simulated/floor/plating, /area/station/engineering/hardsuitstorage) "oRu" = ( -/obj/machinery/door/airlock/security{ - name = "Prisoner Processing" - }, +/obj/machinery/door/airlock/security, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/doors, /obj/machinery/door/firedoor, /obj/structure/cable{ @@ -87262,9 +87219,8 @@ /area/station/maintenance/starboard) "oTS" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Kitchen" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/simulated/floor/plasteel, /area/station/service/kitchen) @@ -87656,9 +87612,8 @@ /area/station/science/toxins/mixing) "plR" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command/glass{ - name = "Server Room" - }, +/obj/machinery/door/airlock/command/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/science/rd, /obj/structure/cable{ d1 = 1; @@ -87963,8 +87918,10 @@ /obj/structure/table/reinforced, /obj/machinery/door/firedoor, /obj/machinery/door/window{ - dir = 8; - name = "Kitchen" + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname{ + dir = 8 }, /obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen{ dir = 8 @@ -88271,8 +88228,10 @@ name = "Chemistry Desk Shutters" }, /obj/machinery/door/window/classic/normal{ - dir = 8; - name = "Chemistry Desk" + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk{ + dir = 8 }, /obj/machinery/door/window/classic/normal{ name = "Chemistry Desk"; @@ -88394,8 +88353,10 @@ "pQf" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/classic/normal{ - dir = 8; - name = "Hydroponics Desk" + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk{ + dir = 8 }, /obj/effect/mapping_helpers/airlock/windoor/access/any/service/hydroponics{ dir = 8 @@ -88497,9 +88458,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research/glass{ - name = "E.X.P.E.R.I-MENTOR Lab" - }, +/obj/machinery/door/airlock/research/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/science/research, /turf/simulated/floor/plasteel/white, /area/station/science/explab) @@ -88953,9 +88913,8 @@ /area/station/telecomms/chamber) "qsJ" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command/glass{ - name = "Bridge" - }, +/obj/machinery/door/airlock/command/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/command/general, /obj/structure/cable{ d1 = 1; @@ -89661,9 +89620,8 @@ }, /area/station/hallway/primary/fore) "qZm" = ( -/obj/machinery/door/airlock/security{ - name = "Security Checkpoint" - }, +/obj/machinery/door/airlock/security, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/general, /obj/machinery/door/firedoor, /obj/structure/cable{ @@ -90003,9 +89961,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "rlh" = ( -/obj/machinery/door/airlock/glass{ - name = "Chapel Office" - }, +/obj/machinery/door/airlock/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/service/crematorium, /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/office) @@ -90077,8 +90034,10 @@ "rms" = ( /obj/machinery/door/firedoor, /obj/machinery/door/window/reinforced/reversed{ - dir = 8; - name = "Customs Desk" + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk{ + dir = 8 }, /obj/effect/mapping_helpers/airlock/windoor/access/any/command/general{ dir = 8 @@ -90179,9 +90138,8 @@ opacity = 0 }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Brig" - }, +/obj/machinery/door/airlock/security/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/doors, /obj/effect/decal/warning_stripes/west, /obj/structure/disposalpipe/segment{ @@ -90799,9 +90757,8 @@ /area/station/security/execution) "rTN" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security{ - name = "Brig" - }, +/obj/machinery/door/airlock/security, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/doors, /turf/simulated/floor/plasteel{ icon_state = "darkred" @@ -90821,8 +90778,10 @@ /obj/structure/table/reinforced, /obj/machinery/door/firedoor, /obj/machinery/door/window{ - dir = 8; - name = "Kitchen" + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname{ + dir = 8 }, /obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen{ dir = 8 @@ -90854,8 +90813,10 @@ /obj/item/pen, /obj/item/reagent_containers/food/snacks/grown/apple, /obj/machinery/door/window/classic/normal{ - dir = 8; - name = "Hydroponics Desk" + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk{ + dir = 8 }, /obj/effect/mapping_helpers/airlock/windoor/access/any/service/hydroponics{ dir = 8 @@ -90864,9 +90825,8 @@ /turf/simulated/floor/plasteel, /area/station/service/hydroponics) "rXc" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay Reception" - }, +/obj/machinery/door/airlock/medical/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/medical/general, /turf/simulated/floor/plasteel{ dir = 8; @@ -91397,9 +91357,8 @@ /area/station/engineering/break_room) "snE" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command/glass{ - name = "Bridge" - }, +/obj/machinery/door/airlock/command/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/command/general, /obj/machinery/door/poddoor{ density = 0; @@ -91452,9 +91411,8 @@ /area/station/ai_monitored/storage/eva) "soA" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research/glass{ - name = "Robotics Lab" - }, +/obj/machinery/door/airlock/research/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/science/robotics, /obj/structure/cable{ d1 = 1; @@ -91679,9 +91637,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/airlock/medical{ - name = "Morgue" - }, +/obj/machinery/door/airlock/medical, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/medical/morgue, /turf/simulated/floor/plasteel/dark, /area/station/medical/morgue) @@ -91734,9 +91691,8 @@ /area/station/hallway/secondary/exit) "suH" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass{ - name = "Hydroponics" - }, +/obj/machinery/door/airlock/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, @@ -91814,9 +91770,8 @@ /area/station/security/main) "sAy" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research{ - name = "Mech Bay" - }, +/obj/machinery/door/airlock/research, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/science/robotics, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel/white, @@ -91888,9 +91843,8 @@ /obj/structure/table/reinforced, /obj/item/storage/fancy/donut_box, /obj/machinery/door/firedoor, -/obj/machinery/door/window{ - name = "Kitchen" - }, +/obj/machinery/door/window, +/obj/effect/mapping_helpers/airlock/windoor/autoname, /obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -91910,9 +91864,8 @@ /turf/simulated/floor/plating, /area/station/security/storage) "sEA" = ( -/obj/machinery/door/airlock/engineering{ - name = "Electrical Maintenance" - }, +/obj/machinery/door/airlock/engineering, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -92032,9 +91985,8 @@ /turf/simulated/floor/plasteel, /area/station/science/toxins/launch) "sJs" = ( -/obj/machinery/door/airlock/glass{ - name = "Auxiliary Tool Storage" - }, +/obj/machinery/door/airlock/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -92404,9 +92356,8 @@ }, /area/station/medical/exam_room) "sYB" = ( -/obj/machinery/door/airlock/research{ - name = "Toxins Launch Room" - }, +/obj/machinery/door/airlock/research, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/science/tox, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -92891,9 +92842,8 @@ /area/station/service/chapel/office) "tyN" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/mining{ - name = "Mining Dock" - }, +/obj/machinery/door/airlock/mining, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/supply/mining, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -92947,9 +92897,8 @@ /area/station/science/research) "tBi" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command/glass{ - name = "Bridge" - }, +/obj/machinery/door/airlock/command/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/command/general, /obj/machinery/door/poddoor{ density = 0; @@ -93170,9 +93119,8 @@ /area/station/maintenance/port) "tIT" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command/glass{ - name = "Bridge" - }, +/obj/machinery/door/airlock/command/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/command/general, /obj/machinery/door/poddoor{ density = 0; @@ -93724,9 +93672,8 @@ /area/station/security/checkpoint) "ugy" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research{ - name = "Mech Bay" - }, +/obj/machinery/door/airlock/research, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/science/robotics, /obj/structure/cable{ d1 = 1; @@ -93870,9 +93817,8 @@ /area/station/maintenance/starboard) "ujL" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass{ - name = "Hydroponics" - }, +/obj/machinery/door/airlock/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -94577,7 +94523,9 @@ "uUk" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/classic/normal{ - name = "Kitchen Desk"; + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk{ dir = 4 }, /obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen{ @@ -95012,8 +94960,10 @@ /obj/item/reagent_containers/food/snacks/grown/watermelon, /obj/item/reagent_containers/food/snacks/grown/banana, /obj/machinery/door/window/classic/reversed{ - dir = 8; - name = "Hydroponics Desk" + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk{ + dir = 8 }, /obj/effect/mapping_helpers/airlock/windoor/access/any/service/hydroponics{ dir = 8 @@ -95617,9 +95567,8 @@ /area/station/science/toxins/mixing) "vPd" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research{ - name = "Mech Bay" - }, +/obj/machinery/door/airlock/research, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/science/robotics, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -95896,9 +95845,8 @@ /area/station/maintenance/incinerator) "wfs" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Brig" - }, +/obj/machinery/door/airlock/security/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/doors, /obj/machinery/door/poddoor{ density = 0; @@ -96221,9 +96169,9 @@ "wtO" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ - id_tag = "captainofficedoor"; - name = "Captain's Office" + id_tag = "captainofficedoor" }, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/command/captain, /obj/structure/cable{ d1 = 1; @@ -96293,9 +96241,8 @@ /area/station/maintenance/apmaint) "wyA" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command/glass{ - name = "Bridge" - }, +/obj/machinery/door/airlock/command/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/command/general, /obj/machinery/door/poddoor{ density = 0; @@ -96773,9 +96720,8 @@ }, /area/station/security/warden) "wYE" = ( -/obj/machinery/door/airlock/security{ - name = "Interrogation" - }, +/obj/machinery/door/airlock/security, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/any/security/forensics, /obj/effect/mapping_helpers/airlock/access/any/security/general, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -96997,9 +96943,8 @@ /area/station/engineering/atmos) "xgH" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command{ - name = "Research Director's Quarters" - }, +/obj/machinery/door/airlock/command, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/science/rd, /obj/structure/cable{ d1 = 1; @@ -97381,9 +97326,8 @@ }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/door/firedoor, -/obj/machinery/door/window/reinforced/normal{ - name = "Secure Armory" - }, +/obj/machinery/door/window/reinforced/normal, +/obj/effect/mapping_helpers/airlock/windoor/autoname, /obj/machinery/door/window/reinforced/normal{ dir = 1; name = "Secure Armory" @@ -97865,9 +97809,8 @@ /area/station/security/prison/cell_block) "xNN" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command/glass{ - name = "Bridge" - }, +/obj/machinery/door/airlock/command/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/command/general, /obj/structure/cable{ d1 = 1; @@ -97931,9 +97874,8 @@ /area/station/legal/lawoffice) "xQe" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research/glass{ - name = "Robotics Lab" - }, +/obj/machinery/door/airlock/research/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/science/robotics, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -98144,9 +98086,8 @@ name = "Prison Lockdown Blast Doors"; opacity = 0 }, -/obj/machinery/door/airlock/security{ - name = "Prison Wing" - }, +/obj/machinery/door/airlock/security, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/brig, /obj/structure/cable{ d1 = 1; @@ -98184,9 +98125,8 @@ /area/station/maintenance/fsmaint) "ycH" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command/glass{ - name = "Bridge" - }, +/obj/machinery/door/airlock/command/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/command/general, /obj/structure/cable{ d1 = 4; @@ -98228,9 +98168,11 @@ /obj/item/pen, /obj/machinery/door/window/reinforced/reversed{ dir = 8; - name = "Security Checkpoint"; pixel_x = -8 }, +/obj/effect/mapping_helpers/airlock/windoor/autoname{ + dir = 8 + }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -98318,9 +98260,8 @@ }, /area/station/medical/surgery/secondary) "yki" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Security Office" - }, +/obj/machinery/door/airlock/security/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/general, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index ca6b8550bb8..72783ce8cd9 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -7267,9 +7267,8 @@ }, /area/station/supply/miningdock) "aIP" = ( -/obj/machinery/door/airlock/hatch{ - name = "Telecoms Control Room" - }, +/obj/machinery/door/airlock/hatch, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, /obj/structure/cable/yellow{ d1 = 1; @@ -10990,9 +10989,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/airlock{ - name = "Garden" - }, +/obj/machinery/door/airlock, +/obj/effect/mapping_helpers/airlock/autoname, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -13269,9 +13267,8 @@ /area/station/turret_protected/ai_upload/foyer) "aZP" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Fore Primary Hallway" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redcorner" @@ -13284,18 +13281,16 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Fore Primary Hallway" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore) "aZR" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Fore Primary Hallway" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -18623,9 +18618,8 @@ /area/station/service/kitchen) "bnd" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Starboard Primary Hallway" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "cautioncorner" @@ -19273,9 +19267,8 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Starboard Primary Hallway" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -19978,9 +19971,8 @@ /area/station/hallway/primary/central) "bqw" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Starboard Primary Hallway" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/turf_decal/tile/bar, /turf/simulated/floor/plasteel{ dir = 8; @@ -21045,9 +21037,8 @@ /area/station/hallway/primary/port) "btI" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Port Primary Hallway" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -22096,9 +22087,8 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Port Primary Hallway" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -23062,9 +23052,8 @@ /area/station/command/office/hop) "byf" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Port Primary Hallway" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -23696,16 +23685,14 @@ /area/station/service/library) "bzM" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Library" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/carpet, /area/station/service/library) "bzN" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Library" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet, @@ -30620,9 +30607,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/airlock{ - name = "Dormitories" - }, +/obj/machinery/door/airlock, +/obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -30642,9 +30628,8 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock{ - name = "Dormitories" - }, +/obj/machinery/door/airlock, +/obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -32470,9 +32455,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/airlock{ - name = "Locker Room" - }, +/obj/machinery/door/airlock, +/obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -33587,9 +33571,8 @@ /area/station/maintenance/maintcentral) "cdP" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock{ - name = "Locker Room" - }, +/obj/machinery/door/airlock, +/obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -50370,7 +50353,7 @@ "dZP" = ( /obj/effect/spawner/lootdrop{ icon_state = "grille"; - loot = list(/obj/structure/grille=8,/obj/structure/grille/broken=2); + loot = list(/obj/structure/grille = 8, /obj/structure/grille/broken = 2); name = "normal or broken grille spawner" }, /turf/simulated/floor/plating, @@ -52079,7 +52062,9 @@ "eRZ" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/classic/reversed{ - name = "Chemistry Desk"; + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk{ dir = 4 }, /obj/machinery/door/firedoor, @@ -52906,9 +52891,9 @@ /area/station/medical/exam_room) "flY" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; security_level = 1 }, +/obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -53368,7 +53353,7 @@ "fuy" = ( /obj/effect/spawner/lootdrop{ icon_state = "grille"; - loot = list(/obj/structure/grille=8,/obj/structure/grille/broken=2); + loot = list(/obj/structure/grille = 8, /obj/structure/grille/broken = 2); name = "normal or broken grille spawner" }, /turf/simulated/floor/plating, @@ -53878,9 +53863,8 @@ /area/station/security/brig) "fGE" = ( /obj/machinery/smartfridge/medbay, -/obj/machinery/door/window/classic/normal{ - name = "Chemistry Desk" - }, +/obj/machinery/door/window/classic/normal, +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk, /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters/preopen{ dir = 2; @@ -55748,9 +55732,8 @@ pixel_x = 4; pixel_y = -3 }, -/obj/machinery/door/window/classic/reversed{ - name = "Chemistry Desk" - }, +/obj/machinery/door/window/classic/reversed, +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk, /obj/machinery/door/poddoor/shutters/preopen{ dir = 2; id_tag = "imnotmakingyoulubepissoff"; @@ -57578,7 +57561,9 @@ "hqs" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/classic/reversed{ - name = "Hydroponics Desk"; + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk{ dir = 4 }, /obj/item/folder{ @@ -66081,7 +66066,9 @@ dir = 8 }, /obj/machinery/door/window/classic/normal{ - name = "Chemistry Desk"; + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk{ dir = 4 }, /obj/effect/mapping_helpers/airlock/windoor/access/any/medical/chemistry{ @@ -76430,7 +76417,9 @@ /obj/machinery/door/firedoor, /obj/structure/table/reinforced, /obj/machinery/door/window/classic/reversed{ - name = "Chemistry Desk"; + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk{ dir = 8 }, /obj/item/folder/white{ @@ -86059,7 +86048,9 @@ "uBn" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/classic/normal{ - name = "Hydroponics Desk"; + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk{ dir = 4 }, /obj/machinery/door/firedoor, @@ -90705,8 +90696,10 @@ /area/station/command/bridge) "wUL" = ( /obj/machinery/door/window{ - dir = 1; - name = "Captain's Bedroom" + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname{ + dir = 1 }, /obj/effect/mapping_helpers/airlock/windoor/access/all/command/captain{ dir = 1 @@ -91480,7 +91473,9 @@ /obj/item/folder, /obj/item/pen, /obj/machinery/door/window/classic/normal{ - name = "Research and Development Desk"; + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk{ dir = 4 }, /obj/machinery/door/poddoor/shutters/preopen{ @@ -92187,9 +92182,9 @@ "xCD" = ( /obj/machinery/door/airlock/mining/glass{ id_tag = "mining_home"; - locked = 1; - name = "Mining Dock" + locked = 1 }, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/supply/mining, /obj/structure/fans/tiny, /turf/simulated/floor/plasteel, diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm index 20728be09df..0f2115d5dd0 100644 --- a/_maps/map_files/cerestation/cerestation.dmm +++ b/_maps/map_files/cerestation/cerestation.dmm @@ -1356,7 +1356,9 @@ /obj/machinery/door/firedoor, /obj/structure/table/reinforced, /obj/machinery/door/window/classic/normal{ - name = "Chemistry Desk"; + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk{ dir = 1 }, /obj/effect/mapping_helpers/airlock/windoor/access/any/medical/general{ @@ -2151,7 +2153,9 @@ /obj/structure/table/reinforced, /obj/machinery/door/firedoor, /obj/machinery/door/window/classic/normal{ - name = "Hydroponics"; + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname{ dir = 4 }, /obj/effect/mapping_helpers/airlock/windoor/access/any/service/hydroponics{ @@ -2492,9 +2496,8 @@ /turf/simulated/floor/plasteel, /area/station/security/prisonlockers) "apf" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Prisoner Lockers" - }, +/obj/machinery/door/airlock/security/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/brig, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -2770,9 +2773,8 @@ /turf/simulated/wall, /area/station/maintenance/disposal/northeast) "aqY" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Prisoner Lockers" - }, +/obj/machinery/door/airlock/security/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/doors, /obj/machinery/door/firedoor, /obj/structure/cable/orange{ @@ -2942,9 +2944,9 @@ /area/station/security/prisonlockers) "asc" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; security_level = 1 }, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/brig, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -3516,9 +3518,8 @@ /turf/simulated/wall/r_wall, /area/station/telecomms/computer) "avr" = ( -/obj/machinery/door/airlock/hatch{ - name = "AI Satellite Secondary Antechamber" - }, +/obj/machinery/door/airlock/hatch, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/any/science/minisat, /obj/structure/cable{ d1 = 1; @@ -5199,9 +5200,9 @@ /area/station/security/processing) "aGL" = ( /obj/machinery/door/airlock/security/glass{ - id_tag = "Brig"; - name = "Prisoner Processing" + id_tag = "Brig" }, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/doors, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ @@ -5356,8 +5357,10 @@ /area/station/public/locker) "aIv" = ( /obj/machinery/door/window/classic/reversed{ - dir = 1; - name = "Bridge Desk" + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk{ + dir = 1 }, /obj/effect/mapping_helpers/airlock/windoor/access/any/command/general{ dir = 1 @@ -7714,9 +7717,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "aWw" = ( -/obj/machinery/door/airlock{ - name = "Custodial Closet" - }, +/obj/machinery/door/airlock, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/service/janitor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -7897,9 +7899,8 @@ /turf/space, /area/station/engineering/solar/auxport) "aXd" = ( -/obj/machinery/door/airlock/hatch{ - name = "AI Satellite Antechamber" - }, +/obj/machinery/door/airlock/hatch, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/any/command/teleporter, /obj/effect/mapping_helpers/airlock/access/any/science/minisat, /obj/structure/cable{ @@ -7913,9 +7914,8 @@ }, /area/station/turret_protected/aisat/interior) "aXe" = ( -/obj/machinery/door/airlock/hatch{ - name = "AI Satellite Antechamber" - }, +/obj/machinery/door/airlock/hatch, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/any/command/teleporter, /obj/effect/mapping_helpers/airlock/access/any/science/minisat, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -8607,9 +8607,8 @@ }, /area/station/medical/cloning) "baE" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Firing Range" - }, +/obj/machinery/door/airlock/security/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/general, /obj/structure/cable/orange{ d1 = 1; @@ -11313,9 +11312,8 @@ }, /area/station/security/evidence) "bnx" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Interrogation" - }, +/obj/machinery/door/airlock/security/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/doors, /obj/machinery/door/firedoor, /obj/structure/cable/orange{ @@ -11494,9 +11492,8 @@ /turf/simulated/floor/plasteel, /area/station/public/locker) "boy" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Arcade" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/door/firedoor, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) @@ -13148,9 +13145,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/maintcentral) "bvr" = ( -/obj/machinery/door/airlock/command{ - name = "Captain's Office" - }, +/obj/machinery/door/airlock/command, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/command/captain, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, @@ -13737,7 +13733,9 @@ /obj/structure/table/reinforced, /obj/machinery/door/firedoor, /obj/machinery/door/window/classic/normal{ - name = "Hydroponics"; + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname{ dir = 4 }, /obj/effect/mapping_helpers/airlock/windoor/access/any/service/hydroponics{ @@ -16817,7 +16815,9 @@ "bKV" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/reinforced/normal{ - name = "Secure Armory"; + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname{ dir = 4 }, /obj/effect/mapping_helpers/airlock/windoor/access/any/security/armory{ @@ -17363,8 +17363,10 @@ /area/station/command/bridge) "bNj" = ( /obj/machinery/door/window/classic/normal{ - dir = 1; - name = "Bridge Desk" + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk{ + dir = 1 }, /obj/effect/mapping_helpers/airlock/windoor/access/any/command/general{ dir = 1 @@ -20426,9 +20428,8 @@ /turf/simulated/floor/plating, /area/station/supply/miningdock) "cbN" = ( -/obj/machinery/door/airlock/mining{ - name = "Mining Dock" - }, +/obj/machinery/door/airlock/mining, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/supply/mining, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -22651,9 +22652,8 @@ layer = 2.6; name = "Emergency Blast Door" }, -/obj/machinery/door/airlock/command/glass{ - name = "Bridge" - }, +/obj/machinery/door/airlock/command/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/command/general, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ @@ -29758,9 +29758,8 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass{ - name = "Primary Tool Storage" - }, +/obj/machinery/door/airlock/glass, +/obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plasteel, /area/station/public/storage/tools) "dda" = ( @@ -30469,9 +30468,8 @@ /turf/simulated/floor/wood, /area/station/service/clown) "dgl" = ( -/obj/machinery/door/airlock/mining/glass{ - name = "Cargo Office" - }, +/obj/machinery/door/airlock/mining/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/supply/mail_sorting, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, @@ -31357,9 +31355,8 @@ /area/station/maintenance/fore2) "dlL" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/public/glass{ - name = "Locker Room" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel, /area/station/public/locker) @@ -31370,9 +31367,8 @@ /turf/simulated/floor/plating, /area/station/public/locker) "dmb" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Locker Room" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel, /area/station/public/locker) @@ -31645,9 +31641,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/airlock/glass{ - name = "Cargo Quantum Pad" - }, +/obj/machinery/door/airlock/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -32960,9 +32955,8 @@ /turf/simulated/floor/carpet/green, /area/station/service/library) "dvt" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Security Office" - }, +/obj/machinery/door/airlock/security/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/doors, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel, @@ -34115,9 +34109,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay" - }, +/obj/machinery/door/airlock/medical/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" @@ -34972,9 +34965,8 @@ /area/station/command/bridge) "dMd" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/bananium{ - name = "Clown's Office" - }, +/obj/machinery/door/airlock/bananium, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/service/theatre, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -35803,9 +35795,8 @@ /area/station/maintenance/gambling_den) "dXT" = ( /obj/structure/table/reinforced, -/obj/machinery/door/window/classic/normal{ - name = "Hydroponics" - }, +/obj/machinery/door/window/classic/normal, +/obj/effect/mapping_helpers/airlock/windoor/autoname, /obj/machinery/door/window/classic/normal{ name = "Kitchen"; dir = 1 @@ -36503,9 +36494,8 @@ /obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen{ dir = 1 }, -/obj/machinery/door/window/classic/normal{ - name = "Hydroponics" - }, +/obj/machinery/door/window/classic/normal, +/obj/effect/mapping_helpers/airlock/windoor/autoname, /obj/machinery/door/firedoor, /obj/item/desk_bell{ pixel_x = 7; @@ -40422,9 +40412,9 @@ /area/station/engineering/solar/auxstarboard) "fRS" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; security_level = 1 }, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/brig, /obj/machinery/door/firedoor, /obj/structure/cable/orange{ @@ -40789,9 +40779,9 @@ "fXS" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ - id_tag = "blueshieldofficedoor"; - name = "Blueshield's Office" + id_tag = "blueshieldofficedoor" }, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/command/blueshield, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -41066,9 +41056,8 @@ /turf/simulated/wall, /area/station/command/office/ntrep) "gck" = ( -/obj/machinery/door/airlock/glass{ - name = "Courtroom" - }, +/obj/machinery/door/airlock/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/doors, /obj/effect/mapping_helpers/airlock/polarized{ id = "Courtroom" @@ -42970,8 +42959,10 @@ id_tag = "kitchen1" }, /obj/machinery/door/window/classic/normal{ - dir = 4; - name = "Kitchen" + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname{ + dir = 4 }, /obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen{ dir = 4 @@ -44092,9 +44083,8 @@ /turf/simulated/wall, /area/station/maintenance/maintcentral) "hhc" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Fitness Room" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/structure/cable/orange{ d1 = 1; d2 = 2; @@ -45441,9 +45431,8 @@ }, /area/station/hallway/primary/fore/west) "hGp" = ( -/obj/machinery/door/airlock/glass{ - name = "Security Quantum Pad" - }, +/obj/machinery/door/airlock/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -46609,9 +46598,8 @@ /turf/simulated/floor/plating, /area/station/turret_protected/aisat/interior/secondary) "hZp" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Fitness Room" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plasteel, /area/station/public/fitness) "hZq" = ( @@ -49354,9 +49342,8 @@ /area/station/maintenance/starboard) "iTd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay" - }, +/obj/machinery/door/airlock/medical/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -50402,9 +50389,8 @@ layer = 2.6; name = "Emergency Lockdown Blastdoor" }, -/obj/machinery/door/airlock/engineering{ - name = "Engineering Foyer" - }, +/obj/machinery/door/airlock/engineering, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/any/engineering/construction, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ @@ -50641,9 +50627,8 @@ /turf/simulated/wall, /area/station/hallway/secondary/entry/north) "jnZ" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Security Office" - }, +/obj/machinery/door/airlock/security/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/doors, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -50728,7 +50713,9 @@ id_tag = "atmodesk" }, /obj/machinery/door/window/classic/reversed{ - name = "Atmospherics Desk"; + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk{ dir = 4 }, /obj/effect/mapping_helpers/airlock/windoor/access/any/engineering/atmos{ @@ -51448,9 +51435,8 @@ }, /area/station/maintenance/port) "jAr" = ( -/obj/machinery/door/airlock/glass{ - name = "Courtroom" - }, +/obj/machinery/door/airlock/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/doors, /obj/effect/mapping_helpers/airlock/polarized{ id = "Courtroom" @@ -53768,9 +53754,8 @@ /turf/simulated/floor/plating, /area/station/hallway/primary/fore/east) "kmk" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Chapel" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -55277,9 +55262,8 @@ /turf/simulated/floor/wood, /area/station/command/office/ntrep) "kLh" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Theatre" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -55437,9 +55421,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock/research{ - name = "Toxins Mixing Room" - }, +/obj/machinery/door/airlock/research, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/science/tox, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -55450,9 +55433,8 @@ }, /area/station/science/toxins/mixing) "kMH" = ( -/obj/machinery/door/airlock/tranquillite{ - name = "Mime's Office" - }, +/obj/machinery/door/airlock/tranquillite, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/service/theatre, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -59289,9 +59271,8 @@ pixel_y = 7; anchored = 1 }, -/obj/machinery/door/window/classic/reversed{ - name = "Kitchen" - }, +/obj/machinery/door/window/classic/reversed, +/obj/effect/mapping_helpers/airlock/windoor/autoname, /obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" @@ -59679,9 +59660,8 @@ layer = 2.6; name = "Emergency Lockdown Blastdoor" }, -/obj/machinery/door/airlock/engineering{ - name = "Engineering Foyer" - }, +/obj/machinery/door/airlock/engineering, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/any/engineering/construction, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -59894,9 +59874,8 @@ dir = 1; id_tag = "kitchen2" }, -/obj/machinery/door/window/classic/normal{ - name = "Kitchen" - }, +/obj/machinery/door/window/classic/normal, +/obj/effect/mapping_helpers/airlock/windoor/autoname, /obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" @@ -61024,9 +61003,8 @@ /turf/simulated/floor/plating, /area/station/science/explab/chamber) "mCe" = ( -/obj/machinery/door/airlock/medical{ - name = "Morgue" - }, +/obj/machinery/door/airlock/medical, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/medical/morgue, /obj/machinery/door/firedoor, /obj/machinery/door/poddoor{ @@ -61572,9 +61550,8 @@ /turf/space, /area/station/engineering/solar/starboard) "mNc" = ( -/obj/machinery/door/airlock/research{ - name = "Robotics Lab" - }, +/obj/machinery/door/airlock/research, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/science/robotics, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -61807,9 +61784,8 @@ }, /area/station/hallway/spacebridge/sercom) "mQN" = ( -/obj/machinery/door/airlock/glass{ - name = "Docking Quantum Pad" - }, +/obj/machinery/door/airlock/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -67467,9 +67443,8 @@ /area/station/maintenance/port) "oMr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/public/glass{ - name = "Barber Shop" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/orange{ d1 = 1; @@ -68100,9 +68075,8 @@ /area/station/security/prison/cell_block/A) "oVj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock{ - name = "Vacant Office" - }, +/obj/machinery/door/airlock, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -68382,9 +68356,8 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/electrical_shop) "oZD" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Warden's Office" - }, +/obj/machinery/door/airlock/security/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/armory, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ @@ -68928,9 +68901,8 @@ }, /area/station/hallway/primary/port/east) "pkp" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Warden's Office" - }, +/obj/machinery/door/airlock/security/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/armory, /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, @@ -70731,9 +70703,8 @@ layer = 2.6; name = "Emergency Blast Door" }, -/obj/machinery/door/airlock/command/glass{ - name = "Bridge" - }, +/obj/machinery/door/airlock/command/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/command/general, /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, @@ -70942,9 +70913,8 @@ }, /area/station/engineering/atmos) "pRF" = ( -/obj/machinery/door/airlock/glass{ - name = "Primary Tool Storage" - }, +/obj/machinery/door/airlock/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ dir = 4 @@ -71549,9 +71519,8 @@ id_tag = "chemisttop"; name = "Chemistry Lobby Shutters" }, -/obj/machinery/door/window/classic/normal{ - name = "Chemistry Desk" - }, +/obj/machinery/door/window/classic/normal, +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk, /obj/item/folder/yellow, /obj/machinery/door/window/classic/normal{ name = "Chemistry Desk"; @@ -71791,9 +71760,8 @@ /turf/simulated/wall, /area/station/hallway/primary/starboard/south) "qeR" = ( -/obj/machinery/door/airlock/engineering{ - name = "Gravity Generator" - }, +/obj/machinery/door/airlock/engineering, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /obj/machinery/door/firedoor, /obj/structure/cable{ @@ -76465,8 +76433,10 @@ anchored = 1 }, /obj/machinery/door/window/classic/normal{ - dir = 4; - name = "Kitchen" + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname{ + dir = 4 }, /obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen{ dir = 4 @@ -78323,9 +78293,9 @@ /area/station/engineering/control) "srt" = ( /obj/machinery/door/airlock/security{ - name = "Firing Range"; security_level = 1 }, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/general, /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plating, @@ -78979,9 +78949,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/airlock/public/glass{ - name = "Kitchen" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /obj/machinery/door/poddoor/shutters/preopen{ dir = 8; @@ -79666,9 +79635,8 @@ dir = 1; id_tag = "kitchen2" }, -/obj/machinery/door/airlock/public/glass{ - name = "Kitchen" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" @@ -79856,9 +79824,8 @@ dir = 1; id_tag = "kitchen2" }, -/obj/machinery/door/window/classic/reversed{ - name = "Kitchen" - }, +/obj/machinery/door/window/classic/reversed, +/obj/effect/mapping_helpers/airlock/windoor/autoname, /obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" @@ -81570,9 +81537,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/airlock/medical/glass{ - name = "Paramedic" - }, +/obj/machinery/door/airlock/medical/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/medical/paramedic, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ @@ -82655,9 +82621,8 @@ /area/station/engineering/control) "tPw" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass{ - name = "Hydroponics" - }, +/obj/machinery/door/airlock/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/simulated/floor/plasteel{ icon_state = "darkgreenfull" @@ -82760,9 +82725,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/disposal/external/southeast) "tRV" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay" - }, +/obj/machinery/door/airlock/medical/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/door/firedoor, /obj/structure/cable/orange{ d1 = 1; @@ -83482,8 +83446,10 @@ id_tag = "kitchen1" }, /obj/machinery/door/window/classic/reversed{ - dir = 4; - name = "Kitchen" + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname{ + dir = 4 }, /obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen{ dir = 4 @@ -87403,9 +87369,9 @@ /area/station/public/quantum/docking) "vqN" = ( /obj/machinery/door/airlock/glass{ - name = "Magistrate's Office"; id_tag = "magistrateofficedoor" }, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/command/magistrate, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/polarized{ @@ -87616,9 +87582,8 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/multi_tile/glass{ - name = "Bar" - }, +/obj/machinery/door/airlock/multi_tile/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/door/firedoor, /turf/simulated/floor/carpet, /area/station/service/bar) @@ -88016,9 +87981,8 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/south) "vAx" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Chapel" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -88791,9 +88755,8 @@ /turf/simulated/floor/plasteel, /area/station/science/toxins/launch) "vLi" = ( -/obj/machinery/door/airlock/mining{ - name = "Mining Dock" - }, +/obj/machinery/door/airlock/mining, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/supply/mining, /obj/effect/spawner/random_spawners/dirt_frequent, /turf/simulated/floor/plating, @@ -89215,9 +89178,8 @@ }, /area/station/hallway/spacebridge/medcargo) "vSg" = ( -/obj/machinery/door/airlock/command{ - name = "Server Room" - }, +/obj/machinery/door/airlock/command, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/science/rd, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, @@ -92715,9 +92677,8 @@ /area/station/public/vacant_office) "wSh" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass{ - name = "Hydroponics" - }, +/obj/machinery/door/airlock/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 265d72ef6a7..705074f9c20 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -12865,9 +12865,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/airlock/multi_tile/glass{ - name = "Arcade" - }, +/obj/machinery/door/airlock/multi_tile/glass, +/obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "aPi" = ( @@ -14896,9 +14895,8 @@ /area/station/public/storage/tools) "aVh" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Primary Tool Storage" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -15902,9 +15900,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/airlock{ - name = "Garden" - }, +/obj/machinery/door/airlock, +/obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/garden) "aXM" = ( @@ -18002,9 +17999,9 @@ /area/station/hallway/secondary/garden) "bdI" = ( /obj/machinery/door/airlock/multi_tile/glass{ - dir = 1; - name = "Dormitories" + dir = 1 }, +/obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -18409,9 +18406,8 @@ /area/station/hallway/secondary/garden) "beQ" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Garden" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, @@ -19625,9 +19621,8 @@ /area/station/service/hydroponics) "bhT" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Primary Tool Storage" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -24732,16 +24727,14 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Chapel" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/carpet, /area/station/service/chapel) "bva" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Chapel" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/carpet, /area/station/service/chapel) "bvb" = ( @@ -26195,9 +26188,8 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Library" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/carpet, /area/station/service/library) "byV" = ( @@ -26887,9 +26879,8 @@ /area/station/hallway/primary/starboard/east) "bAX" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Library" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/carpet, /area/station/service/library) "bAY" = ( @@ -27002,9 +26993,8 @@ }, /area/station/hallway/primary/central/west) "bBr" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Vacant Office" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -27956,9 +27946,8 @@ /area/station/command/office/captain) "bEl" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Chapel" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plasteel, /area/station/service/chapel) "bEm" = ( @@ -43297,9 +43286,8 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/incinerator) "czN" = ( -/obj/machinery/door/airlock{ - name = "Port Emergency Storage" - }, +/obj/machinery/door/airlock, +/obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ @@ -44903,8 +44891,10 @@ /obj/item/storage/fancy/donut_box, /obj/machinery/door/firedoor, /obj/machinery/door/window/classic/normal{ - dir = 1; - name = "Kitchen" + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname{ + dir = 1 }, /obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen{ dir = 1 @@ -51342,9 +51332,8 @@ /area/station/engineering/atmos) "dbc" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay Reception" - }, +/obj/machinery/door/airlock/medical/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -53547,9 +53536,8 @@ /area/station/public/dorms) "djg" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/multi_tile/glass{ - name = "Dormitories" - }, +/obj/machinery/door/airlock/multi_tile/glass, +/obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -55447,9 +55435,8 @@ /area/station/aisat/service) "dpB" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research{ - name = "Mech Bay" - }, +/obj/machinery/door/airlock/research, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/science/robotics, /obj/machinery/door/poddoor/preopen{ id_tag = "Biohazard"; @@ -57533,9 +57520,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/airlock/glass{ - name = "Courtroom" - }, +/obj/machinery/door/airlock/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/doors, /obj/effect/mapping_helpers/airlock/polarized{ id = "Courtroom" @@ -58431,9 +58417,8 @@ /area/station/maintenance/asmaint) "euX" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research/glass{ - name = "Robotics Lab" - }, +/obj/machinery/door/airlock/research/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/science/robotics, /obj/structure/cable{ d1 = 1; @@ -58711,9 +58696,8 @@ icon_state = "1-4" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Security Office" - }, +/obj/machinery/door/airlock/security/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/general, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -59484,9 +59468,8 @@ icon_state = "2-8" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Warden's Office" - }, +/obj/machinery/door/airlock/security/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/armory, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -59989,8 +59972,10 @@ /obj/structure/table/reinforced, /obj/machinery/door/firedoor, /obj/machinery/door/window/classic/reversed{ - dir = 1; - name = "Hydroponics Desk" + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk{ + dir = 1 }, /obj/effect/mapping_helpers/airlock/windoor/access/any/service/hydroponics{ dir = 1 @@ -60540,9 +60525,8 @@ /area/station/security/permabrig) "fxR" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Hydroponics" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -61067,9 +61051,9 @@ /area/station/maintenance/asmaint2) "fMD" = ( /obj/machinery/door/airlock/command/glass{ - id_tag = "blueshieldofficedoor"; - name = "Blueshield's Office" + id_tag = "blueshieldofficedoor" }, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/command/blueshield, /obj/structure/cable{ d1 = 1; @@ -61797,9 +61781,8 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "giZ" = ( -/obj/machinery/door/airlock/command/glass{ - name = "Bridge" - }, +/obj/machinery/door/airlock/command/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/command/general, /obj/structure/disposalpipe/segment{ dir = 4 @@ -62363,9 +62346,8 @@ /area/station/maintenance/apmaint2) "gxs" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Kitchen" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" @@ -63328,9 +63310,8 @@ /area/station/science/toxins/launch) "gWP" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research{ - name = "Toxins Launch Room" - }, +/obj/machinery/door/airlock/research, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/science/tox, /obj/structure/cable{ d1 = 4; @@ -63347,10 +63328,10 @@ /area/station/science/toxins/launch) "gWZ" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; - id_tag = "perma_door_ext"; - locked = 1 + locked = 1; + id_tag = "perma_door_ext" }, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/brig, /obj/structure/cable{ d1 = 4; @@ -64097,8 +64078,10 @@ /obj/structure/table/reinforced, /obj/machinery/door/firedoor, /obj/machinery/door/window/classic/reversed{ - dir = 1; - name = "Kitchen" + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname{ + dir = 1 }, /obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen{ dir = 1 @@ -64272,9 +64255,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/airlock/glass{ - name = "Courtroom" - }, +/obj/machinery/door/airlock/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/doors, /obj/effect/mapping_helpers/airlock/polarized{ id = "Courtroom" @@ -64575,7 +64557,9 @@ /obj/structure/table/reinforced, /obj/machinery/door/firedoor, /obj/machinery/door/window/classic/normal{ - name = "Kitchen"; + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname{ dir = 4 }, /obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen{ @@ -65531,9 +65515,8 @@ /turf/simulated/floor/wood, /area/station/maintenance/asmaint) "igR" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Barber Shop" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -66571,9 +66554,8 @@ /turf/simulated/floor/plating, /area/station/security/main) "iOn" = ( -/obj/machinery/door/airlock/engineering{ - name = "Electrical Maintenance" - }, +/obj/machinery/door/airlock/engineering, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/engineering/equipment, /obj/structure/cable{ d1 = 4; @@ -67792,9 +67774,8 @@ }, /area/station/medical/virology) "jyL" = ( -/obj/machinery/door/airlock/tranquillite{ - name = "Mime's Office" - }, +/obj/machinery/door/airlock/tranquillite, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/service/mime, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ @@ -68966,9 +68947,8 @@ /area/station/science/xenobiology) "kij" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Interrogation" - }, +/obj/machinery/door/airlock/security/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/doors, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -69112,9 +69092,8 @@ /area/station/security/permabrig) "kkJ" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass{ - name = "Magistrate's Office" - }, +/obj/machinery/door/airlock/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/command/magistrate, /obj/effect/mapping_helpers/airlock/polarized{ id = "Magistrate" @@ -69371,9 +69350,9 @@ "ksh" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass{ - name = "Magistrate's Office"; id_tag = "magistrateofficedoor" }, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/command/magistrate, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -69821,9 +69800,8 @@ /area/station/maintenance/asmaint) "kEx" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay Reception" - }, +/obj/machinery/door/airlock/medical/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/machinery/door/poddoor/preopen{ id_tag = "Biohazard_medi"; @@ -71359,8 +71337,10 @@ }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/door/window/classic/normal{ - dir = 1; - name = "Assembly Line" + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname{ + dir = 1 }, /obj/effect/mapping_helpers/airlock/windoor/access/any/supply/mule_bot{ dir = 1 @@ -71566,9 +71546,8 @@ }, /area/station/command/office/hos) "lBO" = ( -/obj/machinery/door/airlock/research{ - name = "E.X.P.E.R.I-MENTOR Lab" - }, +/obj/machinery/door/airlock/research, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/science/research, /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ @@ -71807,9 +71786,8 @@ /area/station/science/storage) "lHg" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command/glass{ - name = "Server Room" - }, +/obj/machinery/door/airlock/command/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/science/rd, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -72681,9 +72659,8 @@ /area/station/security/permabrig) "mgx" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical{ - name = "Morgue" - }, +/obj/machinery/door/airlock/medical, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/medical/morgue, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -72834,9 +72811,8 @@ /area/station/science/hallway) "mkp" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Prisoner Processing" - }, +/obj/machinery/door/airlock/security/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/doors, /obj/effect/mapping_helpers/airlock/polarized{ id = "Processing" @@ -72972,9 +72948,8 @@ /turf/simulated/floor/plating, /area/station/security/brig) "mnx" = ( -/obj/machinery/door/airlock{ - name = "Custodial Closet" - }, +/obj/machinery/door/airlock, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/service/janitor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -73070,9 +73045,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/airlock/command/glass{ - name = "Bridge" - }, +/obj/machinery/door/airlock/command/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/command/general, /obj/structure/disposalpipe/segment{ dir = 4 @@ -73215,8 +73189,10 @@ }, /obj/machinery/smartfridge/medbay, /obj/machinery/door/window/classic/reversed{ - dir = 8; - name = "Chemistry Desk" + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk{ + dir = 8 }, /obj/effect/mapping_helpers/airlock/windoor/access/any/medical/chemistry{ dir = 8 @@ -73843,8 +73819,10 @@ "mNq" = ( /obj/machinery/door/firedoor, /obj/machinery/door/window/reinforced/normal{ - dir = 1; - name = "Security Checkpoint" + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname{ + dir = 1 }, /obj/effect/mapping_helpers/airlock/windoor/access/any/security/general{ dir = 1 @@ -73884,9 +73862,8 @@ /area/station/medical/reception) "mOi" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/bananium{ - name = "Clown's Office" - }, +/obj/machinery/door/airlock/bananium, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/service/clown, /turf/simulated/floor/wood, /area/station/service/clown) @@ -74257,9 +74234,8 @@ /turf/simulated/floor/wood, /area/station/command/office/blueshield) "nab" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Prisoner Lockers" - }, +/obj/machinery/door/airlock/security/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/doors, /obj/machinery/door/firedoor, /obj/structure/cable{ @@ -74646,9 +74622,8 @@ /area/station/public/dorms) "nqZ" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/mining/glass{ - name = "Cargo Bay" - }, +/obj/machinery/door/airlock/mining/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/supply/general, /obj/structure/cable{ d1 = 4; @@ -75587,9 +75562,8 @@ /area/station/public/toilet) "nQD" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research{ - name = "Mech Bay" - }, +/obj/machinery/door/airlock/research, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/science/robotics, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -75816,7 +75790,9 @@ /area/station/maintenance/apmaint) "nYr" = ( /obj/machinery/door/window/classic/reversed{ - name = "Toxins Mixing Room"; + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -76144,9 +76120,8 @@ /area/station/hallway/primary/central/se) "ohm" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Brig" - }, +/obj/machinery/door/airlock/security/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/doors, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ @@ -76465,9 +76440,8 @@ /area/station/science/hallway) "onX" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay Reception" - }, +/obj/machinery/door/airlock/medical/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/medical/general, /obj/structure/cable{ d1 = 1; @@ -77034,9 +77008,8 @@ /area/station/science/test_chamber) "oFd" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command{ - name = "Server Room" - }, +/obj/machinery/door/airlock/command, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/science/rd, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -77170,9 +77143,8 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Prisoner Processing" - }, +/obj/machinery/door/airlock/security/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/doors, /obj/effect/mapping_helpers/airlock/polarized{ id = "Processing" @@ -77554,9 +77526,8 @@ /area/station/maintenance/disposal) "oSr" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/research/glass{ - name = "Research and Development" - }, +/obj/machinery/door/airlock/research/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/science/research, /obj/structure/cable{ d1 = 1; @@ -78315,9 +78286,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/security/glass{ - id_tag = "Brig"; - name = "Prisoner Processing" + id_tag = "Brig" }, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/doors, /turf/simulated/floor/plasteel, /area/station/security/processing) @@ -78446,9 +78417,8 @@ "pqq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Firing Range" - }, +/obj/machinery/door/airlock/security/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/general, /obj/structure/cable{ d1 = 1; @@ -78777,10 +78747,10 @@ /area/station/medical/cryo) "pzZ" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; - id_tag = "perma_door_int"; - locked = 1 + locked = 1; + id_tag = "perma_door_int" }, +/obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/door/poddoor/preopen{ id_tag = "Prison Gate"; name = "Prison Lockdown Blast Doors" @@ -79843,9 +79813,8 @@ /area/station/maintenance/port) "qfI" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass{ - name = "Chapel Office" - }, +/obj/machinery/door/airlock/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/service/chapel_office, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -79853,9 +79822,8 @@ /area/station/service/chapel/office) "qfN" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering{ - name = "Gravity Generator" - }, +/obj/machinery/door/airlock/engineering, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/any/engineering/general, /obj/effect/mapping_helpers/airlock/access/any/science/rd, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -80614,9 +80582,8 @@ }, /area/station/security/execution) "qyd" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Atmospherics Maintenance" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/simulated/floor/plating, /area/station/maintenance/storage) @@ -81080,7 +81047,9 @@ /obj/machinery/door/firedoor, /obj/structure/table/reinforced, /obj/machinery/door/window/classic/reversed{ - name = "Research and Development Desk"; + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk{ dir = 4 }, /obj/effect/mapping_helpers/airlock/windoor/access/any/science/research{ @@ -81250,10 +81219,10 @@ /area/station/supply/storage) "qNk" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; - id_tag = "perma_door_int"; - locked = 1 + locked = 1; + id_tag = "perma_door_int" }, +/obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/door/poddoor/preopen{ id_tag = "Prison Gate"; name = "Prison Lockdown Blast Doors" @@ -82334,9 +82303,8 @@ /area/station/security/evidence) "rwR" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/mining/glass{ - name = "Cargo Office" - }, +/obj/machinery/door/airlock/mining/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/supply/mail_sorting, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -82431,9 +82399,8 @@ /area/station/science/rnd) "rzO" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - name = "Paramedic" - }, +/obj/machinery/door/airlock/medical/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/medical/paramedic, /obj/structure/cable{ d1 = 4; @@ -83617,9 +83584,8 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Security Office" - }, +/obj/machinery/door/airlock/security/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/general, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -84036,9 +84002,8 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Security Office" - }, +/obj/machinery/door/airlock/security/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/doors, /turf/simulated/floor/plasteel, /area/station/security/main) @@ -85053,9 +85018,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/airlock/command{ - name = "Captain's Office" - }, +/obj/machinery/door/airlock/command, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/command/captain, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -85455,9 +85419,8 @@ /area/station/turret_protected/aisat/interior) "tsA" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering{ - name = "Gravity Generator" - }, +/obj/machinery/door/airlock/engineering, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/any/engineering/general, /obj/effect/mapping_helpers/airlock/access/any/science/rd, /obj/structure/cable{ @@ -87415,9 +87378,8 @@ /area/station/maintenance/apmaint2) "usE" = ( /obj/structure/table/reinforced, -/obj/machinery/door/window/reinforced/normal{ - name = "Secure Armory" - }, +/obj/machinery/door/window/reinforced/normal, +/obj/effect/mapping_helpers/airlock/windoor/autoname, /obj/effect/mapping_helpers/airlock/windoor/access/any/security/general, /obj/machinery/door/window/reinforced/normal{ dir = 1; @@ -87816,10 +87778,10 @@ /area/station/maintenance/apmaint) "uFa" = ( /obj/machinery/door/airlock/security/glass{ - name = "Prison Wing"; - id_tag = "perma_door_ext"; - locked = 1 + locked = 1; + id_tag = "perma_door_ext" }, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/brig, /obj/machinery/door/firedoor, /obj/machinery/access_button{ @@ -87947,9 +87909,8 @@ /area/station/maintenance/apmaint) "uIs" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Hydroponics" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/service/hydroponics, /turf/simulated/floor/plasteel, /area/station/service/hydroponics) @@ -88145,9 +88106,8 @@ /area/station/maintenance/asmaint) "uSw" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/mining/glass{ - name = "Cargo Bay" - }, +/obj/machinery/door/airlock/mining/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/supply/general, /obj/structure/cable{ d1 = 4; @@ -88160,9 +88120,8 @@ /turf/simulated/floor/plasteel, /area/station/supply/storage) "uSx" = ( -/obj/machinery/door/airlock/command/glass{ - name = "Bridge" - }, +/obj/machinery/door/airlock/command/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/command/general, /obj/structure/cable{ d1 = 1; @@ -88255,7 +88214,9 @@ /obj/structure/table/reinforced, /obj/machinery/door/firedoor, /obj/machinery/door/window/classic/normal{ - name = "Hydroponics Desk"; + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk{ dir = 4 }, /obj/effect/mapping_helpers/airlock/windoor/access/any/service/hydroponics{ @@ -88332,7 +88293,9 @@ dir = 1 }, /obj/machinery/door/window{ - name = "Kitchen"; + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname{ dir = 4 }, /obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen{ @@ -89331,8 +89294,10 @@ /obj/structure/table/reinforced, /obj/machinery/door/firedoor, /obj/machinery/door/window/classic/normal{ - dir = 1; - name = "Kitchen" + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname{ + dir = 1 }, /obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen{ dir = 1 @@ -89864,9 +89829,8 @@ }, /area/station/hallway/secondary/exit) "vJY" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Atmospherics Maintenance" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /obj/machinery/door/poddoor/preopen{ id_tag = "Engineering"; @@ -89885,9 +89849,8 @@ /turf/simulated/floor/plasteel, /area/station/science/storage) "vKG" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Auxiliary Tool Storage" - }, +/obj/machinery/door/airlock/public/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -90742,9 +90705,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - name = "Atmospherics Maintenance" - }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /obj/machinery/door/poddoor/preopen{ id_tag = "atmos"; @@ -90814,7 +90776,9 @@ /obj/structure/table/reinforced, /obj/machinery/door/firedoor, /obj/machinery/door/window{ - name = "Kitchen"; + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname{ dir = 4 }, /obj/effect/mapping_helpers/airlock/windoor/access/any/service/kitchen{ @@ -91128,9 +91092,8 @@ /area/station/maintenance/asmaint) "wvL" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical{ - name = "Morgue" - }, +/obj/machinery/door/airlock/medical, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/medical/morgue, /obj/machinery/door/poddoor/preopen{ id_tag = "Biohazard_medi"; @@ -92127,9 +92090,9 @@ /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ - id_tag = "captainofficedoor"; - name = "Captain's Office" + id_tag = "captainofficedoor" }, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/command/captain, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -92382,9 +92345,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/airlock/command/glass{ - name = "Bridge" - }, +/obj/machinery/door/airlock/command/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/command/general, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -92538,9 +92500,8 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security{ - name = "Security Checkpoint" - }, +/obj/machinery/door/airlock/security, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/general, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -93287,8 +93248,10 @@ "xKK" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/classic/reversed{ - dir = 8; - name = "Chemistry Desk" + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk{ + dir = 8 }, /obj/effect/mapping_helpers/airlock/windoor/access/any/medical/chemistry{ dir = 8 @@ -93388,9 +93351,8 @@ /area/station/maintenance/aft) "xMy" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/mining{ - name = "Mining Dock" - }, +/obj/machinery/door/airlock/mining, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/supply/mining, /obj/structure/cable{ d1 = 1; @@ -93547,9 +93509,8 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/security/glass{ - name = "Security Office" - }, +/obj/machinery/door/airlock/security/glass, +/obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/security/doors, /turf/simulated/floor/plasteel, /area/station/security/main) @@ -93991,9 +93952,8 @@ /area/station/hallway/primary/central/ne) "xZZ" = ( /obj/structure/table/reinforced, -/obj/machinery/door/window/classic/reversed{ - name = "Chemistry Desk" - }, +/obj/machinery/door/window/classic/reversed, +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk, /obj/effect/mapping_helpers/airlock/windoor/access/any/medical/general, /obj/machinery/door/firedoor, /obj/machinery/door/window/classic/reversed{ diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index 56665987307..fb2902e1ba9 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -134,3 +134,19 @@ //part responsible for windoors (thanks S34N) /obj/effect/mapping_helpers/airlock/windoor blacklist = list(/obj/machinery/door/firedoor, /obj/machinery/door/poddoor, /obj/machinery/door/unpowered, /obj/machinery/door/airlock) + +/obj/effect/mapping_helpers/airlock/windoor/autoname + name = "windoor autoname helper" + icon_state = "windoor_autoname" + +/obj/effect/mapping_helpers/airlock/windoor/autoname/payload(obj/machinery/door/window/windoor) + if(windoor.dir == dir) + windoor.name = get_area_name(windoor, TRUE) + +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk + name = "windesk autoname helper" + icon_state = "windesk_autoname" + +/obj/effect/mapping_helpers/airlock/windoor/autoname/desk/payload(obj/machinery/door/window/windoor) + if(windoor.dir == dir) + windoor.name = "[get_area_name(windoor, TRUE)] Desk" diff --git a/icons/effects/mapping_helpers.dmi b/icons/effects/mapping_helpers.dmi index e7c5db2b223..475724f215b 100644 Binary files a/icons/effects/mapping_helpers.dmi and b/icons/effects/mapping_helpers.dmi differ