From b4ac28ecf6a330147b34f16bcb92894eb97b8f93 Mon Sep 17 00:00:00 2001 From: Ben10083 Date: Wed, 2 Oct 2024 23:59:52 -0400 Subject: [PATCH] Ranger Corvette Tweaks + Aft Dock --- .../Ben10083 - Ranger Ship Tweaks.yml | 60 + maps/away/ships/coc/coc_ranger/coc_ship.dm | 14 +- maps/away/ships/coc/coc_ranger/coc_ship.dmm | 1248 ++++++++++------- 3 files changed, 806 insertions(+), 516 deletions(-) create mode 100644 html/changelogs/Ben10083 - Ranger Ship Tweaks.yml diff --git a/html/changelogs/Ben10083 - Ranger Ship Tweaks.yml b/html/changelogs/Ben10083 - Ranger Ship Tweaks.yml new file mode 100644 index 00000000000..1ce6adf19f3 --- /dev/null +++ b/html/changelogs/Ben10083 - Ranger Ship Tweaks.yml @@ -0,0 +1,60 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Ben10083 + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Fixes up various aspects of the Coalition Ranger ship, primarily relating to airlock names, wrong facing buttons, and missing access." + - rscadd: "Coalition Ranger ship given aft docking port." + - balance: "Replaces rat in Coalition Ranger ship with more balanced white variant." diff --git a/maps/away/ships/coc/coc_ranger/coc_ship.dm b/maps/away/ships/coc/coc_ranger/coc_ship.dm index fbf379cee39..5d335af2584 100644 --- a/maps/away/ships/coc/coc_ranger/coc_ship.dm +++ b/maps/away/ships/coc/coc_ranger/coc_ship.dm @@ -111,7 +111,8 @@ "nav_ranger_corvette_1", "nav_ranger_corvette_2", "nav_ranger_corvette_3", - "nav_ranger_corvette_4" + "nav_ranger_corvette_4", + "nav_ranger_corvette_dock_aft" ) invisible_until_ghostrole_spawn = TRUE @@ -150,6 +151,17 @@ base_turf = /turf/space/dynamic base_area = /area/space +// Aft Dock +/obj/effect/shuttle_landmark/ranger_corvette/dock_aft + name = "Aft Docking Port" + docking_controller = "airlock_ranger_aft_dock" + landmark_tag = "nav_ranger_corvette_dock_aft" + +/obj/effect/map_effect/marker/airlock/docking/ranger_corvette/aft + name = "Aft Dock" + landmark_tag = "nav_ranger_corvette_dock_aft" + master_tag = "airlock_ranger_aft_dock" + /obj/effect/shuttle_landmark/ranger_corvette/transit name = "In transit" landmark_tag = "nav_transit_ranger_corvette" diff --git a/maps/away/ships/coc/coc_ranger/coc_ship.dmm b/maps/away/ships/coc/coc_ranger/coc_ship.dmm index a42f8700ecd..f2f54164bd9 100644 --- a/maps/away/ships/coc/coc_ranger/coc_ship.dmm +++ b/maps/away/ships/coc/coc_ranger/coc_ship.dmm @@ -6,25 +6,29 @@ id = "coc_fore"; name = "fore blast door-control"; pixel_x = -6; - pixel_y = 6 + pixel_y = 6; + req_one_access = list(221,222) }, /obj/machinery/button/remote/blast_door{ id = "coc_midship"; name = "midship blast door-control"; pixel_x = -6; - pixel_y = -3 + pixel_y = -3; + req_one_access = list(221,222) }, /obj/machinery/button/remote/blast_door{ id = "coc_aft"; name = "aft blast door-control"; pixel_x = 4; - pixel_y = -3 + pixel_y = -3; + req_one_access = list(221,222) }, /obj/machinery/button/remote/blast_door{ id = "coc_bridge"; name = "bridge blast door-control"; pixel_x = 4; - pixel_y = 6 + pixel_y = 6; + req_one_access = list(221,222) }, /turf/simulated/floor/tiled/dark/full, /area/ship/ranger_corvette/bridge) @@ -61,20 +65,19 @@ pixel_y = 21; pixel_x = -4; id_tag = "ranger_shuttle_dock"; - name = "Ranger Shuttle docking port controller" + name = "Ranger Shuttle docking port controller"; + req_one_access = list(221,222) }, /turf/simulated/floor/tiled/dark/full, /area/ship/ranger_corvette/foyer) "aiD" = ( /obj/effect/floor_decal/corner/red/diagonal, -/obj/machinery/door/airlock/glass{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/firedoor/noid{ - dir = 4 +/obj/machinery/door/firedoor{ + dir = 4; + req_one_access = list(221,222) }, /turf/simulated/floor/tiled/white, /area/ship/ranger_corvette/canteen) @@ -102,7 +105,8 @@ icon_state = "0-4" }, /obj/machinery/power/apc/west{ - req_access = null + req_access = null; + req_one_access = list(221,222) }, /turf/simulated/floor/carpet/red, /area/ship/ranger_corvette/crew) @@ -143,6 +147,10 @@ }, /turf/simulated/wall/shuttle/space_ship/mercenary, /area/ship/ranger_corvette/engine1) +"ayi" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/dark, +/area/ship/ranger_corvette/gunnery) "ayD" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ dir = 8 @@ -331,6 +339,18 @@ }, /turf/simulated/floor/plating, /area/ship/ranger_corvette/engine2) +"bnu" = ( +/obj/effect/floor_decal/spline/plain/black{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/ship/ranger_corvette/foyer) "bnz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -342,8 +362,9 @@ name = "Custodial Closet"; dir = 4 }, -/obj/machinery/door/firedoor/noid{ - dir = 4 +/obj/machinery/door/firedoor{ + dir = 4; + req_one_access = list(221,222) }, /obj/structure/cable/green{ icon_state = "4-8" @@ -360,10 +381,6 @@ pixel_y = 28; frequency = 1394 }, -/obj/machinery/light/small/emergency{ - dir = 1; - pixel_y = 8 - }, /obj/effect/map_effect/marker/airlock/docking{ name = "ranger_shuttle_dock"; master_tag = "ranger_shuttle_dock"; @@ -417,9 +434,12 @@ /obj/machinery/door/airlock/glass_command{ id_tag = null; name = "Bridge"; - dir = 1 + dir = 1; + req_one_access = list(221,222) + }, +/obj/machinery/door/firedoor{ + req_one_access = list(221,222) }, -/obj/machinery/door/firedoor/noid, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -482,11 +502,6 @@ /turf/simulated/floor/plating, /area/ship/ranger_corvette/engine1) "bGA" = ( -/obj/structure/sign/directions/engineering{ - dir = 1; - pixel_x = -32; - pixel_y = -14 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -509,7 +524,8 @@ color = "#5b5b5b"; frame_color = "#5b5b5b"; spawn_firedoor = 1; - spawn_grille = 1 + spawn_grille = 1; + req_one_access = list(221,222) }, /turf/simulated/floor/plating, /area/shuttle/ranger_shuttle) @@ -551,6 +567,12 @@ /turf/simulated/floor/wood, /area/ship/ranger_corvette/leader) "bVs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/wood, /area/ship/ranger_corvette/foyer) "bXG" = ( @@ -607,6 +629,13 @@ identifier = "ranger"; name = "igs - ranger" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6; + pixel_y = 0 + }, /turf/simulated/floor/carpet, /area/ship/ranger_corvette/foyer) "ckP" = ( @@ -647,7 +676,7 @@ "cos" = ( /obj/structure/sign/securearea, /turf/simulated/wall/shuttle/space_ship/mercenary, -/area/ship/ranger_corvette/foyer) +/area/ship/ranger_corvette/gunnery) "coK" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ dir = 8; @@ -667,8 +696,9 @@ /obj/machinery/button/remote/blast_door{ id = "coc_fore"; name = "fore blast door-control"; - pixel_x = -22; - dir = 8 + pixel_x = -24; + dir = 8; + req_one_access = list(221,222) }, /turf/simulated/floor/tiled/dark, /area/ship/ranger_corvette/foyer) @@ -684,9 +714,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -703,7 +731,9 @@ "cIm" = ( /obj/structure/table/stone/marble, /obj/effect/floor_decal/corner/brown/diagonal, -/obj/machinery/door/firedoor/noid, +/obj/machinery/door/firedoor{ + req_one_access = list(221,222) + }, /obj/item/reagent_containers/food/condiment/shaker/salt{ pixel_x = -9; pixel_y = 7 @@ -715,18 +745,23 @@ /turf/simulated/floor/tiled/white, /area/ship/ranger_corvette/canteen) "cJN" = ( -/obj/effect/map_effect/marker/airlock{ - master_tag = "airlock_ranger_external"; - name = "airlock_ranger_external" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 6 - }, -/obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/machinery/light/small/emergency{ - dir = 8; - pixel_x = -13 +/obj/machinery/door/airlock/external, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/effect/map_effect/marker/airlock/docking/ranger_corvette/aft, +/turf/simulated/floor/plating, +/area/ship/ranger_corvette/atmospherics) +"cZR" = ( +/obj/machinery/door/airlock/external, +/obj/machinery/access_button{ + pixel_x = -28; + pixel_y = 12; + dir = 1; + frequency = 2137 }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/docking/ranger_corvette/aft, +/obj/effect/shuttle_landmark/ranger_corvette/dock_aft, /turf/simulated/floor/plating, /area/ship/ranger_corvette/atmospherics) "cZV" = ( @@ -783,7 +818,9 @@ "dhX" = ( /obj/machinery/vending/dinnerware, /obj/effect/floor_decal/corner/brown/diagonal, -/obj/machinery/door/firedoor/noid, +/obj/machinery/door/firedoor{ + req_one_access = list(221,222) + }, /turf/simulated/floor/tiled/white, /area/ship/ranger_corvette/canteen) "diy" = ( @@ -812,11 +849,6 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/button/remote/blast_door{ - id = "coc_midship"; - name = "midship blast door-control"; - pixel_x = -32 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -849,7 +881,8 @@ color = "#5b5b5b"; frame_color = "#5b5b5b"; spawn_firedoor = 1; - spawn_grille = 1 + spawn_grille = 1; + req_one_access = list(221,222) }, /obj/effect/landmark/entry_point/south{ name = "fore, bridge" @@ -880,19 +913,11 @@ /turf/simulated/floor/tiled/full, /area/shuttle/ranger_shuttle) "dFf" = ( -/obj/machinery/airlock_sensor{ - pixel_x = -20; - dir = 4; - frequency = 2137 - }, -/obj/effect/map_effect/marker/airlock{ - master_tag = "airlock_ranger_external"; - name = "airlock_ranger_external" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 }, /obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/effect/map_effect/marker/airlock/docking/ranger_corvette/aft, /turf/simulated/floor/plating, /area/ship/ranger_corvette/atmospherics) "dGE" = ( @@ -923,22 +948,13 @@ /turf/simulated/floor/tiled/white, /area/ship/ranger_corvette/medbay) "dIx" = ( -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 8; - pixel_y = 0; - pixel_x = 20; - frequency = 2137 - }, -/obj/effect/map_effect/marker/airlock{ - master_tag = "airlock_ranger_external"; - name = "airlock_ranger_external" - }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ - dir = 8 - }, -/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/ship/ranger_corvette/atmospherics) +"dLB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/rack, +/turf/simulated/floor/tiled/dark, +/area/ship/ranger_corvette/engine1) "dMX" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4; @@ -953,7 +969,8 @@ "dUu" = ( /obj/effect/floor_decal/corner/green/diagonal, /obj/machinery/power/apc/east{ - req_access = null + req_access = null; + req_one_access = list(221,222) }, /obj/structure/cable/green{ icon_state = "0-2" @@ -973,14 +990,18 @@ pixel_x = 5; pixel_y = -2 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/wood, /area/ship/ranger_corvette/foyer) "eiR" = ( /obj/machinery/door/airlock/hatch{ - name = "Propulsion"; - dir = 1 + name = "Starboard Propulsion"; + dir = 1; + req_one_access = list(221,222) + }, +/obj/machinery/door/firedoor{ + req_one_access = list(221,222) }, -/obj/machinery/door/firedoor/noid, /turf/simulated/floor/plating, /area/ship/ranger_corvette/engine1) "enD" = ( @@ -1027,7 +1048,9 @@ /area/shuttle/ranger_shuttle) "eue" = ( /obj/machinery/door/airlock/security{ - dir = 4 + dir = 4; + req_one_access = list(221,222); + name = "Brig" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -1035,8 +1058,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor/noid{ - dir = 4 +/obj/machinery/door/firedoor{ + dir = 4; + req_one_access = list(221,222) }, /obj/structure/cable/green{ icon_state = "4-8" @@ -1153,7 +1177,9 @@ /area/ship/ranger_corvette/voidsuits) "eFH" = ( /obj/machinery/door/airlock/command{ - dir = 4 + dir = 4; + name = "Ranger Leader Quarters"; + req_one_access = list(221,222) }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -1161,8 +1187,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/firedoor/noid{ - dir = 4 +/obj/machinery/door/firedoor{ + dir = 4; + req_one_access = list(221,222) }, /obj/structure/cable/green{ icon_state = "4-8" @@ -1191,6 +1218,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/machinery/light{ + dir = 8; + icon_state = "tube_empty" + }, /turf/simulated/floor/tiled/dark, /area/ship/ranger_corvette/foyer) "eQz" = ( @@ -1203,7 +1234,9 @@ /obj/structure/closet/crate/bin{ name = "trashbin" }, -/obj/machinery/alarm/north, +/obj/machinery/alarm/north{ + req_one_access = list(221,222) + }, /turf/simulated/floor/wood, /area/ship/ranger_corvette/foyer) "eRR" = ( @@ -1254,12 +1287,18 @@ /area/ship/ranger_corvette/engineering) "fbf" = ( /obj/machinery/door/airlock/hatch{ - name = "Propulsion"; + name = "Port Propulsion"; dir = 1 }, -/obj/machinery/door/firedoor/noid, +/obj/machinery/door/firedoor{ + req_one_access = list(221,222) + }, /turf/simulated/floor/plating, /area/ship/ranger_corvette/engine2) +"feu" = ( +/obj/effect/map_effect/map_helper/ruler_tiles_3, +/turf/template_noop, +/area/space) "feE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -1269,9 +1308,12 @@ }, /obj/machinery/door/airlock/highsecurity{ name = "Ship Munitions Storage"; - dir = 4 + dir = 4; + req_one_access = list(221,222) + }, +/obj/machinery/door/firedoor{ + req_one_access = list(221,222) }, -/obj/machinery/door/firedoor/noid, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -1323,7 +1365,8 @@ "fmY" = ( /obj/machinery/door/airlock/highsecurity{ name = "Gunnery Comparment"; - dir = 4 + dir = 4; + req_one_access = list(221,222) }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -1331,8 +1374,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor/noid{ - dir = 4 +/obj/machinery/door/firedoor{ + dir = 4; + req_one_access = list(221,222) }, /obj/structure/cable/green{ icon_state = "4-8" @@ -1379,6 +1423,12 @@ }, /turf/simulated/floor/tiled/dark, /area/ship/ranger_corvette/engine1) +"fvO" = ( +/obj/effect/map_effect/map_helper/ruler_tiles_3{ + dir = 4 + }, +/turf/simulated/wall/shuttle/space_ship/mercenary, +/area/ship/ranger_corvette/canteen) "fwA" = ( /turf/simulated/wall/shuttle/space_ship/mercenary, /area/ship/ranger_corvette/canteen) @@ -1447,7 +1497,8 @@ icon_state = "0-4" }, /obj/machinery/power/apc/north{ - req_access = null + req_access = null; + req_one_access = list(221,222) }, /turf/simulated/floor/tiled/dark, /area/ship/ranger_corvette/engine1) @@ -1464,7 +1515,9 @@ dir = 8; icon_state = "tube_empty" }, -/obj/machinery/alarm/west, +/obj/machinery/alarm/west{ + req_one_access = list(221,222) + }, /turf/simulated/floor/tiled/white, /area/ship/ranger_corvette/canteen) "fPZ" = ( @@ -1525,7 +1578,8 @@ color = "#5b5b5b"; frame_color = "#5b5b5b"; spawn_firedoor = 1; - spawn_grille = 1 + spawn_grille = 1; + req_one_access = list(221,222) }, /turf/simulated/floor/tiled/dark, /area/ship/ranger_corvette/brig) @@ -1699,7 +1753,8 @@ /obj/effect/map_effect/marker_helper/airlock/exterior, /obj/machinery/airlock_sensor{ pixel_x = 24; - pixel_y = 6 + pixel_y = 6; + dir = 8 }, /obj/effect/map_effect/marker/airlock/shuttle{ name = "ranger_shuttle_dock2"; @@ -1746,11 +1801,18 @@ /turf/simulated/floor/plating, /area/ship/ranger_corvette/foyer) "gUj" = ( +/obj/machinery/door/firedoor{ + req_one_access = list(221,222) + }, +/obj/machinery/door/blast/regular/open{ + dir = 4; + id = "coc_midship"; + name = "blast door" + }, /obj/machinery/door/airlock/service{ name = "Dormitory"; dir = 1 }, -/obj/machinery/door/firedoor/noid, /turf/simulated/floor/tiled/dark, /area/ship/ranger_corvette/crew) "gUN" = ( @@ -1761,6 +1823,11 @@ pixel_x = 6; pixel_y = 4 }, +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'WARNING: BLAST DOOR'."; + name = "\improper WARNING: BLAST DOOR sign"; + pixel_y = -32 + }, /turf/simulated/floor/carpet, /area/ship/ranger_corvette/foyer) "gWX" = ( @@ -1807,8 +1874,13 @@ /turf/simulated/wall/shuttle/space_ship/mercenary, /area/ship/ranger_corvette/brig) "hdZ" = ( -/obj/machinery/door/airlock/engineering, -/obj/machinery/door/firedoor/noid, +/obj/machinery/door/airlock/engineering{ + req_one_access = list(221,222); + name = "Engineering" + }, +/obj/machinery/door/firedoor{ + req_one_access = list(221,222) + }, /turf/simulated/floor/tiled/dark, /area/ship/ranger_corvette/foyer) "hjK" = ( @@ -1821,7 +1893,9 @@ pixel_x = -5; pixel_y = 5 }, -/obj/machinery/alarm/east, +/obj/machinery/alarm/east{ + req_one_access = list(221,222) + }, /turf/simulated/floor/tiled/dark, /area/ship/ranger_corvette/crew) "hmD" = ( @@ -1837,9 +1911,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor/noid, +/obj/machinery/door/firedoor{ + req_one_access = list(221,222) + }, /obj/machinery/door/airlock/engineering{ - dir = 4 + dir = 4; + req_one_access = list(221,222) }, /obj/structure/cable/green{ icon_state = "4-8" @@ -1855,9 +1932,13 @@ /area/shuttle/ranger_shuttle) "hqB" = ( /obj/machinery/door/airlock/engineering{ - dir = 4 + dir = 4; + req_one_access = list(221,222); + name = "Rotary Cannon Chamber/Starboard Propulsion" + }, +/obj/machinery/door/firedoor{ + req_one_access = list(221,222) }, -/obj/machinery/door/firedoor/noid, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -1873,9 +1954,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor/noid, +/obj/machinery/door/firedoor{ + req_one_access = list(221,222) + }, /obj/machinery/door/airlock/atmos{ - dir = 4 + dir = 4; + req_one_access = list(221,222) }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -1976,8 +2060,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor/noid{ - dir = 4 +/obj/machinery/door/firedoor{ + dir = 4; + req_one_access = list(221,222) }, /obj/structure/cable/green{ icon_state = "4-8" @@ -1988,6 +2073,10 @@ /obj/structure/table/wood, /obj/effect/decal/cleanable/generic, /obj/item/trash/dipbowl, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1; + level = 2 + }, /turf/simulated/floor/carpet, /area/ship/ranger_corvette/foyer) "ibp" = ( @@ -2008,7 +2097,7 @@ }, /obj/machinery/alarm/east{ pixel_x = 6; - req_one_access = null + req_one_access = list(221,222) }, /turf/simulated/floor/tiled/white, /area/ship/ranger_corvette/medbay) @@ -2072,9 +2161,15 @@ icon_state = "tube_empty" }, /turf/simulated/floor/tiled/dark, +/area/ship/ranger_corvette/gunnery) +"itg" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/carpet, /area/ship/ranger_corvette/foyer) "itk" = ( -/obj/machinery/alarm/west, +/obj/machinery/alarm/west{ + req_one_access = list(221,222) + }, /obj/structure/cable/green{ icon_state = "1-4" }, @@ -2105,7 +2200,8 @@ icon_state = "0-2" }, /obj/machinery/power/apc/north{ - req_access = null + req_access = null; + req_one_access = list(221,222) }, /obj/machinery/autolathe, /turf/simulated/floor/tiled/dark, @@ -2204,12 +2300,22 @@ /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, -/area/ship/ranger_corvette/foyer) -"jgn" = ( -/obj/machinery/door/firedoor/noid{ +/area/ship/ranger_corvette/gunnery) +"jcc" = ( +/obj/effect/map_effect/map_helper/ruler_tiles_3{ dir = 4 }, +/turf/simulated/wall/shuttle/space_ship/mercenary, +/area/ship/ranger_corvette/bathroom) +"jgn" = ( +/obj/machinery/door/firedoor{ + dir = 4; + req_one_access = list(221,222) + }, /turf/simulated/floor/wood, /area/ship/ranger_corvette/foyer) "jih" = ( @@ -2368,7 +2474,10 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/power/apc/east, +/obj/machinery/power/apc/east{ + req_access = null; + req_one_access = list(221,222) + }, /turf/simulated/floor/tiled/dark/full, /area/ship/ranger_corvette/voidsuits) "jzV" = ( @@ -2440,8 +2549,9 @@ dir = 4 }, /obj/effect/floor_decal/industrial/hatch/yellow, -/obj/machinery/door/firedoor/noid{ - dir = 4 +/obj/machinery/door/firedoor{ + dir = 4; + req_one_access = list(221,222) }, /obj/structure/cable{ icon_state = "4-8" @@ -2548,34 +2658,25 @@ /area/ship/ranger_corvette/voidsuits) "kkN" = ( /obj/structure/sign/directions/com{ - pixel_x = -32; - pixel_y = -12 - }, -/obj/structure/sign/directions/tcom{ - dir = 1; - pixel_x = -32; - pixel_y = -6 - }, -/obj/structure/sign/directions/security{ - dir = 1; pixel_x = -32 }, -/obj/structure/sign/directions/medical{ - dir = 1; - pixel_x = -32; - pixel_y = 6 - }, -/obj/structure/sign/directions/dock{ - dir = 1; - pixel_x = -32; - pixel_y = 12 - }, /obj/machinery/light{ dir = 8; icon_state = "tube_empty" }, +/obj/structure/sign/directions/all{ + pixel_x = -32; + pixel_y = 6; + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/ship/ranger_corvette/foyer) +"kpi" = ( +/obj/machinery/door/airlock/external, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/docking/ranger_corvette/aft, +/turf/simulated/floor/plating, +/area/ship/ranger_corvette/atmospherics) "kxo" = ( /obj/machinery/portable_atmospherics/powered/pump/filled, /obj/structure/cable/green{ @@ -2593,7 +2694,8 @@ color = "#5b5b5b"; frame_color = "#5b5b5b"; spawn_firedoor = 1; - spawn_grille = 1 + spawn_grille = 1; + req_one_access = list(221,222) }, /turf/simulated/floor/plating, /area/ship/ranger_corvette/bridge) @@ -2640,7 +2742,9 @@ /area/ship/ranger_corvette/bridge) "kYl" = ( /obj/effect/floor_decal/industrial/loading/yellow, -/obj/machinery/alarm/east, +/obj/machinery/alarm/east{ + req_one_access = list(221,222) + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" @@ -2667,10 +2771,24 @@ /obj/effect/decal/cleanable/blood/oil, /turf/simulated/floor/reinforced, /area/ship/ranger_corvette/gunnery) +"lgJ" = ( +/obj/effect/map_effect/window_spawner/full/shuttle{ + color = "#5b5b5b"; + frame_color = "#5b5b5b"; + spawn_firedoor = 1; + spawn_grille = 1; + req_one_access = list(221,222) + }, +/obj/effect/map_effect/map_helper/ruler_tiles_3{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/ship/ranger_corvette/canteen) "lgK" = ( /obj/effect/floor_decal/industrial/hatch/yellow, -/obj/machinery/door/firedoor/noid{ - dir = 4 +/obj/machinery/door/firedoor{ + dir = 4; + req_one_access = list(221,222) }, /turf/simulated/floor/tiled/dark/full, /area/ship/ranger_corvette/foyer) @@ -2679,18 +2797,16 @@ /turf/template_noop, /area/space) "lkY" = ( -/obj/machinery/door/airlock/external, -/obj/machinery/access_button{ - pixel_x = -28; - pixel_y = 12; - dir = 1; +/obj/machinery/airlock_sensor{ + pixel_x = -20; + dir = 4; frequency = 2137 }, -/obj/effect/map_effect/marker/airlock{ - master_tag = "airlock_ranger_external"; - name = "airlock_ranger_external" +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 8 }, -/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/effect/map_effect/marker/airlock/docking/ranger_corvette/aft, /turf/simulated/floor/plating, /area/ship/ranger_corvette/atmospherics) "lpY" = ( @@ -2752,7 +2868,7 @@ dir = 4 }, /obj/machinery/alarm/north{ - req_one_access = null + req_one_access = list(221,222) }, /turf/simulated/floor/tiled/dark/full, /area/ship/ranger_corvette/bridge) @@ -2818,7 +2934,10 @@ "lNa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green, -/obj/machinery/power/apc/west, +/obj/machinery/power/apc/west{ + req_access = null; + req_one_access = list(221,222) + }, /turf/simulated/floor/tiled/white, /area/ship/ranger_corvette/bathroom) "lNh" = ( @@ -2837,7 +2956,9 @@ dir = 4; icon_state = "tube_empty" }, -/obj/machinery/alarm/east, +/obj/machinery/alarm/east{ + req_one_access = list(221,222) + }, /obj/machinery/portable_atmospherics/powered/scrubber, /obj/structure/cable/green{ icon_state = "1-2" @@ -2870,17 +2991,14 @@ /obj/structure/sign/directions/all{ pixel_x = 32 }, -/obj/structure/sign/directions/engineering{ - dir = 4; - pixel_x = 32; - pixel_y = 6 - }, /turf/simulated/floor/tiled/dark, /area/ship/ranger_corvette/foyer) "maw" = ( /obj/machinery/smartfridge/foodheater, /obj/effect/floor_decal/corner/brown/diagonal, -/obj/machinery/door/firedoor/noid, +/obj/machinery/door/firedoor{ + req_one_access = list(221,222) + }, /turf/simulated/floor/tiled/white, /area/ship/ranger_corvette/canteen) "maA" = ( @@ -2890,11 +3008,6 @@ /turf/simulated/floor/tiled/dark, /area/ship/ranger_corvette/engine1) "mbp" = ( -/obj/machinery/door/blast/regular/open{ - dir = 4; - id = "coc_bridge"; - name = "blast door" - }, /obj/effect/floor_decal/corner/brown/diagonal, /obj/machinery/door/blast/regular/open{ dir = 2; @@ -2904,7 +3017,8 @@ /obj/machinery/door/airlock/silver{ name = "Kitchen"; req_access = null; - dir = 4 + dir = 4; + req_one_access = list(221,222) }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -2912,8 +3026,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor/noid{ - dir = 4 +/obj/machinery/door/firedoor{ + dir = 4; + req_one_access = list(221,222) }, /obj/structure/cable/green{ icon_state = "4-8" @@ -2991,19 +3106,23 @@ /area/ship/ranger_corvette/canteen) "mnX" = ( /obj/machinery/door/airlock/highsecurity{ - name = "Armory"; - dir = 1 + name = "Flak Battery Chamber"; + dir = 1; + req_one_access = list(221,222) }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/noid, +/obj/machinery/door/firedoor{ + req_one_access = list(221,222) + }, /turf/simulated/floor/tiled/dark, /area/ship/ranger_corvette/gunnery) "moB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green, /obj/machinery/power/apc/west{ - req_access = null + req_access = null; + req_one_access = list(221,222) }, /turf/simulated/floor/tiled/dark/full, /area/ship/ranger_corvette/leader) @@ -3032,7 +3151,8 @@ color = "#5b5b5b"; frame_color = "#5b5b5b"; spawn_firedoor = 1; - spawn_grille = 1 + spawn_grille = 1; + req_one_access = list(221,222) }, /turf/simulated/floor/plating, /area/ship/ranger_corvette/bridge) @@ -3041,11 +3161,9 @@ /obj/machinery/button/remote/blast_door{ id = "coc_midship"; name = "midship blast door-control"; - pixel_x = -32 - }, -/obj/machinery/light{ - dir = 8; - icon_state = "tube_empty" + pixel_x = -24; + req_one_access = list(221,222); + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/ship/ranger_corvette/foyer) @@ -3095,11 +3213,9 @@ /area/ship/ranger_corvette/cryo) "mFt" = ( /obj/effect/floor_decal/corner/red/diagonal, -/obj/machinery/door/airlock/glass{ - dir = 4 - }, -/obj/machinery/door/firedoor/noid{ - dir = 4 +/obj/machinery/door/firedoor{ + dir = 4; + req_one_access = list(221,222) }, /turf/simulated/floor/tiled/white, /area/ship/ranger_corvette/canteen) @@ -3150,7 +3266,9 @@ /obj/machinery/computer/ship/engines{ dir = 8 }, -/obj/machinery/alarm/east, +/obj/machinery/alarm/east{ + req_one_access = list(221,222) + }, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -3233,7 +3351,9 @@ name = "Surgical Suite"; dir = 1 }, -/obj/machinery/door/firedoor/noid, +/obj/machinery/door/firedoor{ + req_one_access = list(221,222) + }, /turf/simulated/floor/tiled/white, /area/ship/ranger_corvette/medbay) "nou" = ( @@ -3447,6 +3567,18 @@ }, /turf/simulated/floor/tiled/white, /area/ship/ranger_corvette/canteen) +"oyB" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 8 + }, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/machinery/light/small/emergency{ + dir = 4; + pixel_x = 14 + }, +/obj/effect/map_effect/marker/airlock/docking/ranger_corvette/aft, +/turf/simulated/floor/plating, +/area/ship/ranger_corvette/atmospherics) "oAK" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/crate/freezer/rations, @@ -3472,11 +3604,14 @@ "oEN" = ( /obj/machinery/door/airlock{ name = "EVA Storage"; - dir = 1 + dir = 1; + req_one_access = list(221,222) }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/noid, +/obj/machinery/door/firedoor{ + req_one_access = list(221,222) + }, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -3675,7 +3810,8 @@ /area/ship/ranger_corvette/brig) "oXh" = ( /obj/machinery/power/apc/north{ - req_access = null + req_access = null; + req_one_access = list(221,222) }, /obj/structure/cable/green{ icon_state = "0-2" @@ -3859,10 +3995,12 @@ }, /obj/machinery/door/airlock/medical{ name = "Medbay"; - dir = 4 + dir = 4; + req_one_access = list(221,222) }, -/obj/machinery/door/firedoor/noid{ - dir = 4 +/obj/machinery/door/firedoor{ + dir = 4; + req_one_access = list(221,222) }, /obj/structure/cable/green{ icon_state = "4-8" @@ -3971,7 +4109,9 @@ /obj/item/towel/random, /obj/item/towel/random, /obj/item/towel/random, -/obj/machinery/alarm/north, +/obj/machinery/alarm/north{ + req_one_access = list(221,222) + }, /turf/simulated/floor/tiled/white, /area/ship/ranger_corvette/bathroom) "qkP" = ( @@ -4008,9 +4148,12 @@ }, /obj/machinery/door/airlock/highsecurity{ name = "Auxiliary CIC"; - dir = 4 + dir = 4; + req_one_access = list(221,222) + }, +/obj/machinery/door/firedoor{ + req_one_access = list(221,222) }, -/obj/machinery/door/firedoor/noid, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -4036,7 +4179,8 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/power/apc/south{ - req_access = null + req_access = null; + req_one_access = list(221,222) }, /obj/structure/cable/green, /turf/simulated/floor/tiled/white, @@ -4128,7 +4272,9 @@ /turf/simulated/floor/tiled/dark/full, /area/ship/ranger_corvette/bridge) "qGl" = ( -/obj/machinery/alarm/south, +/obj/machinery/alarm/south{ + req_one_access = list(221,222) + }, /obj/machinery/atmospherics/pipe/manifold/hidden/cyan, /obj/item/pipewrench, /turf/simulated/floor/plating, @@ -4142,20 +4288,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, /turf/simulated/floor/tiled/dark/full, -/area/ship/ranger_corvette/foyer) +/area/ship/ranger_corvette/gunnery) "qMt" = ( -/obj/machinery/door/airlock/external, -/obj/effect/map_effect/marker/airlock{ - master_tag = "airlock_ranger_external"; - name = "airlock_ranger_external" +/obj/effect/map_effect/map_helper/ruler_tiles_3{ + dir = 4 }, -/obj/effect/map_effect/marker_helper/airlock/interior, -/turf/simulated/floor/plating, -/area/ship/ranger_corvette/atmospherics) +/turf/template_noop, +/area/space) "qQd" = ( /obj/structure/cryofeed/pipes{ dir = 2; @@ -4175,7 +4318,7 @@ /area/ship/ranger_corvette/cryo) "qRJ" = ( /obj/machinery/door/airlock/silver{ - name = "Toilet"; + name = "Washroom"; dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -4184,7 +4327,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor/noid, +/obj/machinery/door/firedoor{ + req_one_access = list(221,222) + }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -4236,7 +4381,7 @@ }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/alarm/north{ - req_one_access = null + req_one_access = list(221,222) }, /turf/simulated/floor/tiled/dark, /area/ship/ranger_corvette/brig) @@ -4276,7 +4421,8 @@ /area/ship/ranger_corvette/gunnery) "riA" = ( /obj/machinery/power/apc/north{ - req_access = null + req_access = null; + req_one_access = list(221,222) }, /obj/structure/cable/green{ icon_state = "0-2" @@ -4287,6 +4433,19 @@ }, /turf/simulated/floor/plating, /area/ship/ranger_corvette/atmospherics) +"riF" = ( +/obj/machinery/door/firedoor{ + dir = 4; + req_one_access = list(221,222) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/ship/ranger_corvette/foyer) "rki" = ( /obj/item/reagent_containers/glass/bucket{ desc = "A blue plastic bucket, best not to ask what it's for." @@ -4357,7 +4516,7 @@ /turf/simulated/floor/tiled/white, /area/ship/ranger_corvette/bathroom) "rwS" = ( -/mob/living/simple_animal/rat, +/mob/living/simple_animal/rat/white, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4; icon_state = "map_scrubber_on" @@ -4383,7 +4542,10 @@ /obj/structure/bed/stool/chair/shuttle{ dir = 8 }, -/obj/machinery/power/apc/east, +/obj/machinery/power/apc/east{ + req_access = null; + req_one_access = list(221,222) + }, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -4397,8 +4559,13 @@ /turf/template_noop, /area/ship/ranger_corvette/gunnery) "rMA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4; + icon_state = "map-scrubbers" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /obj/machinery/light{ dir = 4; icon_state = "tube_empty" @@ -4494,7 +4661,9 @@ "slH" = ( /obj/effect/floor_decal/corner_wide/blue/diagonal, /obj/machinery/telecomms/allinone/ship/coalition_navy, -/obj/machinery/alarm/south, +/obj/machinery/alarm/south{ + req_one_access = list(221,222) + }, /turf/simulated/floor/tiled/dark, /area/ship/ranger_corvette/telecomms) "slN" = ( @@ -4609,7 +4778,8 @@ icon_state = "0-2" }, /obj/machinery/power/apc/north{ - req_access = null + req_access = null; + req_one_access = list(221,222) }, /turf/simulated/floor/tiled/dark, /area/ship/ranger_corvette/telecomms) @@ -4650,7 +4820,8 @@ color = "#5b5b5b"; frame_color = "#5b5b5b"; spawn_firedoor = 1; - spawn_grille = 1 + spawn_grille = 1; + req_one_access = list(221,222) }, /turf/simulated/floor/plating, /area/ship/ranger_corvette/bridge) @@ -4743,11 +4914,10 @@ /obj/machinery/button/remote/blast_door{ id = "coc_aft"; name = "aft blast door-control"; - pixel_x = -32 - }, -/obj/machinery/light{ + pixel_x = -24; + req_one_access = list(221,222); dir = 8; - icon_state = "tube_empty" + pixel_y = 6 }, /turf/simulated/floor/tiled/dark, /area/ship/ranger_corvette/foyer) @@ -4788,18 +4958,6 @@ /turf/simulated/floor/tiled/white, /area/ship/ranger_corvette/canteen) "thB" = ( -/obj/machinery/door/airlock/external, -/obj/machinery/access_button{ - pixel_x = -28; - pixel_y = -8; - dir = 2; - frequency = 2137 - }, -/obj/effect/map_effect/marker/airlock{ - master_tag = "airlock_ranger_external"; - name = "airlock_ranger_external" - }, -/obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/ship/ranger_corvette/atmospherics) @@ -4809,7 +4967,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/alarm/west{ pixel_x = -5; - req_one_access = null + req_one_access = list(221,222) }, /obj/structure/cable/green{ icon_state = "1-2" @@ -4854,11 +5012,20 @@ /obj/structure/sign/directions/tcom{ dir = 8; pixel_x = -32; - pixel_y = -9 + pixel_y = -6 }, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/sign/directions/com{ + pixel_x = -32; + dir = 8 + }, +/obj/structure/sign/directions/engineering{ + dir = 1; + pixel_x = -32; + pixel_y = 6 + }, /turf/simulated/floor/plating, /area/ship/ranger_corvette/foyer) "tqM" = ( @@ -5038,13 +5205,17 @@ /obj/machinery/firealarm/south, /obj/structure/undies_wardrobe, /obj/effect/floor_decal/corner/green/diagonal, -/obj/machinery/alarm/east, +/obj/machinery/alarm/east{ + req_one_access = list(221,222) + }, /turf/simulated/floor/tiled/white, /area/ship/ranger_corvette/cryo) "tEs" = ( /obj/structure/table/stone/marble, /obj/effect/floor_decal/corner/brown/diagonal, -/obj/machinery/door/firedoor/noid, +/obj/machinery/door/firedoor{ + req_one_access = list(221,222) + }, /obj/item/toy/desk/fan, /turf/simulated/floor/tiled/white, /area/ship/ranger_corvette/canteen) @@ -5179,7 +5350,7 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled/dark, -/area/ship/ranger_corvette/foyer) +/area/ship/ranger_corvette/gunnery) "tVB" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -5189,18 +5360,22 @@ name = "\improper WARNING: BLAST DOOR sign"; pixel_x = 32 }, +/obj/machinery/light{ + dir = 4; + icon_state = "tube_empty" + }, /turf/simulated/floor/tiled/dark, /area/ship/ranger_corvette/foyer) "tWh" = ( /turf/simulated/wall/shuttle/space_ship/mercenary, /area/ship/ranger_corvette/engine1) "tXd" = ( -/obj/effect/floor_decal/industrial/warning, /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/machinery/button/remote/blast_door{ id = "coc_fore"; name = "fore blast door-control"; - pixel_x = 32 + pixel_x = 24; + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -5211,7 +5386,9 @@ /area/ship/ranger_corvette/foyer) "tXz" = ( /obj/structure/bed/stool/chair, -/obj/machinery/alarm/east, +/obj/machinery/alarm/east{ + req_one_access = list(221,222) + }, /turf/simulated/floor/tiled/dark/full, /area/ship/ranger_corvette/leader) "tYR" = ( @@ -5273,7 +5450,9 @@ /turf/simulated/floor/tiled/white, /area/ship/ranger_corvette/canteen) "uhA" = ( -/obj/machinery/alarm/east, +/obj/machinery/alarm/east{ + req_one_access = list(221,222) + }, /obj/machinery/light{ dir = 4; icon_state = "tube_empty" @@ -5329,7 +5508,8 @@ color = "#5b5b5b"; frame_color = "#5b5b5b"; spawn_firedoor = 1; - spawn_grille = 1 + spawn_grille = 1; + req_one_access = list(221,222) }, /turf/simulated/floor/plating, /area/ship/ranger_corvette/bridge) @@ -5498,7 +5678,8 @@ color = "#5b5b5b"; frame_color = "#5b5b5b"; spawn_firedoor = 1; - spawn_grille = 1 + spawn_grille = 1; + req_one_access = list(221,222) }, /turf/simulated/floor/plating, /area/ship/ranger_corvette/bridge) @@ -5509,7 +5690,9 @@ icon_state = "map-scrubbers" }, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/machinery/alarm/east, +/obj/machinery/alarm/east{ + req_one_access = list(221,222) + }, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -5554,7 +5737,10 @@ /turf/simulated/wall/shuttle/space_ship/mercenary, /area/ship/ranger_corvette/voidsuits) "uVR" = ( -/obj/machinery/power/apc/west, +/obj/machinery/power/apc/west{ + req_access = null; + req_one_access = list(221,222) + }, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -5590,6 +5776,9 @@ /turf/simulated/floor/reinforced, /area/ship/ranger_corvette/munitions) "vfX" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/ship/ranger_corvette/crew) "viF" = ( @@ -5615,9 +5804,12 @@ "vtO" = ( /obj/machinery/door/airlock/highsecurity{ name = "Ship Munitions Storage"; - dir = 4 + dir = 4; + req_one_access = list(221,222) + }, +/obj/machinery/door/firedoor{ + req_one_access = list(221,222) }, -/obj/machinery/door/firedoor/noid, /turf/simulated/floor/tiled/dark/full, /area/ship/ranger_corvette/munitions) "vtU" = ( @@ -5640,6 +5832,9 @@ /obj/structure/bed/stool/chair/office/dark{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/tiled/dark/full, /area/ship/ranger_corvette/gunnery) "vyy" = ( @@ -5650,14 +5845,17 @@ /obj/machinery/door/window/northleft{ dir = 4 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/tiled/dark/full, /area/ship/ranger_corvette/gunnery) "vyC" = ( /obj/effect/floor_decal/industrial/loading/yellow{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -5668,7 +5866,7 @@ icon_state = "2-4" }, /turf/simulated/floor/tiled/dark, -/area/ship/ranger_corvette/foyer) +/area/ship/ranger_corvette/gunnery) "vzk" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -5676,6 +5874,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/dark, /area/ship/ranger_corvette/gunnery) "vzU" = ( @@ -5695,18 +5894,20 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor/noid{ - dir = 4 +/obj/machinery/door/firedoor{ + dir = 4; + req_one_access = list(221,222) }, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/machinery/door/airlock/highsecurity{ name = "Armory"; - dir = 4 + dir = 4; + req_one_access = list(221,222) }, /turf/simulated/floor/tiled/dark/full, -/area/ship/ranger_corvette/foyer) +/area/ship/ranger_corvette/gunnery) "vLy" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 6 @@ -5758,7 +5959,9 @@ /obj/machinery/button/remote/blast_door{ id = "coc_aft"; name = "aft blast door-control"; - pixel_x = 32 + req_one_access = list(221,222); + dir = 4; + pixel_x = 24 }, /turf/simulated/floor/tiled/dark, /area/ship/ranger_corvette/foyer) @@ -5774,6 +5977,11 @@ dir = 4; icon_state = "tube_empty" }, +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'WARNING: BLAST DOOR'."; + name = "\improper WARNING: BLAST DOOR sign"; + pixel_y = 32 + }, /turf/simulated/floor/tiled/dark, /area/ship/ranger_corvette/crew) "vVQ" = ( @@ -5784,11 +5992,6 @@ /area/ship/ranger_corvette/atmospherics) "vXi" = ( /obj/effect/floor_decal/industrial/warning/corner, -/obj/machinery/button/remote/blast_door{ - id = "coc_midship"; - name = "midship blast door-control"; - pixel_x = 32 - }, /obj/machinery/light{ dir = 4; icon_state = "tube_empty" @@ -5806,7 +6009,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor/noid, +/obj/machinery/door/firedoor{ + req_one_access = list(221,222) + }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -5936,7 +6141,9 @@ /obj/machinery/button/remote/blast_door{ id = "coc_midship"; name = "midship blast door-control"; - pixel_x = -32 + pixel_x = -24; + req_one_access = list(221,222); + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/ship/ranger_corvette/foyer) @@ -6006,9 +6213,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -6038,12 +6243,17 @@ /turf/simulated/floor/plating, /area/ship/ranger_corvette/atmospherics) "wHL" = ( -/obj/machinery/door/airlock/external, -/obj/effect/map_effect/marker/airlock{ - master_tag = "airlock_ranger_external"; - name = "airlock_ranger_external" +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 8; + pixel_y = 0; + pixel_x = 20; + frequency = 2137 }, -/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 8 + }, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/effect/map_effect/marker/airlock/docking/ranger_corvette/aft, /turf/simulated/floor/plating, /area/ship/ranger_corvette/atmospherics) "wMK" = ( @@ -6060,18 +6270,15 @@ /turf/simulated/wall/shuttle/space_ship/mercenary, /area/shuttle/ranger_shuttle) "wNT" = ( -/obj/effect/map_effect/marker/airlock{ - master_tag = "airlock_ranger_external"; - name = "airlock_ranger_external" - }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ - dir = 8 - }, -/obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/machinery/light/small/emergency{ - dir = 4; - pixel_x = 14 +/obj/machinery/door/airlock/external, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/machinery/access_button{ + pixel_x = 24; + pixel_y = -32; + dir = 8; + frequency = 2137 }, +/obj/effect/map_effect/marker/airlock/docking/ranger_corvette/aft, /turf/simulated/floor/plating, /area/ship/ranger_corvette/atmospherics) "wPe" = ( @@ -6086,13 +6293,18 @@ /turf/simulated/floor/wood, /area/ship/ranger_corvette/foyer) "wPn" = ( -/obj/machinery/door/airlock/engineering, +/obj/machinery/door/airlock/engineering{ + req_one_access = list(221,222); + name = "Engineering" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/door/firedoor/noid, +/obj/machinery/door/firedoor{ + req_one_access = list(221,222) + }, /turf/simulated/floor/tiled/dark, /area/ship/ranger_corvette/foyer) "wSM" = ( @@ -6133,7 +6345,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/alarm/south, +/obj/machinery/alarm/south{ + req_one_access = list(221,222) + }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -6176,7 +6390,8 @@ color = "#5b5b5b"; frame_color = "#5b5b5b"; spawn_firedoor = 1; - spawn_grille = 1 + spawn_grille = 1; + req_one_access = list(221,222) }, /turf/simulated/floor/plating, /area/ship/ranger_corvette/canteen) @@ -6338,10 +6553,13 @@ /area/ship/ranger_corvette/medbay) "xKE" = ( /obj/machinery/door/airlock/glass_security{ - name = "Cell"; - dir = 1 + name = "Holding Cell"; + dir = 1; + req_one_access = list(221,222) + }, +/obj/machinery/door/firedoor{ + req_one_access = list(221,222) }, -/obj/machinery/door/firedoor/noid, /turf/simulated/floor/tiled/dark, /area/ship/ranger_corvette/brig) "xPl" = ( @@ -32392,173 +32610,173 @@ xRX xRX xRX xRX -"} -(102,1,1) = {" -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX -xRX +"} +(102,1,1) = {" +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +vuD +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX +xRX xRX xRX xRX @@ -34511,19 +34729,19 @@ xRX xRX xRX xRX +qMt xRX xRX +qMt xRX xRX +qMt xRX xRX +qMt xRX xRX -xRX -xRX -xRX -xRX -xRX +qMt xRX xRX xRX @@ -35039,7 +35257,7 @@ xRX xRX xRX xRX -xRX +feu xRX xRX xRX @@ -35561,7 +35779,7 @@ ayD bEt tWh fkX -iPn +dLB kFU iOe nGj @@ -35810,7 +36028,7 @@ xRX xRX xRX xRX -xRX +feu kfF bbM jHg @@ -36547,7 +36765,6 @@ xRX xRX xRX xRX -vuD xRX xRX xRX @@ -36582,6 +36799,7 @@ xRX xRX xRX xRX +feu tWh tWh tWh @@ -36838,8 +37056,8 @@ xRX xRX xRX xRX -xRX -xRX +vFS +vFS vFS vFS vFS @@ -36850,7 +37068,7 @@ pDY vFS gOp jmN -yfz +rBK jwy lNh rzM @@ -37071,15 +37289,13 @@ xRX xRX xRX xRX +tJG xRX xRX xRX xRX xRX xRX -tJG -xRX -xRX xRX xRX xRX @@ -37097,9 +37313,11 @@ xRX xRX xRX xRX +cZR +dFf lkY cJN -dFf +thB thB eCy vVQ @@ -37107,7 +37325,7 @@ qGl vFS gXD jsa -yfz +rBK wYR pVf rQB @@ -37352,33 +37570,33 @@ xRX xRX xRX xRX -xRX -xRX +kpi +oyB wHL wNT dIx -qMt +dIx mcN dmm jsq vFS mzO jsa -yfz +rBK sCu uwG rQB -rBK -tEO +tLA +ayi qHO tUC -yfz +tLA sMg ebD ckj ian bhp -bhp +itg gUj vfX cij @@ -37609,7 +37827,7 @@ xRX xRX xRX xRX -xRX +vFS vFS vFS vFS @@ -37621,15 +37839,15 @@ wDN vFS gXD vZZ -yfz +rBK pXU mun sfw -rBK +tLA ioB vyC iXs -yfz +tLA eQS wdq bVs @@ -37866,7 +38084,7 @@ xRX xRX xRX xRX -xRX +feu oIF eZx mlG @@ -37878,18 +38096,18 @@ jwX vFS gXD jsa -yfz +rBK qhi qkP slH -rBK +tLA cos vKn -yfz -yfz +tLA +tLA gqU jgn -jgn +riF jgn jgn yfz @@ -38135,7 +38353,7 @@ vFS vFS aKd jsa -yfz +rBK rBK qrd rBK @@ -38146,7 +38364,7 @@ qbp sYH oKe aYE -aYE +bnu aYE aYE eLC @@ -38637,7 +38855,7 @@ xRX xRX xRX xRX -xRX +feu oNK hmD dfi @@ -39408,7 +39626,7 @@ xRX xRX xRX xRX -xRX +feu oIF oIF oIF @@ -39908,19 +40126,19 @@ xRX xRX xRX xRX +qMt xRX xRX +qMt xRX xRX +qMt xRX xRX +qMt xRX xRX -xRX -xRX -xRX -xRX -xRX +qMt xRX xRX xRX @@ -40195,18 +40413,18 @@ wUT wUT uiz wUT -wUT +jcc wUT uiz -wUT +jcc wUT imn aRl jXh -fwA -xnY +fvO xnY xnY +lgJ fwA xrl fwA @@ -40707,7 +40925,7 @@ mNJ ptP gJZ xRX -xRX +feu xRX kYm yau @@ -40722,7 +40940,7 @@ wlw wlw gLv xRX -xRX +feu xRX xRX xRX @@ -41478,7 +41696,7 @@ gJZ gJZ gJZ xRX -xRX +feu xRX duC twl @@ -41493,7 +41711,7 @@ pRf lGa fAg xRX -xRX +feu xRX xRX xRX @@ -42249,7 +42467,7 @@ xRX xRX xRX xRX -xRX +feu xRX oBx yau @@ -42264,7 +42482,7 @@ yau yau xRX xRX -xRX +feu xRX xRX xRX @@ -43020,6 +43238,7 @@ xRX xRX xRX xRX +feu xRX xRX xRX @@ -43034,8 +43253,7 @@ xRX xRX xRX xRX -xRX -xRX +feu xRX xRX xRX @@ -43228,7 +43446,7 @@ xRX xRX xRX xRX -xRX +vuD xRX xRX xRX @@ -43791,6 +44009,7 @@ xRX xRX xRX xRX +feu xRX xRX xRX @@ -43805,8 +44024,7 @@ xRX xRX xRX xRX -xRX -xRX +feu xRX xRX xRX