diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 0e61e194524..d8a6f44e532 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -6299,9 +6299,10 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "ank" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/port/fore) "anl" = ( @@ -7146,10 +7147,11 @@ /turf/open/floor/plating, /area/maintenance/fore/secondary) "apx" = ( -/obj/machinery/door/airlock/atmos/abandoned{ +/obj/machinery/door/airlock/atmos{ name = "Atmospherics Maintenance"; req_access_txt = "12;24" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -8217,10 +8219,11 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "asy" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ - name = "Firefighting equipment"; +/obj/machinery/door/airlock/maintenance{ + name = "Firefighting Equipment"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/starboard/fore) "asz" = ( @@ -8552,9 +8555,10 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "atB" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/starboard/fore) "atC" = ( @@ -8987,9 +8991,10 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "auG" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/cable{ icon_state = "4-8" }, @@ -9175,10 +9180,11 @@ /turf/open/floor/plating, /area/maintenance/fore) "avf" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ name = "Chemical Storage"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/fore) "avg" = ( @@ -9903,10 +9909,11 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/engineering/abandoned{ +/obj/machinery/door/airlock/engineering{ name = "Electrical Maintenance"; req_access_txt = "11" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -10067,10 +10074,11 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "axj" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ - name = "Firefighting equipment"; +/obj/machinery/door/airlock/maintenance{ + name = "Firefighting Equipment"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/port/fore) "axk" = ( @@ -21128,10 +21136,11 @@ /turf/open/floor/carpet, /area/chapel/main) "aXX" = ( -/obj/machinery/door/airlock/engineering/abandoned{ +/obj/machinery/door/airlock/engineering{ name = "Vacant Office A"; req_access_txt = "32" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -29276,9 +29285,10 @@ /turf/open/floor/plasteel/white, /area/science/explab) "brE" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ req_one_access_txt = "8;12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, /area/maintenance/starboard) @@ -35470,10 +35480,11 @@ /turf/open/floor/plasteel, /area/quartermaster/miningdock) "bGo" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ - name = "Firefighting equipment"; +/obj/machinery/door/airlock/maintenance{ + name = "Firefighting Equipment"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/port/aft) "bGp" = ( @@ -37489,10 +37500,11 @@ /turf/open/floor/plating, /area/maintenance/aft) "bKU" = ( -/obj/machinery/door/airlock/engineering/abandoned{ +/obj/machinery/door/airlock/engineering{ name = "Construction Area"; req_access_txt = "32" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -40783,9 +40795,10 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "bTw" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/general/hidden{ dir = 4 }, @@ -42781,10 +42794,11 @@ /turf/open/floor/plasteel, /area/maintenance/port/aft) "bYy" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ name = "Incinerator Access"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden{ name = "wooden barricade (CLOSED)" }, @@ -44052,10 +44066,11 @@ /turf/open/floor/plasteel, /area/engine/break_room) "cbv" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ - name = "Research Delivery access"; +/obj/machinery/door/airlock/maintenance{ + name = "Research Delivery Access"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/starboard/aft) @@ -44186,10 +44201,11 @@ /turf/open/floor/plating, /area/maintenance/aft) "cbO" = ( -/obj/machinery/door/airlock/atmos/abandoned{ +/obj/machinery/door/airlock/atmos{ name = "Atmospherics Maintenance"; req_access_txt = "12;24" }, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/aft) "cbP" = ( @@ -44308,10 +44324,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ name = "Construction Area Maintenance"; req_access_txt = "32" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -45544,10 +45561,11 @@ /turf/closed/wall/r_wall, /area/science/misc_lab) "cfv" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ - name = "Firefighting equipment"; +/obj/machinery/door/airlock/maintenance{ + name = "Firefighting Equipment"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cfw" = ( @@ -47516,10 +47534,11 @@ /turf/open/floor/plating, /area/maintenance/aft) "ckm" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ name = "Biohazard Disposals"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, /area/maintenance/aft) @@ -49366,9 +49385,10 @@ /turf/open/space, /area/maintenance/disposal/incinerator) "cpR" = ( -/obj/machinery/door/airlock/abandoned{ +/obj/machinery/door/airlock{ name = "Observatory Access" }, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/port/aft) "cpS" = ( @@ -52310,9 +52330,10 @@ /turf/open/floor/plating, /area/maintenance/solars/port/aft) "cyL" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/cable{ icon_state = "1-2" }, @@ -55018,9 +55039,10 @@ /turf/open/floor/plating, /area/maintenance/starboard) "cNV" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ req_one_access_txt = "8;12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable{ icon_state = "4-8" @@ -55453,15 +55475,17 @@ /turf/open/floor/plasteel, /area/construction/mining/aux_base) "cTF" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/port/aft) "cTI" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cTJ" = ( @@ -56790,10 +56814,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ name = "Air Supply Maintenance"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, /area/maintenance/starboard/aft) @@ -57228,7 +57253,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/door/airlock/maintenance/abandoned, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/starboard/aft) "sST" = ( diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index ee2587a360c..467e2d99316 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -3078,10 +3078,11 @@ /turf/closed/wall, /area/vacant_room/office) "akB" = ( -/obj/machinery/door/airlock/abandoned{ +/obj/machinery/door/airlock{ name = "Auxiliary Office"; req_access_txt = "32" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/stripes/line{ dir = 2 @@ -4897,10 +4898,11 @@ /turf/open/floor/wood, /area/vacant_room/office) "aof" = ( -/obj/machinery/door/airlock/maintenance_hatch/abandoned{ +/obj/machinery/door/airlock/maintenance_hatch{ name = "Office Maintenance"; req_access_txt = "32" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "4-8" @@ -6201,10 +6203,11 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance_hatch/abandoned{ +/obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -8009,10 +8012,11 @@ /area/maintenance/starboard/fore) "atu" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/maintenance_hatch/abandoned{ +/obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden, /obj/effect/turf_decal/stripes/line{ dir = 2 @@ -8457,10 +8461,11 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "aud" = ( -/obj/machinery/door/airlock/maintenance_hatch/abandoned{ +/obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/stripes/line{ @@ -8476,10 +8481,11 @@ /turf/closed/wall, /area/maintenance/port/fore) "auf" = ( -/obj/machinery/door/airlock/maintenance_hatch/abandoned{ +/obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 2 @@ -9788,10 +9794,11 @@ /turf/open/floor/wood, /area/maintenance/port/fore) "awy" = ( -/obj/machinery/door/airlock/maintenance_hatch/abandoned{ +/obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -69306,10 +69313,11 @@ /turf/open/floor/plasteel, /area/maintenance/port) "cmh" = ( -/obj/machinery/door/airlock/maintenance_hatch/abandoned{ +/obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -73274,10 +73282,11 @@ icon_state = "2-8" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/security/glass/abandoned{ +/obj/machinery/door/airlock/security/glass{ name = "Storage Closet"; req_access_txt = "63" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -80043,10 +80052,11 @@ /turf/open/floor/plasteel, /area/maintenance/port) "cEn" = ( -/obj/machinery/door/airlock/maintenance_hatch/abandoned{ +/obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -83967,10 +83977,11 @@ "cKP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/maintenance_hatch/abandoned{ +/obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/cable/white{ icon_state = "4-8" }, @@ -86708,10 +86719,11 @@ /area/maintenance/starboard/aft) "cPN" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/maintenance_hatch/abandoned{ +/obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/cable/white{ icon_state = "4-8" }, @@ -96481,10 +96493,11 @@ /area/maintenance/starboard/aft) "dfO" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/maintenance_hatch/abandoned{ +/obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/cable/white{ icon_state = "4-8" }, @@ -96564,10 +96577,11 @@ /area/medical/abandoned) "dfU" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/maintenance_hatch/abandoned{ +/obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/barricade/wooden, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -99587,10 +99601,11 @@ /area/maintenance/starboard/aft) "dkQ" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/maintenance_hatch/abandoned{ +/obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -104447,10 +104462,11 @@ /area/maintenance/starboard/aft) "dtX" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/maintenance_hatch/abandoned{ +/obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/cable/white{ icon_state = "4-8" }, @@ -104500,10 +104516,11 @@ /area/hallway/secondary/construction) "dud" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/maintenance_hatch/abandoned{ +/obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -107997,10 +108014,11 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "dAi" = ( -/obj/machinery/door/airlock/maintenance_hatch/abandoned{ +/obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 2 @@ -108011,10 +108029,11 @@ /turf/open/floor/plasteel, /area/hallway/secondary/construction) "dAj" = ( -/obj/machinery/door/airlock/maintenance_hatch/abandoned{ +/obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "1-2" @@ -110414,10 +110433,11 @@ /turf/closed/wall, /area/security/detectives_office/private_investigators_office) "dEl" = ( -/obj/machinery/door/airlock/maintenance_hatch/abandoned{ +/obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ icon_state = "1-2" @@ -113583,10 +113603,11 @@ /area/maintenance/starboard/aft) "dJr" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/maintenance_hatch/abandoned{ +/obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/cable/white{ icon_state = "4-8" }, @@ -127198,10 +127219,11 @@ /turf/closed/wall/r_wall, /area/science/misc_lab/range) "ldk" = ( -/obj/machinery/door/airlock/maintenance_hatch/abandoned{ +/obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 8c0f8dfea50..61532913d3a 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -6445,10 +6445,11 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "alF" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ name = "Secure Storage Room"; req_access_txt = "65" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -7585,10 +7586,11 @@ /area/maintenance/fore) "anE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ name = "Storage Room"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/fore) "anF" = ( @@ -8549,10 +8551,11 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "apv" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ name = "Storage Room"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -9967,10 +9970,11 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "asl" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ name = "Storage Room"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/port/fore) @@ -10382,10 +10386,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ name = "Storage Room"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/fore) "asR" = ( @@ -11100,10 +11105,11 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "aut" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ name = "Storage Room"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/starboard) @@ -12249,10 +12255,11 @@ /turf/open/floor/wood, /area/crew_quarters/dorms) "awI" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ name = "Storage Room"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/starboard/fore) "awJ" = ( @@ -26632,10 +26639,11 @@ /area/storage/tools) "aZv" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ name = "Storage Room"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/starboard/fore) "aZw" = ( @@ -40561,11 +40569,12 @@ /area/vacant_room/office) "bzz" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/grunge/abandoned{ +/obj/machinery/door/airlock/grunge{ name = "Vacant Office"; opacity = 1; req_access_txt = "32" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -48429,10 +48438,11 @@ /turf/open/floor/plating, /area/maintenance/port) "bPI" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ name = "Vacant Office Maintenance"; req_access_txt = "32" }, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/port) "bPJ" = ( @@ -49036,10 +49046,11 @@ /turf/open/floor/plating, /area/maintenance/port) "bRf" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ name = "Storage Room"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/port) @@ -50185,10 +50196,11 @@ /area/engine/engineering) "bTr" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ name = "Storage Room"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/port) "bTs" = ( @@ -53381,10 +53393,11 @@ /turf/open/floor/plating/airless, /area/maintenance/solars/port/aft) "bZO" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ name = "Storage Room"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/port/aft) @@ -55241,10 +55254,11 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "cde" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ name = "Storage Room"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -59673,10 +59687,11 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "clX" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ name = "Storage Room"; req_one_access_txt = "12;47" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -70829,10 +70844,11 @@ }, /area/medical/medbay/aft) "cGP" = ( -/obj/machinery/door/airlock/abandoned{ +/obj/machinery/door/airlock{ name = "Medical Surplus Storeroom"; req_access_txt = "5" }, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/aft) "cGQ" = ( @@ -72319,10 +72335,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ name = "Medical Surplus Storeroom"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/aft) "cJx" = ( @@ -73029,10 +73046,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ name = "Storage Room"; req_one_access_txt = "12;47" }, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cKM" = ( @@ -82862,10 +82880,11 @@ /turf/open/floor/plasteel, /area/construction/mining/aux_base) "dDL" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ name = "Storage Room"; req_access_txt = "12" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/starboard/fore) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index e74f4a41145..5b60801812b 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -4066,10 +4066,11 @@ /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) "ali" = ( -/obj/machinery/door/airlock/abandoned{ +/obj/machinery/door/airlock{ id_tag = "mainthideout"; name = "Hideout" }, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/department/security/brig) "alj" = ( @@ -4774,10 +4775,11 @@ }, /area/maintenance/department/crew_quarters/dorms) "amH" = ( -/obj/machinery/door/airlock/atmos/abandoned{ +/obj/machinery/door/airlock/atmos{ name = "Atmospherics Maintenance"; req_access_txt = "12;24" }, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/department/security/brig) "amI" = ( @@ -5059,10 +5061,11 @@ /turf/open/space/basic, /area/space/nearstation) "anm" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ name = "Pete's Speakeasy"; req_access_txt = "0" }, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) "anp" = ( @@ -14117,10 +14120,11 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "aHn" = ( -/obj/machinery/door/airlock/abandoned{ +/obj/machinery/door/airlock{ name = "Starboard Emergency Storage"; req_access_txt = "0" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/cable{ icon_state = "1-2" }, @@ -35581,10 +35585,11 @@ /turf/open/floor/plating, /area/maintenance/department/engine) "bEm" = ( -/obj/machinery/door/airlock/atmos/abandoned{ +/obj/machinery/door/airlock/atmos{ name = "Atmospherics Maintenance"; req_access_txt = "12;24" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, @@ -53266,9 +53271,10 @@ /turf/open/space/basic, /area/space) "cHS" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ name = "Firing Range" }, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating{ icon_state = "platingdmg3" }, @@ -54407,9 +54413,10 @@ /turf/open/floor/plating, /area/chapel/main/monastery) "fKj" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ name = "Mineral Room" }, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/department/science) "fLG" = ( @@ -56351,9 +56358,10 @@ /turf/open/floor/plating, /area/maintenance/department/security/brig) "kJw" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ name = "Firing Range Target" }, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating{ icon_state = "platingdmg3" }, @@ -56610,10 +56618,11 @@ /turf/open/floor/plasteel/dark, /area/security/prison) "lGv" = ( -/obj/machinery/door/airlock/atmos/abandoned{ +/obj/machinery/door/airlock/atmos{ name = "Atmospherics Maintenance"; req_access_txt = "12;24" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -56658,10 +56667,11 @@ /turf/open/floor/plating, /area/maintenance/department/science) "lKL" = ( -/obj/machinery/door/airlock/abandoned{ +/obj/machinery/door/airlock{ name = "Starboard Emergency Storage"; req_access_txt = "0" }, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/cable{ icon_state = "1-2" }, @@ -57002,9 +57012,10 @@ /turf/open/floor/plating, /area/tcommsat/computer) "mES" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ name = "Surgical Room" }, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/department/science) "mHy" = ( @@ -57509,9 +57520,10 @@ /turf/open/floor/plating, /area/hallway/secondary/exit/departure_lounge) "nZw" = ( -/obj/machinery/door/airlock/abandoned{ +/obj/machinery/door/airlock{ name = "Backup Laboratory" }, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/department/cargo) "obj" = ( @@ -58705,7 +58717,8 @@ /turf/open/floor/plasteel, /area/construction/mining/aux_base) "qXq" = ( -/obj/machinery/door/airlock/maintenance/abandoned, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/abandoned, /obj/structure/cable{ icon_state = "4-8" }, @@ -58953,10 +58966,11 @@ /turf/open/floor/plating, /area/maintenance/department/cargo) "rxQ" = ( -/obj/machinery/door/airlock/abandoned{ +/obj/machinery/door/airlock{ id_tag = "PottySci"; name = "Science Bathroom" }, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/department/science) "rxV" = ( @@ -61031,7 +61045,8 @@ /turf/open/floor/plasteel/dark, /area/science/xenobiology) "xlA" = ( -/obj/machinery/door/airlock/maintenance/abandoned, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/department/science) "xlQ" = ( diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index 297a646ce8c..33e771769c9 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -2,9 +2,6 @@ Station Airlocks Regular */ -/obj/machinery/door/airlock/abandoned - abandoned = TRUE - /obj/machinery/door/airlock/command icon = 'icons/obj/doors/airlocks/station/command.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_com @@ -19,9 +16,6 @@ icon = 'icons/obj/doors/airlocks/station/engineering.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_eng -/obj/machinery/door/airlock/engineering/abandoned - abandoned = TRUE - /obj/machinery/door/airlock/medical icon = 'icons/obj/doors/airlocks/station/medical.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_med @@ -32,9 +26,6 @@ assemblytype = /obj/structure/door_assembly/door_assembly_mai normal_integrity = 250 -/obj/machinery/door/airlock/maintenance/abandoned - abandoned = TRUE - /obj/machinery/door/airlock/maintenance/external name = "external airlock access" icon = 'icons/obj/doors/airlocks/station/maintenanceexternal.dmi' @@ -50,9 +41,6 @@ icon = 'icons/obj/doors/airlocks/station/atmos.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_atmo -/obj/machinery/door/airlock/atmos/abandoned - abandoned = TRUE - /obj/machinery/door/airlock/research icon = 'icons/obj/doors/airlocks/station/research.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_research @@ -110,9 +98,6 @@ glass = TRUE normal_integrity = 400 -/obj/machinery/door/airlock/security/glass/abandoned - abandoned = TRUE - /obj/machinery/door/airlock/medical/glass opacity = 0 glass = TRUE @@ -363,9 +348,6 @@ overlays_file = 'icons/obj/doors/airlocks/centcom/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_grunge -/obj/machinery/door/airlock/grunge/abandoned - abandoned = TRUE - ////////////////////////////////// /* Vault Airlocks @@ -399,9 +381,6 @@ note_overlay_file = 'icons/obj/doors/airlocks/hatch/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_mhatch -/obj/machinery/door/airlock/maintenance_hatch/abandoned - abandoned = TRUE - ////////////////////////////////// /* High Security Airlocks diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index a60329a190e..8de4e90ce87 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -101,57 +101,58 @@ /obj/effect/mapping_helpers/airlock layer = DOOR_HELPER_LAYER -/obj/effect/mapping_helpers/airlock/cyclelink_helper - name = "airlock cyclelink helper" - icon_state = "airlock_cyclelink_helper" - -/obj/effect/mapping_helpers/airlock/cyclelink_helper/Initialize(mapload) +/obj/effect/mapping_helpers/airlock/Initialize(mapload) . = ..() if(!mapload) log_world("### MAP WARNING, [src] spawned outside of mapload!") return var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in loc - if(airlock) - if(airlock.cyclelinkeddir) - log_world("### MAP WARNING, [src] at [AREACOORD(src)] tried to set [airlock] cyclelinkeddir, but it's already set!") - else - airlock.cyclelinkeddir = dir - else + if(!airlock) log_world("### MAP WARNING, [src] failed to find an airlock at [AREACOORD(src)]") + else + payload(airlock) + +/obj/effect/mapping_helpers/airlock/proc/payload(obj/machinery/door/airlock/payload) + return + +/obj/effect/mapping_helpers/airlock/cyclelink_helper + name = "airlock cyclelink helper" + icon_state = "airlock_cyclelink_helper" + +/obj/effect/mapping_helpers/airlock/cyclelink_helper/payload(obj/machinery/door/airlock/airlock) + if(airlock.cyclelinkeddir) + log_world("### MAP WARNING, [src] at [AREACOORD(src)] tried to set [airlock] cyclelinkeddir, but it's already set!") + else + airlock.cyclelinkeddir = dir /obj/effect/mapping_helpers/airlock/locked name = "airlock lock helper" icon_state = "airlock_locked_helper" -/obj/effect/mapping_helpers/airlock/locked/Initialize(mapload) - . = ..() - if(!mapload) - log_world("### MAP WARNING, [src] spawned outside of mapload!") - return - var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in loc - if(airlock) - if(airlock.locked) - log_world("### MAP WARNING, [src] at [AREACOORD(src)] tried to bolt [airlock] but it's already locked!") - else - airlock.locked = TRUE +/obj/effect/mapping_helpers/airlock/locked/payload(obj/machinery/door/airlock/airlock) + if(airlock.locked) + log_world("### MAP WARNING, [src] at [AREACOORD(src)] tried to bolt [airlock] but it's already locked!") else - log_world("### MAP WARNING, [src] failed to find an airlock at [AREACOORD(src)]") + airlock.locked = TRUE + /obj/effect/mapping_helpers/airlock/unres name = "airlock unresctricted side helper" icon_state = "airlock_unres_helper" -/obj/effect/mapping_helpers/airlock/unres/Initialize(mapload) - . = ..() - if(!mapload) - log_world("### MAP WARNING, [src] spawned outside of mapload!") - return - var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in loc - if(airlock) - airlock.unres_sides ^= dir +/obj/effect/mapping_helpers/airlock/unres/payload(obj/machinery/door/airlock/airlock) + airlock.unres_sides ^= dir + +/obj/effect/mapping_helpers/airlock/abandoned + name = "airlock abandoned helper" + icon_state = "airlock_abandoned" + +/obj/effect/mapping_helpers/airlock/abandoned/payload(obj/machinery/door/airlock/airlock) + if(airlock.abandoned) + log_world("### MAP WARNING, [src] at [AREACOORD(src)] tried to make [airlock] abandoned but it's already abandoned!") else - log_world("### MAP WARNING, [src] failed to find an airlock at [AREACOORD(src)]") + airlock.abandoned = TRUE //needs to do its thing before spawn_rivers() is called diff --git a/icons/effects/mapping_helpers.dmi b/icons/effects/mapping_helpers.dmi index 881a40c6063..821338058ce 100644 Binary files a/icons/effects/mapping_helpers.dmi and b/icons/effects/mapping_helpers.dmi differ