From ab263fa238980483beefb94863ddaca310d991d2 Mon Sep 17 00:00:00 2001 From: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> Date: Sat, 7 May 2022 13:51:10 +0200 Subject: [PATCH] Maps in the Service Airlocks (#13776) --- html/changelogs/map_service_airlocks.yml | 6 ++ maps/sccv_horizon/sccv_horizon-1_deck_1.dmm | 16 ++-- maps/sccv_horizon/sccv_horizon-2_deck_2.dmm | 85 +++++++++++---------- maps/sccv_horizon/sccv_horizon-3_deck_3.dmm | 10 +-- 4 files changed, 65 insertions(+), 52 deletions(-) create mode 100644 html/changelogs/map_service_airlocks.yml diff --git a/html/changelogs/map_service_airlocks.yml b/html/changelogs/map_service_airlocks.yml new file mode 100644 index 00000000000..de1ed769fcf --- /dev/null +++ b/html/changelogs/map_service_airlocks.yml @@ -0,0 +1,6 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - maptweak: "Maps in the new service airlocks." \ No newline at end of file diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm index 75f40e6c6ad..61e0bc3cb5b 100644 --- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm +++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm @@ -6494,13 +6494,13 @@ /area/hallway/engineering) "fyb" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock{ - name = "Custodial Closet"; - req_access = list(26) - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/airlock/service{ + req_access = list(26); + name = "Custodial Closet" + }, /turf/simulated/floor/tiled, /area/janitor) "fyz" = ( @@ -21842,10 +21842,6 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid) "tes" = ( -/obj/machinery/door/airlock{ - name = "Custodial Closet Storage"; - req_access = list(26) - }, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -21859,6 +21855,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/airlock/glass_service{ + req_access = list(26); + name = "Custodial Closet Storage" + }, /turf/simulated/floor/tiled, /area/janitor) "teA" = ( diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index 91b11f32627..a62a3c1a6f5 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -2609,11 +2609,11 @@ /area/chapel/office) "bsQ" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass{ +/obj/machinery/door/airlock/glass_service{ name = "Bar Entrance"; req_access = list(25) }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/crew_quarters/bar) "bto" = ( /obj/machinery/light{ @@ -6571,12 +6571,12 @@ "dWH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock{ - name = "Bar Backroom"; - req_access = list(25) - }, /obj/machinery/door/firedoor, -/turf/simulated/floor/plating, +/obj/machinery/door/airlock/service{ + req_access = list(25); + name = "Bar Backroom" + }, +/turf/simulated/floor/tiled, /area/crew_quarters/bar) "dWZ" = ( /obj/structure/lattice/catwalk/indoor/grate, @@ -7085,12 +7085,11 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock{ - id_tag = "chapdoor"; +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/service{ name = "Chaplain's Office"; req_access = list(22) }, -/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/dark, /area/chapel/office) "eqv" = ( @@ -7280,10 +7279,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/airlock{ +/obj/machinery/door/airlock/service{ name = "Reading Room" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled, /area/library) "ewD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -7341,11 +7340,12 @@ "exU" = ( /obj/structure/table/stone/marble, /obj/machinery/door/window/westright{ - name = "Bas access"; + name = "Bar Access"; req_access = list(25) }, /obj/machinery/door/window/eastright{ - name = "Bar Access" + name = "Bar Access"; + req_access = list(25) }, /obj/machinery/door/blast/shutters{ dir = 2; @@ -8377,11 +8377,11 @@ /area/hallway/primary/central_two) "fdZ" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass{ +/obj/machinery/door/airlock/glass_service{ name = "Hydroponics"; req_access = list(35) }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/hydroponics) "fei" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -11061,11 +11061,11 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock{ - name = "Bar Backroom"; - req_access = list(25) +/obj/machinery/door/airlock/service{ + req_access = list(25); + name = "Bar Backroom" }, -/turf/simulated/floor/lino/grey, +/turf/simulated/floor/tiled, /area/crew_quarters/bar) "gDR" = ( /obj/effect/map_effect/wingrille_spawn/reinforced, @@ -20439,11 +20439,11 @@ /area/hydroponics) "muK" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/multi_tile/glass{ +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass_service{ name = "Library" }, -/obj/machinery/door/firedoor/multi_tile, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled, /area/library) "muO" = ( /obj/effect/floor_decal/corner_wide/grey/diagonal, @@ -21663,13 +21663,13 @@ /turf/simulated/floor/tiled/dark, /area/assembly/chargebay) "nfz" = ( -/obj/machinery/door/airlock{ - name = "Lounge" - }, /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/glass{ + name = "Lounge" + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "nfK" = ( @@ -23819,7 +23819,7 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock{ +/obj/machinery/door/airlock/glass{ name = "Lounge" }, /turf/simulated/floor/tiled/dark, @@ -29419,12 +29419,12 @@ /turf/simulated/floor/tiled/dark, /area/engineering/engine_monitoring/tesla) "rGX" = ( -/obj/machinery/door/airlock/glass{ +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/door/airlock/glass_service{ name = "Kitchen"; req_access = list(28) }, -/obj/machinery/door/firedoor, -/obj/effect/floor_decal/corner/grey/diagonal, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "rHd" = ( @@ -29706,14 +29706,14 @@ /turf/simulated/floor/plating, /area/maintenance/wing/port/far) "rOx" = ( -/obj/machinery/door/airlock/glass{ - name = "Library" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/door/firedoor, -/turf/simulated/floor/wood, +/obj/machinery/door/airlock/glass_service{ + name = "Library" + }, +/turf/simulated/floor/tiled, /area/library) "rPf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -33864,10 +33864,10 @@ /turf/simulated/floor/plating, /area/medical/cryo) "uot" = ( -/obj/machinery/door/airlock{ +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/service{ name = "Chapel" }, -/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/chapel/main) "uoz" = ( @@ -39793,6 +39793,13 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/engineering/lobby) +"xFQ" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass_service{ + name = "Library" + }, +/turf/simulated/floor/tiled, +/area/library) "xFR" = ( /obj/effect/floor_decal/corner/mauve/diagonal, /obj/structure/cable/green{ @@ -40424,11 +40431,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass{ +/obj/machinery/door/airlock/glass_service{ name = "Hydroponics"; req_access = list(35) }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled, /area/hydroponics) "xXM" = ( /obj/machinery/atmospherics/pipe/simple/visible{ @@ -62357,7 +62364,7 @@ ixR uXq ifP lDb -pea +xFQ gPs vRT bIt diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index 3378fe1a6f7..f5d5b1cb1ea 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -21618,10 +21618,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/door/airlock{ - name = "Journalist's Office"; - req_access = list(70) - }, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -21632,7 +21628,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/wood, +/obj/machinery/door/airlock/service{ + name = "Journalist's Office"; + req_access = list(70) + }, +/turf/simulated/floor/tiled, /area/journalistoffice) "Yi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,