diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 0e96ebd9249..a272884f373 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -588,7 +588,25 @@ // new /obj/item/pestspray(src) // new /obj/item/pestspray(src) +// Spawns with everything you need to make your very own field kitchen! (assuming you have power) +// Contains enough to create a stove and oven. Using loops for anything above one for readability. Best paired with a freezer with ingredients. +// Intended to provide enough equipment that more than just chefs can function as field cooks on expeditions. +/obj/structure/closet/crate/field_kitchen +/obj/structure/closet/crate/field_kitchen/fill() + for(var/_ in 1 to 6) + new /obj/item/stock_parts/capacitor(src) + for(var/_ in 1 to 4) + new /obj/item/stock_parts/matter_bin(src) + for(var/_ in 1 to 2) + new /obj/item/stock_parts/scanning_module(src) + new /obj/item/circuitboard/oven(src) + new /obj/item/circuitboard/stove(src) + new /obj/item/stack/cable_coil(src) + new /obj/item/storage/box/kitchen(src) + new /obj/item/reagent_containers/spray/cleaner(src) + new /obj/item/storage/box/gloves(src) + new /obj/item/storage/box/condiment(src) //A crate that populates itself with randomly selected loot from randomstock.dm //Can be passed in a rarity value, which is used as a multiplier on the rare/uncommon chance diff --git a/code/modules/atmospherics/pipes.dm b/code/modules/atmospherics/pipes.dm index 6ff2ce71c98..9c2e96a6b54 100644 --- a/code/modules/atmospherics/pipes.dm +++ b/code/modules/atmospherics/pipes.dm @@ -1373,7 +1373,7 @@ icon = 'icons/atmos/tank_scc.dmi' /obj/machinery/atmospherics/pipe/tank/air/scc_shuttle/airlock - start_pressure = 303.975 + start_pressure = 607.95 /obj/machinery/atmospherics/pipe/tank/oxygen name = "Pressure Tank (Oxygen)" diff --git a/html/changelogs/hazelmouse-intrepidremap.yml b/html/changelogs/hazelmouse-intrepidremap.yml new file mode 100644 index 00000000000..0a3199cb98d --- /dev/null +++ b/html/changelogs/hazelmouse-intrepidremap.yml @@ -0,0 +1,59 @@ +################################ +# 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: hazelmouse + +# 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: "Remapped the SCCV Intrepid to be more compatible with Odyssey expeditions, and to be smoother and easier for larger expeditions generally. The new Intrepid is designed to be able to take on a large bulker of passengers and equipment without as many issues." + - balance: "Adjusted pressure of SCC-specific airlock tanks from 300 to 600kpa, to be consistent with the canister airlock variant." diff --git a/maps/sccv_horizon/code/sccv_horizon_areas.dm b/maps/sccv_horizon/code/sccv_horizon_areas.dm index 8e16fce2669..01fb5feae97 100644 --- a/maps/sccv_horizon/code/sccv_horizon_areas.dm +++ b/maps/sccv_horizon/code/sccv_horizon_areas.dm @@ -319,23 +319,23 @@ icon_state = "intrepid" requires_power = TRUE -/area/shuttle/intrepid/crew_compartment - name = "Intrepid Crew Compartment" +/area/shuttle/intrepid/main_compartment + name = "Intrepid Main Compartment" /area/shuttle/intrepid/cargo_bay name = "Intrepid Cargo Bay" -/area/shuttle/intrepid/engine_compartment - name = "Engine Compartment" +/area/shuttle/intrepid/medical + name = "Intrepid Medical Compartment" -/area/shuttle/intrepid/atmos_compartment - name = "Atmos Compartment" +/area/shuttle/intrepid/engineering + name = "Intrepid Engineering Compartment" + +/area/shuttle/intrepid/port_storage + name = "Intrepid Port Nacelle" /area/shuttle/intrepid/cockpit - name = "Cockpit" - -/area/shuttle/intrepid/quarters - name = "Intrepid Crew Quarters" + name = "Intrepid Cockpit" /area/shuttle/canary name = "Canary" diff --git a/maps/sccv_horizon/code/sccv_horizon_overmap.dm b/maps/sccv_horizon/code/sccv_horizon_overmap.dm index fff9f34f469..8e67d1254c2 100644 --- a/maps/sccv_horizon/code/sccv_horizon_overmap.dm +++ b/maps/sccv_horizon/code/sccv_horizon_overmap.dm @@ -79,7 +79,7 @@ vessel_size = SHIP_SIZE_SMALL scanimage = "intrepid.png" designer = "Hephaestus Industries" - volume = "21 meters length, 16 meters beam/width, 6 meters vertical height" + volume = "26 meters length, 15 meters beam/width, 6 meters vertical height" sizeclass = "Pathfinder Exploration Shuttle" shiptype = "Field expeditions and private research uses" @@ -89,14 +89,12 @@ skybox_image.pixel_y = rand(128,256) return skybox_image -/obj/machinery/computer/shuttle_control/explore/intrepid +/obj/machinery/computer/shuttle_control/explore/terminal/intrepid name = "\improper Intrepid control console" shuttle_tag = "Intrepid" req_access = list(ACCESS_INTREPID) - density = 0 - icon = 'icons/obj/cockpit_console.dmi' - icon_state = "right" - icon_screen = "blue" + icon_state = "computer" + icon_screen = "helm" icon_keyboard = null circuit = null diff --git a/maps/sccv_horizon/code/sccv_horizon_shuttles.dm b/maps/sccv_horizon/code/sccv_horizon_shuttles.dm index f6c48a615e6..6fdd4482134 100644 --- a/maps/sccv_horizon/code/sccv_horizon_shuttles.dm +++ b/maps/sccv_horizon/code/sccv_horizon_shuttles.dm @@ -106,7 +106,7 @@ /datum/shuttle/autodock/overmap/intrepid name = "Intrepid" move_time = 20 - shuttle_area = list(/area/shuttle/intrepid/crew_compartment, /area/shuttle/intrepid/cargo_bay, /area/shuttle/intrepid/engine_compartment, /area/shuttle/intrepid/atmos_compartment, /area/shuttle/intrepid/cockpit, /area/shuttle/intrepid/quarters) + shuttle_area = list(/area/shuttle/intrepid/main_compartment, /area/shuttle/intrepid/cargo_bay, /area/shuttle/intrepid/medical, /area/shuttle/intrepid/engineering, /area/shuttle/intrepid/port_storage, /area/shuttle/intrepid/cockpit) dock_target = "airlock_shuttle_intrepid" current_location = "nav_hangar_intrepid" landmark_transition = "nav_transit_intrepid" diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index d22050f85d8..094fb22b169 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -1237,9 +1237,6 @@ }, /turf/simulated/floor/tiled, /area/outpost/mining_main/refinery) -"ahX" = ( -/turf/simulated/floor/lino/diamond, -/area/shuttle/intrepid/quarters) "aik" = ( /obj/structure/weightlifter, /obj/random/dirt_75, @@ -1340,26 +1337,6 @@ }, /turf/unsimulated/floor, /area/antag/mercenary) -"aiN" = ( -/obj/effect/floor_decal/corner/yellow{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/universal, -/obj/effect/floor_decal/industrial/outline/emergency_closet, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/structure/table/rack, -/obj/item/pipewrench, -/obj/item/storage/toolbox/electrical{ - pixel_y = 6 - }, -/obj/item/storage/toolbox/mechanical, -/obj/item/wrench{ - pixel_y = -8 - }, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/atmos_compartment) "aiR" = ( /obj/effect/floor_decal/corner/green/diagonal, /obj/effect/floor_decal/spline/fancy{ @@ -3969,9 +3946,6 @@ /turf/simulated/floor/holofloor/carpet, /area/horizon/holodeck/source_dininghall) "aBY" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/dark_green{ dir = 6 @@ -4062,14 +4036,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop/xo) -"aCM" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/cargo_bay) "aCW" = ( /turf/simulated/floor/tiled, /area/engineering/lobby) @@ -4330,10 +4296,11 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "aEw" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "8,13" - }, -/area/shuttle/intrepid/quarters) +/obj/structure/bed/stool/chair/shuttle, +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/item/device/radio/intercom/expedition/north, +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/main_compartment) "aEC" = ( /obj/effect/decal/fake_object/light_source/invisible{ light_color = "#66ccff"; @@ -4446,17 +4413,11 @@ /turf/simulated/floor/tiled, /area/engineering/bluespace_drive) "aFh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 +/obj/effect/landmark/entry_point/starboard{ + name = "starboard, cargo bay" }, -/obj/structure/bed/stool/chair/office/dark{ - dir = 8 - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 7 - }, -/turf/simulated/floor/wood, -/area/shuttle/intrepid/quarters) +/turf/simulated/wall/shuttle/scc, +/area/shuttle/intrepid/cargo_bay) "aFB" = ( /obj/effect/floor_decal/corner/mauve{ dir = 6 @@ -4739,13 +4700,14 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "aHB" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "15,22"; - opacity = 1; - outside_part = 0 +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/cryopod, +/obj/machinery/computer/cryopod{ + pixel_x = -1; + pixel_y = -26 }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/port_storage) "aHC" = ( /obj/structure/table/reinforced/wood, /obj/item/folder/blue, @@ -5057,6 +5019,9 @@ }, /turf/simulated/floor/tiled/full, /area/horizon/security/brig) +"aJI" = ( +/turf/simulated/wall/shuttle/scc, +/area/shuttle/intrepid/port_storage) "aJL" = ( /obj/machinery/door/airlock/glass_command{ dir = 1; @@ -5120,14 +5085,12 @@ /turf/simulated/floor/tiled, /area/horizon/commissary) "aKh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ +/obj/effect/floor_decal/corner/brown{ dir = 5 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cargo_bay) +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/main_compartment) "aKn" = ( /obj/effect/floor_decal/corner_wide/purple/full{ dir = 1 @@ -5202,11 +5165,6 @@ }, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) -"aLc" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "4,13" - }, -/area/shuttle/intrepid/quarters) "aLe" = ( /obj/structure/platform/ledge, /obj/structure/platform/ledge{ @@ -6132,7 +6090,7 @@ }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/item/hullbeacon/red, -/obj/machinery/light{ +/obj/machinery/light/spot{ dir = 8 }, /turf/simulated/floor/plating, @@ -7156,10 +7114,22 @@ /turf/simulated/floor/tiled, /area/horizon/hydroponics) "aYc" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "11,8" +/obj/effect/floor_decal/industrial/hatch_door/yellow, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,73); + dir = 4 }, -/area/shuttle/intrepid/quarters) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/cargo_bay) "aYe" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -7622,6 +7592,10 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/maintenance/operations) +"bbg" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel, +/turf/simulated/wall/shuttle/scc, +/area/shuttle/intrepid/port_storage) "bbu" = ( /obj/machinery/botany/editor, /obj/effect/floor_decal/corner/mauve/full, @@ -8788,9 +8762,6 @@ /turf/simulated/floor/wood, /area/lawoffice/consular_two) "bjf" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/camera/network/first_deck{ c_tag = "First Deck - Hangar 5"; dir = 8 @@ -9076,12 +9047,6 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/legion) -"bli" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/wall/shuttle/scc_space_ship/cardinal, -/area/hangar/intrepid) "blj" = ( /obj/structure/table/reinforced/steel, /obj/random/contraband, @@ -9175,27 +9140,22 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) "blW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/corner/brown{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "2-8" +/obj/structure/bed/handrail{ + dir = 8 }, -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/effect/floor_decal/spline/plain/corner, +/obj/effect/floor_decal/spline/plain/corner/purple{ + dir = 1 }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 +/obj/structure/closet/walllocker/firecloset{ + pixel_x = 32 }, -/obj/effect/floor_decal/corner/blue{ - dir = 10 - }, -/turf/simulated/floor/carpet/rubber, -/area/shuttle/intrepid/crew_compartment) +/obj/item/storage/bag/inflatable/emergency, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/main_compartment) "bmc" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 10 @@ -9882,10 +9842,26 @@ /area/horizon/holodeck/source_theatre) "brI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 10 + dir = 4 }, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cargo_bay) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/main_compartment) "brN" = ( /obj/structure/table/rack, /obj/item/clothing/mask/gas/half, @@ -9912,11 +9888,6 @@ }, /turf/simulated/floor/wood, /area/rnd/hallway) -"brR" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "9,12" - }, -/area/shuttle/intrepid/crew_compartment) "brT" = ( /obj/machinery/light/small, /obj/structure/table/standard{ @@ -9955,12 +9926,15 @@ /turf/simulated/floor/wood, /area/rnd/conference) "brZ" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "14,8" +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, -/obj/item/hullbeacon/red, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/quarters) +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/medical) "bsf" = ( /obj/machinery/alarm/west, /turf/simulated/floor, @@ -11561,11 +11535,6 @@ /obj/machinery/power/apc/low/north, /turf/simulated/floor/tiled/dark, /area/security/checkpoint) -"bEN" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "2,18" - }, -/area/shuttle/intrepid/atmos_compartment) "bEP" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -11692,13 +11661,6 @@ }, /turf/unsimulated/floor, /area/centcom/bar) -"bFM" = ( -/obj/structure/shuttle_part/scc/research{ - density = 0; - icon_state = "10,0" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cockpit) "bFV" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/structure/sign/directions/prop{ @@ -12341,6 +12303,13 @@ /obj/structure/flora/pottedplant/mysterious, /turf/simulated/floor/grass, /area/rnd/hallway/secondary) +"bKa" = ( +/obj/structure/bed/stool/chair/shuttle, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/main_compartment) "bKj" = ( /obj/structure/foamedmetal, /turf/simulated/floor/plating, @@ -12393,27 +12362,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/checkpoint) -"bKA" = ( -/obj/structure/closet/crate{ - name = "power generation supplies" - }, -/obj/item/stack/material/uranium{ - amount = 10 - }, -/obj/item/stock_parts/capacitor, -/obj/item/stack/cable_coil{ - amount = 5 - }, -/obj/item/circuitboard/rtg, -/obj/structure/lattice/catwalk/indoor, -/obj/machinery/light/small/red{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 5 - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) "bKB" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/window/westright, @@ -12916,6 +12864,12 @@ }, /turf/simulated/floor/plating, /area/engineering/bluespace_drive) +"bNV" = ( +/obj/effect/floor_decal/industrial/loading/yellow{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/hangar/intrepid) "bNW" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -12936,14 +12890,6 @@ }, /turf/simulated/floor/plating, /area/storage/shields) -"bNZ" = ( -/obj/item/device/radio/intercom/expedition/north, -/obj/structure/bed/stool/chair/shuttle, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/turf/simulated/floor/lino/diamond, -/area/shuttle/intrepid/quarters) "bOb" = ( /obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{ id = "holodecktint_a" @@ -13019,11 +12965,6 @@ /obj/structure/railing/mapped, /turf/simulated/open, /area/operations/office) -"bOA" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "15,13" - }, -/area/shuttle/intrepid/quarters) "bOH" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -13243,10 +13184,17 @@ /turf/simulated/floor, /area/maintenance/engineering_ladder) "bPT" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "8,7" +/obj/effect/floor_decal/industrial/warning{ + dir = 10 }, -/area/shuttle/intrepid/cockpit) +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/computer/ship/navigation/terminal{ + dir = 1 + }, +/turf/simulated/floor/carpet/rubber, +/area/shuttle/intrepid/main_compartment) "bPX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -13386,12 +13334,6 @@ }, /turf/space/dynamic, /area/horizon/exterior) -"bRj" = ( -/obj/structure/window/shuttle/unique/scc/tall{ - icon_state = "short2_top" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/quarters) "bRm" = ( /obj/machinery/atmospherics/pipe/manifold/visible/green, /turf/simulated/floor/plating, @@ -13559,6 +13501,9 @@ "bSb" = ( /turf/simulated/floor/wood, /area/crew_quarters/heads/chief) +"bSh" = ( +/turf/simulated/wall/shuttle/scc, +/area/shuttle/intrepid/medical) "bSl" = ( /turf/simulated/wall, /area/horizon/hydroponics/garden) @@ -14016,9 +13961,6 @@ }, /area/antag/mercenary) "bUN" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -14090,13 +14032,29 @@ /turf/simulated/floor/plating, /area/shuttle/skipjack) "bVo" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "3,22"; - opacity = 1; - outside_part = 0 +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) +/obj/structure/table/rack, +/obj/item/stack/material/steel/full, +/obj/item/stack/material/glass/full, +/obj/item/stack/material/glass/reinforced/full, +/obj/item/stack/rods{ + amount = 50 + }, +/obj/item/stack/rods{ + amount = 50 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/item/stack/material/graphite/full, +/obj/item/pipewrench, +/obj/item/hoist_kit, +/obj/item/stack/material/steel/full, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/engineering) "bVs" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -14204,10 +14162,12 @@ /turf/simulated/floor/wood, /area/horizon/library) "bWz" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "6,24" - }, -/area/shuttle/intrepid/engine_compartment) +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/portable_atmospherics/canister/empty, +/obj/machinery/atmospherics/portables_connector/scrubber, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/engineering) "bWA" = ( /obj/structure/bed/stool/chair/padded/brown{ can_buckle = 0; @@ -14308,12 +14268,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/engine_room/rust) -"bXg" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "16,11" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/quarters) "bXh" = ( /obj/structure/shuttle/engine/propulsion/burst/right{ dir = 8 @@ -14456,6 +14410,16 @@ }, /turf/unsimulated/floor, /area/centcom/legion/hangar5) +"bYa" = ( +/obj/machinery/sleeper{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/medical) "bYb" = ( /obj/machinery/meter{ name = "Air Reserve" @@ -14851,10 +14815,6 @@ icon_state = "white" }, /area/centcom/legion) -"cbu" = ( -/obj/effect/floor_decal/industrial/warning/corner, -/turf/simulated/floor/plating, -/area/hangar/intrepid) "cbB" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 10 @@ -15490,19 +15450,6 @@ }, /turf/unsimulated/floor/plating, /area/antag/raider) -"cfJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/intrepid/crew_compartment) "cfM" = ( /obj/structure/bed/stool/chair/sofa/left/brown, /obj/item/gamehelm/blue, @@ -16472,13 +16419,6 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor, /area/maintenance/engineering_ladder) -"cmX" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/iff_beacon/horizon/shuttle{ - pixel_y = -15 - }, -/turf/simulated/floor/reinforced, -/area/shuttle/intrepid/cockpit) "cmZ" = ( /obj/structure/closet/wardrobe/xenos, /obj/item/clothing/shoes/footwraps, @@ -16659,21 +16599,27 @@ /turf/simulated/floor/tiled/full, /area/horizon/security/brig) "coc" = ( -/obj/effect/floor_decal/corner/yellow{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/tank/air/scc_shuttle{ - dir = 8 - }, -/obj/structure/closet/walllocker/emerglocker/east, -/obj/machinery/light/small{ +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/machinery/alarm/north{ - req_one_access = list(24,11,47,65) +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 }, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/atmos_compartment) +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/shuttle/intrepid/engineering) "cof" = ( /obj/effect/floor_decal/industrial/warning, /obj/effect/floor_decal/spline/plain, @@ -16698,10 +16644,14 @@ /turf/simulated/floor/holofloor/lino, /area/horizon/holodeck/source_theatre) "con" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "5,8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/area/shuttle/intrepid/quarters) +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/shuttle/intrepid/cargo_bay) "coo" = ( /obj/structure/cable{ icon_state = "1-2" @@ -16833,23 +16783,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hor) -"cpn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/light/small, -/obj/effect/floor_decal/corner/blue{ - dir = 10 - }, -/obj/item/device/radio/intercom/expedition/south, -/turf/simulated/floor/carpet/rubber, -/area/shuttle/intrepid/crew_compartment) "cpp" = ( /obj/structure/railing/mapped{ dir = 4 @@ -16941,6 +16874,11 @@ }, /turf/simulated/floor/tiled/dark/full, /area/horizon/security/firing_range) +"cpV" = ( +/obj/structure/bed/stool/chair/shuttle, +/obj/item/device/radio/intercom/expedition/north, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/main_compartment) "cpX" = ( /obj/structure/curtain/open/shower, /obj/machinery/shower{ @@ -17074,17 +17012,23 @@ /turf/simulated/floor, /area/maintenance/security_port) "cqU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 4 +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 9 +/obj/machinery/door/airlock/external, +/obj/effect/map_effect/marker/airlock/shuttle{ + cycle_to_external_air = 1; + master_tag = "airlock_shuttle_intrepid"; + name = "airlock_shuttle_intrepid"; + req_one_access = null; + shuttle_tag = "Intrepid" }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 }, /turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cargo_bay) +/area/shuttle/intrepid/main_compartment) "cqY" = ( /obj/machinery/disposal/small/east{ pixel_x = -16 @@ -18019,6 +17963,17 @@ }, /turf/simulated/floor/tiled/dark, /area/horizon/security/evidence_storage) +"czS" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/machinery/power/apc/west{ + req_access = null; + req_one_access = list(11, 24, 47, 65) + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/cargo_bay) "czY" = ( /obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{ id = "psych" @@ -18273,14 +18228,12 @@ /turf/simulated/floor/tiled/dark/full, /area/medical/reception) "cCb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8 +/obj/structure/bed/stool/chair/shuttle{ + dir = 1 }, -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/turf/simulated/floor/lino, -/area/shuttle/intrepid/quarters) +/obj/effect/floor_decal/corner/lime/diagonal, +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/main_compartment) "cCd" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -18497,15 +18450,20 @@ /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/fitness/showers) "cEf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 6 - }, -/obj/machinery/atmospherics/binary/pump{ +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1; - name = "External Ports to Air Reserve" + level = 2 }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/atmos_compartment) +/obj/structure/bed/handrail{ + dir = 4 + }, +/obj/machinery/power/portgen/basic, +/obj/machinery/light/small/red{ + dir = 8 + }, +/turf/simulated/floor/tiled/full, +/area/shuttle/intrepid/engineering) "cEh" = ( /obj/effect/floor_decal/corner/dark_green{ dir = 5 @@ -19103,10 +19061,20 @@ /turf/simulated/floor, /area/tdome/tdome1) "cJx" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "6,8" +/obj/effect/floor_decal/corner/brown{ + dir = 6 }, -/area/shuttle/intrepid/quarters) +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/shuttle/intrepid/cargo_bay) "cJy" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -19237,6 +19205,28 @@ }, /turf/simulated/floor/holofloor/lino, /area/horizon/holodeck/source_meetinghall) +"cKK" = ( +/obj/effect/floor_decal/industrial/hatch_door/red, +/obj/machinery/door/airlock/external{ + dir = 8 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "sccv_intrepid_port"; + name = "sccv_intrepid_port" + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/machinery/access_button{ + pixel_y = -29; + pixel_x = 7; + dir = 4 + }, +/obj/machinery/door/blast/shutters/open{ + dir = 8; + id = "intrepid_bay_outer"; + name = "Intrepid Shutter" + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/main_compartment) "cKM" = ( /turf/simulated/wall/r_wall, /area/crew_quarters/heads/cmo) @@ -21133,11 +21123,6 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos) -"cZe" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "7,23" - }, -/area/shuttle/intrepid/engine_compartment) "cZh" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 @@ -21315,6 +21300,16 @@ icon_state = "6,6" }, /area/shuttle/canary) +"daD" = ( +/obj/effect/floor_decal/corner/dark_green/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 8 + }, +/obj/machinery/light/small{ + must_start_working = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/main_compartment) "daE" = ( /obj/effect/floor_decal/corner_wide/black/full, /obj/effect/floor_decal/industrial/warning{ @@ -22279,13 +22274,6 @@ /obj/item/stack/rods, /turf/unsimulated/floor/plating, /area/centcom/legion/hangar5) -"dhJ" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "15,26"; - outside_part = 0 - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) "dhM" = ( /obj/structure/table/rack, /obj/item/storage/briefcase/aluminium{ @@ -22399,7 +22387,6 @@ }, /area/engineering/atmos/propulsion) "dir" = ( -/obj/structure/lattice/catwalk/indoor, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 1 }, @@ -22411,8 +22398,9 @@ shuttle_tag = "Intrepid" }, /obj/effect/map_effect/marker_helper/airlock/out, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, -/area/shuttle/intrepid/cargo_bay) +/area/shuttle/intrepid/main_compartment) "diu" = ( /obj/effect/floor_decal/corner/green/diagonal, /obj/machinery/disposal/small/south, @@ -22709,26 +22697,14 @@ /turf/simulated/wall/r_wall, /area/horizon/security/washroom) "dlv" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 +/obj/effect/floor_decal/corner/brown{ + dir = 9 }, -/obj/machinery/power/portgen/basic, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, -/obj/item/stack/material/graphite/full, -/obj/item/stack/material/graphite/full, -/obj/machinery/light/small{ +/obj/effect/floor_decal/spline/plain/green{ dir = 8 }, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = -12; - pixel_y = 24 - }, -/turf/simulated/floor/carpet/rubber, -/area/shuttle/intrepid/crew_compartment) +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/main_compartment) "dly" = ( /obj/effect/floor_decal/corner{ dir = 1 @@ -23007,15 +22983,16 @@ /turf/simulated/floor/tiled, /area/engineering/break_room) "dnR" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/fuel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ - icon_state = "4-8" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/effect/floor_decal/corner/blue{ - dir = 10 - }, -/turf/simulated/floor/carpet/rubber, -/area/shuttle/intrepid/crew_compartment) +/obj/machinery/bluespace_beacon, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/main_compartment) "dnS" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 @@ -23633,20 +23610,18 @@ /turf/unsimulated/floor, /area/centcom/bar) "drK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/door/firedoor{ - req_one_access = list(24,11,67,73) - }, -/obj/machinery/door/airlock/hatch{ - dir = 1; - name = "Thruster Compartment" +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 8 }, /obj/structure/cable/green{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) +/area/shuttle/intrepid/port_storage) "drP" = ( /obj/structure/grille, /obj/structure/lattice, @@ -24707,10 +24682,10 @@ /turf/unsimulated/floor, /area/antag/ninja) "dyG" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "12,23" - }, -/area/shuttle/intrepid/engine_compartment) +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/floodlight, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/port_storage) "dyJ" = ( /obj/effect/decal/fake_object/light_source/invisible{ light_color = "#C46518"; @@ -26114,18 +26089,6 @@ }, /turf/simulated/floor/carpet/rubber, /area/tcommsat/chamber) -"dJe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cargo_bay) "dJf" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/effect/floor_decal/spline/plain/corner{ @@ -26261,19 +26224,10 @@ /turf/simulated/floor/exoplanet/snow, /area/centcom/shared_dream) "dJY" = ( -/obj/structure/shuttle_part/scc/research{ - density = 0; - icon_state = "8,4"; - outside_part = 0 +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, -/obj/structure/window/shuttle/unique/scc/research/over{ - density = 0; - icon_state = "1,2" - }, -/obj/effect/floor_decal/corner/dark_blue{ - dir = 6 - }, -/obj/structure/table/reinforced, /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/cockpit) "dKg" = ( @@ -26410,12 +26364,15 @@ /turf/simulated/floor/tiled, /area/hangar/operations) "dLs" = ( -/obj/structure/shuttle_part/scc/research{ - density = 0; - icon_state = "4,7" +/obj/effect/floor_decal/corner/brown/full, +/obj/structure/bed/handrail{ + dir = 1 }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cockpit) +/obj/machinery/camera/network/intrepid{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/shuttle/intrepid/cargo_bay) "dLt" = ( /obj/machinery/ammunition_loader/francisca{ weapon_id = "Francisca Rotary Gun" @@ -27144,12 +27101,9 @@ }, /area/centcom/shared_dream) "dRx" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "17,22" - }, -/obj/item/hullbeacon/red, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) +/obj/structure/bed/stool/chair/shuttle, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/main_compartment) "dRy" = ( /obj/structure/closet/emcloset, /obj/effect/floor_decal/corner/brown{ @@ -27263,15 +27217,6 @@ }, /turf/simulated/floor/tiled/white, /area/horizon/security/brig) -"dSQ" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/hangar/intrepid) "dTe" = ( /obj/structure/railing/mapped, /obj/effect/decal/cleanable/dirt, @@ -27745,21 +27690,21 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "dXh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,73) + }, +/obj/effect/floor_decal/industrial/hatch_door/yellow{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/effect/floor_decal/corner/dark_blue/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ - icon_state = "4-8" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/structure/bed/handrail{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/quarters) +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/main_compartment) "dXk" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 10 @@ -28209,18 +28154,22 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "eaS" = ( -/obj/structure/window/shuttle/unique/scc/tall{ - icon_state = "long2-2" +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 8 }, -/obj/machinery/door/firedoor{ - req_one_access = list(24,11,67,73); - dir = 4 +/obj/machinery/light/small{ + dir = 1 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/map_effect/marker/airlock{ + master_tag = "sccv_intrepid_port"; + name = "sccv_intrepid_port" + }, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + pixel_y = 23 }, /turf/simulated/floor/plating, -/area/shuttle/intrepid/crew_compartment) +/area/shuttle/intrepid/main_compartment) "eaU" = ( /obj/structure/cable/green{ icon_state = "11-4" @@ -28259,12 +28208,6 @@ icon_state = "wood" }, /area/centcom/evac) -"ebk" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "8,1" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cockpit) "ebl" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -30233,11 +30176,6 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/horizon/security/holding_cell_a) -"epb" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "7,7" - }, -/area/shuttle/intrepid/cockpit) "epl" = ( /obj/machinery/computer/shuttle_control/multi/burglar{ name = "shuttle control console" @@ -30442,16 +30380,18 @@ /turf/simulated/floor/carpet/rubber, /area/tcommsat/chamber) "eqw" = ( +/obj/effect/floor_decal/corner/brown/full{ + dir = 8 + }, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 + dir = 8 }, -/obj/structure/cable/green{ - icon_state = "0-4" +/obj/machinery/computer/guestpass{ + pixel_y = 2; + pixel_x = -31 }, -/obj/machinery/floodlight, -/obj/machinery/power/apc/intrepid/west, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cargo_bay) +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/main_compartment) "eqD" = ( /turf/simulated/open, /area/turbolift/primary/deck_3) @@ -31011,15 +30951,6 @@ }, /turf/simulated/floor/wood, /area/horizon/library) -"euz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 4 - }, -/obj/machinery/alarm/north{ - req_one_access = list(24,11,47,65) - }, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cargo_bay) "euC" = ( /obj/structure/bed/stool/chair/sofa/left/orange{ dir = 8 @@ -31260,20 +31191,6 @@ /obj/item/clothing/glasses/meson, /turf/simulated/floor/tiled/dark, /area/shuttle/mercenary) -"ewy" = ( -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/door/blast/shutters/open{ - dir = 8; - id = "intrepid_outer"; - name = "Intrepid Shutter" - }, -/obj/structure/lattice/catwalk/indoor, -/obj/structure/bed/handrail{ - dir = 8 - }, -/obj/item/hullbeacon/green, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/crew_compartment) "ewC" = ( /obj/structure/table/rack, /obj/item/clothing/shoes/magboots, @@ -31584,19 +31501,6 @@ }, /turf/simulated/floor/holofloor/wood, /area/horizon/holodeck/source_courtroom) -"eyW" = ( -/obj/structure/window/shuttle/unique/scc/tall{ - icon_state = "long1-2" - }, -/obj/machinery/door/firedoor{ - req_one_access = list(24,11,67,73); - dir = 4 - }, -/obj/effect/landmark/entry_point/starboard{ - name = "starboard, center" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/crew_compartment) "eyX" = ( /obj/structure/railing/mapped, /obj/structure/flora/ausbushes/ywflowers, @@ -31623,6 +31527,13 @@ /obj/random/dirt_75, /turf/simulated/floor/tiled, /area/maintenance/wing/port/far) +"ezr" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/bed/handrail{ + dir = 8 + }, +/turf/simulated/floor/tiled/full, +/area/shuttle/intrepid/main_compartment) "ezt" = ( /obj/machinery/light/small{ dir = 4 @@ -32260,11 +32171,13 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/security/armoury) "eEc" = ( -/obj/effect/floor_decal/industrial/warning/cee{ - dir = 1 +/obj/effect/floor_decal/corner/purple/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/hangar/intrepid) +/obj/structure/extinguisher_cabinet/south, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/main_compartment) "eEi" = ( /obj/structure/railing/mapped, /obj/structure/platform/ledge{ @@ -32856,12 +32769,6 @@ /obj/machinery/drone_fabricator, /turf/simulated/floor/greengrid/nitrogen, /area/engineering/drone_fabrication) -"eHK" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "3,26" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) "eHU" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -32943,9 +32850,6 @@ /turf/simulated/floor/exoplanet/barren, /area/centcom/shared_dream) "eIC" = ( -/obj/structure/cable/green{ - icon_state = "2-8" - }, /obj/structure/railing/mapped{ dir = 4 }, @@ -33267,6 +33171,21 @@ }, /turf/simulated/floor/tiled, /area/operations/loading) +"eLg" = ( +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 8 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "sccv_intrepid_port"; + name = "sccv_intrepid_port" + }, +/obj/machinery/airlock_sensor{ + pixel_y = -24; + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/main_compartment) "eLr" = ( /obj/effect/floor_decal/corner/red/full{ dir = 4 @@ -33372,12 +33291,21 @@ /turf/simulated/floor/tiled/white, /area/medical/reception) "eNa" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/effect/floor_decal/corner/brown/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/cable/green{ + icon_state = "1-8" }, -/obj/effect/floor_decal/corner/dark_blue/diagonal, /turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/cargo_bay) +/area/shuttle/intrepid/main_compartment) "eNb" = ( /obj/structure/cable{ icon_state = "4-8" @@ -34091,19 +34019,29 @@ /turf/simulated/floor/tiled/full, /area/outpost/mining_main/refinery) "eSa" = ( -/obj/machinery/atmospherics/portables_connector/fuel{ - dir = 4 +/obj/effect/floor_decal/corner/brown{ + dir = 9 }, -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/light/small{ +/obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cargo_bay) +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/main_compartment) "eSg" = ( /obj/structure/bed/stool/chair/holochair{ dir = 8 @@ -34214,14 +34152,6 @@ }, /turf/simulated/floor/tiled, /area/horizon/security/hallway) -"eTp" = ( -/obj/machinery/firealarm/north, -/obj/structure/bed/stool/chair/shuttle, -/obj/effect/floor_decal/spline/plain{ - dir = 9 - }, -/turf/simulated/floor/lino, -/area/shuttle/intrepid/quarters) "eTv" = ( /obj/machinery/computer/ship/sensors/cockpit{ pixel_x = -27 @@ -34493,7 +34423,7 @@ }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/item/hullbeacon/red, -/obj/machinery/light{ +/obj/machinery/light/spot{ dir = 4 }, /turf/simulated/floor/plating, @@ -34509,14 +34439,6 @@ /obj/effect/floor_decal/corner/dark_green/diagonal, /turf/simulated/floor/tiled, /area/hangar/auxiliary) -"eVn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 - }, -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "3,11" - }, -/area/shuttle/intrepid/quarters) "eVr" = ( /obj/structure/window/shuttle/unique/tcfl{ icon_state = "16,2" @@ -34700,11 +34622,6 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_storage) -"eWB" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "11,17" - }, -/area/shuttle/intrepid/cargo_bay) "eWE" = ( /obj/structure/platform_stairs/south_north_solo, /turf/simulated/floor/plating, @@ -35163,12 +35080,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/full, /area/horizon/security/office) -"eZW" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "13,3" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cockpit) "eZY" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/green{ @@ -35484,12 +35395,6 @@ }, /turf/unsimulated/floor/plating, /area/shuttle/syndicate_elite) -"fcb" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/hangar/intrepid) "fcc" = ( /obj/effect/floor_decal/spline/plain{ dir = 9 @@ -36199,18 +36104,38 @@ }, /area/centcom/holding) "fgJ" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "7,5"; - outside_part = 0 +/obj/structure/table/reinforced/steel, +/obj/machinery/light/small{ + dir = 1 }, -/obj/structure/window/shuttle/unique/scc/research/over{ - icon_state = "0,3" +/obj/machinery/button/remote/airlock{ + dir = 1; + id = "intrepid_cockpit"; + name = "Cockpit Bolts Control"; + specialfunctions = 4; + pixel_y = 6; + pixel_x = 6 }, -/obj/machinery/door/firedoor{ - req_one_access = list(24,11,67,73); - dir = 4 +/obj/item/pen{ + pixel_x = 6; + pixel_y = -13 }, -/turf/simulated/floor/plating, +/obj/machinery/firealarm/north, +/obj/machinery/button/remote/blast_door{ + dir = 1; + id = "intrepid_bay_outer"; + name = "Airlock Shutters"; + pixel_x = -6; + pixel_y = 6 + }, +/obj/machinery/button/remote/blast_door{ + dir = 1; + id = "intrepid_bay_windows"; + name = "Window Shutters"; + pixel_x = -6; + pixel_y = -5 + }, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/intrepid/cockpit) "fgP" = ( /obj/machinery/vending/tacticool/ert, @@ -36577,10 +36502,21 @@ /turf/simulated/floor/tiled/white, /area/medical/ward) "fjA" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "6,7" +/obj/structure/closet/crate/field_kitchen, +/obj/item/tent, +/obj/item/tent, +/obj/item/tent/big/scc, +/obj/machinery/light/small{ + dir = 4 }, -/area/shuttle/intrepid/cockpit) +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/item/device/radio, +/obj/item/device/radio, +/obj/item/device/radio, +/obj/item/device/radio, +/obj/item/device/radio, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/cargo_bay) "fjB" = ( /obj/effect/floor_decal/corner/red{ dir = 9 @@ -36826,38 +36762,6 @@ }, /turf/simulated/floor/tiled/dark, /area/medical/smoking) -"flh" = ( -/obj/effect/floor_decal/corner/dark_blue{ - dir = 6 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/item/device/binoculars/high_power{ - pixel_x = -2; - pixel_y = -4 - }, -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_x = 4; - pixel_y = 2 - }, -/obj/item/pen{ - pixel_x = 4; - pixel_y = 2 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/recharger{ - pixel_x = -8; - pixel_y = 6 - }, -/obj/machinery/alarm/north{ - req_one_access = list(24,11,47,65) - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/cockpit) "fll" = ( /obj/machinery/light{ dir = 8 @@ -37016,12 +36920,6 @@ }, /turf/unsimulated/floor, /area/antag/mercenary) -"fmT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8 - }, -/turf/simulated/floor/lino/diamond, -/area/shuttle/intrepid/quarters) "fmV" = ( /obj/structure/cable{ icon_state = "1-2" @@ -37214,6 +37112,9 @@ /obj/effect/floor_decal/corner/dark_green/full, /turf/simulated/floor/tiled, /area/hangar/intrepid) +"foG" = ( +/turf/simulated/wall/shuttle/scc, +/area/shuttle/intrepid/engineering) "foN" = ( /obj/structure/tank_wall/hydrogen{ icon_state = "h3" @@ -37565,18 +37466,15 @@ /turf/simulated/floor/tiled/white, /area/horizon/security/autopsy_laboratory) "fry" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "11,5"; - outside_part = 0 +/obj/structure/bed/stool/chair/shuttle{ + dir = 8 }, -/obj/structure/window/shuttle/unique/scc/research/over{ - icon_state = "4,3" +/obj/effect/floor_decal/industrial/outline/security, +/obj/machinery/light/small{ + dir = 1 }, -/obj/machinery/door/firedoor{ - req_one_access = list(24,11,67,73); - dir = 4 - }, -/turf/simulated/floor/plating, +/obj/structure/extinguisher_cabinet/north, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/intrepid/cockpit) "frA" = ( /obj/effect/floor_decal/spline/fancy/wood/cee{ @@ -38256,25 +38154,6 @@ }, /turf/simulated/floor/tiled, /area/horizon/custodial) -"fye" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/structure/bed/stool/chair/shuttle{ - dir = 4 - }, -/turf/simulated/floor/carpet/rubber, -/area/shuttle/intrepid/crew_compartment) "fyk" = ( /obj/structure/bed/stool/chair/office/dark{ dir = 1 @@ -38469,6 +38348,12 @@ /obj/item/bee_pack, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics) +"fzG" = ( +/obj/effect/landmark/entry_point/port{ + name = "port, medical" + }, +/turf/simulated/wall/shuttle/scc, +/area/shuttle/intrepid/medical) "fzL" = ( /obj/effect/step_trigger/teleporter/random{ affect_ghosts = 1; @@ -39279,10 +39164,18 @@ /turf/simulated/floor/plating, /area/maintenance/engineering_ladder) "fFx" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "12,8" +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, -/area/shuttle/intrepid/quarters) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/medical) "fFF" = ( /obj/machinery/light/small{ dir = 1 @@ -39386,10 +39279,25 @@ }, /area/centcom/legion) "fGD" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "4,20" +/obj/effect/floor_decal/corner/brown{ + dir = 9 }, -/area/shuttle/intrepid/cargo_bay) +/obj/structure/bed/handrail{ + dir = 4 + }, +/obj/effect/floor_decal/spline/plain/corner/green{ + dir = 8 + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/power/apc/west{ + req_access = null; + req_one_access = list(11, 24, 47, 65) + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/main_compartment) "fGF" = ( /obj/effect/floor_decal/corner/blue/full, /obj/structure/table/rack, @@ -39652,16 +39560,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/hallway/engineering) -"fIy" = ( -/obj/machinery/door/window/eastright, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) "fIC" = ( /obj/effect/floor_decal/corner/purple{ dir = 5 @@ -40297,21 +40195,19 @@ /turf/simulated/floor/tiled/full, /area/engineering/lobby) "fNt" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "12,26"; - opacity = 1; - outside_part = 0 +/obj/effect/map_effect/window_spawner/full/shuttle/scc{ + spawn_firedoor = 1; + spawn_grille = 1 }, -/obj/structure/shuttle_part/scc/scout{ - desc = "The hull and reinforcement of a Pathfinder class corporate expedition shuttle. The phoron-purple colored bands indicate this, in bold text as the SCCV Intrepid."; - icon = 'icons/obj/spaceship/scc/ship_engine.dmi'; - icon_state = "nozzle"; - name = "pathfinder class shuttle hull"; - opacity = 1; - outside_part = 0 +/obj/effect/landmark/entry_point/fore{ + name = "fore, cockpit" + }, +/obj/machinery/door/blast/shutters/open{ + id = "intrepid_bay_windows"; + name = "Intrepid Shutter" }, /turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) +/area/shuttle/intrepid/cockpit) "fNz" = ( /obj/machinery/power/smes/buildable/substation{ RCon_tag = "Substation - Deck 3 Command" @@ -40674,9 +40570,6 @@ dir = 4; pixel_x = 32 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/dark_green{ @@ -41723,22 +41616,21 @@ /turf/simulated/floor/exoplanet/barren, /area/centcom/shared_dream) "fYr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/structure/lattice/catwalk/indoor, /obj/structure/cable/green{ d2 = 2; icon_state = "0-2" }, -/obj/structure/bed/handrail{ - dir = 4 +/obj/machinery/power/apc/north{ + req_one_access = list(11, 24, 47, 65); + req_access = null }, -/obj/machinery/computer/cryopod{ - pixel_x = 28; - pixel_y = 7 +/obj/structure/bed/handrail, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/obj/machinery/power/apc/intrepid/west, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/port_storage) "fYv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -41963,37 +41855,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard/far) -"fZQ" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume, -/obj/machinery/access_button{ - dir = 4; - pixel_x = -22; - pixel_y = 2 - }, -/obj/machinery/airlock_sensor/airlock_exterior{ - dir = 4; - pixel_x = -21; - pixel_y = 10 - }, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/structure/bed/handrail{ - dir = 4 - }, -/obj/machinery/door/blast/shutters/open{ - dir = 2; - id = "intrepid_bay_outer"; - name = "Intrepid Shutter" - }, -/obj/effect/map_effect/marker/airlock/shuttle{ - cycle_to_external_air = 1; - master_tag = "airlock_shuttle_intrepid"; - name = "airlock_shuttle_intrepid"; - req_one_access = null; - shuttle_tag = "Intrepid" - }, -/obj/effect/map_effect/marker_helper/airlock/exterior, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cargo_bay) "fZX" = ( /obj/machinery/camera/network/command{ c_tag = "Bridge - Pilot Room"; @@ -42056,15 +41917,15 @@ /turf/simulated/floor/tiled/white, /area/shuttle/hapt) "gar" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/effect/floor_decal/industrial/warning{ +/obj/machinery/meter{ + name = "Propellant Line" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ dir = 1 }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) +/area/shuttle/intrepid/engineering) "gat" = ( /turf/simulated/floor/beach/sand{ icon_state = "seashallow" @@ -42415,12 +42276,6 @@ }, /turf/simulated/floor/reinforced/n20, /area/engineering/atmos/air) -"gdy" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cargo_bay) "gdz" = ( /obj/structure/grille/broken, /obj/effect/floor_decal/industrial/warning{ @@ -42463,9 +42318,6 @@ /turf/simulated/floor/exoplanet/grass, /area/centcom/shared_dream) "gdL" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, @@ -42899,19 +42751,6 @@ }, /turf/simulated/floor/tiled, /area/horizon/custodial) -"ghy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/corner/dark_blue{ - dir = 6 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/cargo_bay) "ghB" = ( /obj/effect/floor_decal/corner/grey{ dir = 10 @@ -43280,6 +43119,10 @@ }, /turf/simulated/floor/holofloor/grass, /area/horizon/holodeck/source_picnicarea) +"gkk" = ( +/obj/machinery/atmospherics/unary/engine/scc_shuttle, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/port_storage) "gkm" = ( /obj/machinery/door/airlock/maintenance_hatch{ dir = 1 @@ -43343,11 +43186,6 @@ }, /turf/simulated/floor, /area/maintenance/engineering_ladder) -"gkN" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "14,17" - }, -/area/shuttle/intrepid/cargo_bay) "gkP" = ( /obj/structure/table/steel, /obj/item/towel/random{ @@ -43367,6 +43205,13 @@ }, /turf/simulated/floor/holofloor/tiled, /area/horizon/holodeck/source_thunderdomecourt) +"gkU" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/cargo_bay) "gkV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -43515,12 +43360,6 @@ }, /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) -"gmo" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "1,20" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/atmos_compartment) "gmr" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 5 @@ -43594,18 +43433,15 @@ /turf/simulated/floor/tiled, /area/horizon/stairwell/bridge) "gmT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/door/firedoor{ - req_one_access = list(24,11,67,73) +/obj/effect/floor_decal/industrial/warning{ + dir = 6 }, -/obj/machinery/door/airlock/hatch{ - dir = 1; - name = "Thruster Compartment"; - req_one_access = list(73,11,24) +/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/machinery/meter{ + name = "Airlock Reserve" }, /turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) +/area/shuttle/intrepid/engineering) "gmW" = ( /obj/effect/floor_decal/corner/red/full{ dir = 1 @@ -44668,7 +44504,7 @@ /obj/effect/shuttle_landmark/intrepid/hangar{ dir = 1 }, -/obj/effect/floor_decal/industrial/warning/cee, +/obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/plating, /area/hangar/intrepid) "guw" = ( @@ -44978,12 +44814,6 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/propulsion) -"gwA" = ( -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/turf/simulated/wall/shuttle/scc_space_ship/cardinal, -/area/hangar/intrepid) "gwG" = ( /obj/structure/cable/green, /obj/effect/floor_decal/industrial/hatch, @@ -45690,12 +45520,15 @@ /turf/simulated/floor/tiled/dark, /area/storage/eva) "gBD" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "15,24"; - opacity = 1 +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/light/small{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) +/obj/machinery/atmospherics/portables_connector/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/port_storage) "gBH" = ( /obj/structure/table/reinforced/steel, /obj/machinery/door/window/brigdoor/southleft{ @@ -45879,11 +45712,21 @@ /turf/simulated/floor/reinforced/airless, /area/horizon/exterior) "gDj" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/red, -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "11,17" +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 }, -/area/shuttle/intrepid/cargo_bay) +/obj/machinery/door/airlock/external, +/obj/machinery/atmospherics/pipe/manifold4w/hidden, +/obj/effect/map_effect/marker/airlock/shuttle{ + cycle_to_external_air = 1; + master_tag = "airlock_shuttle_intrepid"; + name = "airlock_shuttle_intrepid"; + req_one_access = null; + shuttle_tag = "Intrepid" + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/main_compartment) "gDl" = ( /obj/machinery/door/blast/regular/open{ dir = 8 @@ -46150,6 +45993,19 @@ density = 1 }, /area/centcom/shared_dream) +"gFb" = ( +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/effect/floor_decal/corner/black{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/loading/yellow, +/turf/simulated/floor/tiled/dark, +/area/hangar/intrepid) "gFc" = ( /obj/structure/cable/yellow{ icon_state = "0-8" @@ -46857,12 +46713,6 @@ }, /turf/simulated/floor/plating, /area/horizon/custodial/disposals) -"gJM" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "1,19" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/atmos_compartment) "gJN" = ( /obj/structure/table/steel, /obj/machinery/light{ @@ -46901,16 +46751,9 @@ /turf/simulated/floor/holofloor/tiled, /area/horizon/holodeck/source_emptycourt) "gKh" = ( -/obj/structure/bed/stool/chair/shuttle{ - can_dismantle = 1; - dir = 8; - name = "worn chair" - }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/turf/simulated/floor/lino, -/area/shuttle/intrepid/quarters) +/obj/machinery/door/airlock/glass_medical, +/turf/simulated/floor/tiled/full, +/area/shuttle/intrepid/medical) "gKm" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, @@ -47129,10 +46972,12 @@ /turf/simulated/floor/wood, /area/shuttle/merchant) "gMb" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "14,23" +/obj/machinery/atmospherics/binary/pump/fuel{ + dir = 8; + name = "Canister to Thrusters" }, -/area/shuttle/intrepid/engine_compartment) +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/port_storage) "gMd" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -47497,20 +47342,20 @@ /turf/simulated/floor/tiled, /area/medical/paramedic) "gPe" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, -/obj/effect/floor_decal/corner/dark_blue/diagonal, -/obj/item/device/radio/intercom/expedition/hailing/east, -/obj/machinery/camera/network/intrepid{ - c_tag = "Intrepid - Crew Area"; - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/structure/bed/handrail{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/quarters) +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/carpet/rubber, +/area/shuttle/intrepid/main_compartment) "gPf" = ( /obj/machinery/camera/network/engineering{ c_tag = "Engineering - Starboard Combustion Chamber"; @@ -47523,15 +47368,14 @@ /turf/simulated/floor/reinforced/airless, /area/engineering/atmos/propulsion/starboard) "gPk" = ( -/obj/structure/bed/stool/chair/shuttle, -/obj/effect/floor_decal/spline/plain{ - dir = 1 +/obj/effect/floor_decal/corner/brown{ + dir = 9 }, -/obj/machinery/light/small{ - dir = 1 +/obj/effect/floor_decal/spline/plain/blue{ + dir = 8 }, -/turf/simulated/floor/lino/diamond, -/area/shuttle/intrepid/quarters) +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/main_compartment) "gPm" = ( /obj/structure/foamedmetal, /obj/structure/shuttle_part/scc_space_ship{ @@ -48023,20 +47867,10 @@ /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "gSU" = ( -/obj/structure/shuttle_part/scc/research{ - density = 0; - icon_state = "10,4"; - outside_part = 0 +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, -/obj/structure/window/shuttle/unique/scc/research/over{ - density = 0; - icon_state = "3,2" - }, -/obj/effect/floor_decal/corner/dark_blue{ - dir = 9 - }, -/obj/machinery/computer/shuttle_control/explore/intrepid, -/obj/structure/table/reinforced, /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/cockpit) "gSY" = ( @@ -48995,19 +48829,21 @@ /turf/simulated/floor/holofloor/tiled, /area/horizon/holodeck/source_boxingcourt) "gZL" = ( +/obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, /obj/structure/cable/green{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, -/obj/machinery/camera/network/intrepid{ - c_tag = "Intrepid - Cargo"; +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/cargo_bay) +/area/shuttle/intrepid/port_storage) "gZP" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -49316,25 +49152,15 @@ /turf/simulated/floor/tiled/full, /area/medical/ors) "hcq" = ( -/obj/structure/bed/stool/chair/office/bridge, -/obj/machinery/button/remote/blast_door{ - dir = 1; - id = "intrepid_outer"; - name = "side facing external blast door controller"; - pixel_x = -34; - pixel_y = -2 +/obj/machinery/hologram/holopad/long_range, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, -/obj/machinery/button/remote/airlock{ - dir = 1; - id = "intrepid_cockpit"; - name = "Cockpit Bolts"; - pixel_x = -34; - pixel_y = 7; - specialfunctions = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/obj/effect/floor_decal/corner/dark_blue/diagonal, -/obj/item/device/radio/intercom/expedition/hailing/west, -/turf/simulated/floor/tiled/dark, +/obj/effect/overmap/visitable/ship/landable/intrepid, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/intrepid/cockpit) "hcr" = ( /turf/simulated/floor/carpet/red, @@ -49458,11 +49284,6 @@ "hdi" = ( /turf/simulated/wall, /area/security/checkpoint) -"hdl" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "11,22" - }, -/area/shuttle/intrepid/cargo_bay) "hdp" = ( /obj/effect/decal/fake_object{ icon = 'icons/misc/beach.dmi'; @@ -50399,6 +50220,10 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) +"hlh" = ( +/obj/effect/floor_decal/corner/lime/diagonal, +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/medical) "hlk" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 @@ -51080,27 +50905,21 @@ /turf/simulated/floor/tiled/freezer, /area/operations/break_room) "hqg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cargo_bay) -"hqn" = ( -/obj/structure/lattice/catwalk/indoor, -/obj/machinery/light/small/red{ +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/machinery/cryopod, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) -"hqo" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "7,2" +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/shuttle/intrepid/cockpit) +/area/shuttle/intrepid/main_compartment) "hqu" = ( /obj/effect/floor_decal/corner/red{ dir = 10 @@ -52023,17 +51842,11 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/cafeteria) "hwA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 +/obj/structure/bed/stool/chair/shuttle{ + dir = 1 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 6 - }, -/turf/simulated/floor/wood, -/area/shuttle/intrepid/quarters) +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/main_compartment) "hwH" = ( /obj/effect/floor_decal/corner/dark_green{ dir = 6 @@ -52227,15 +52040,16 @@ /turf/simulated/floor/grass, /area/horizon/hallway/deck_three/primary/port) "hxL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/bed/handrail{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "2-4" +/obj/effect/floor_decal/industrial/hatch_tiny/yellow, +/obj/machinery/atmospherics/binary/passive_gate/on{ + name = "Air Tank to Air Distribution" }, -/obj/machinery/firealarm/north, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) +/turf/simulated/floor/tiled/full, +/area/shuttle/intrepid/engineering) "hxM" = ( /obj/structure/table/wood, /obj/machinery/light, @@ -52394,16 +52208,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/central_two) -"hzv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/intrepid/crew_compartment) "hzC" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/reinforced, @@ -52468,18 +52272,6 @@ }, /turf/simulated/floor/carpet/rubber, /area/assembly/chargebay) -"hAl" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "13,26"; - opacity = 1; - outside_part = 0 - }, -/obj/machinery/atmospherics/unary/engine/scc_shuttle, -/obj/effect/landmark/entry_point/aft{ - name = "aft, port engines" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) "hAm" = ( /obj/structure/railing/mapped, /turf/simulated/open, @@ -52598,6 +52390,18 @@ /obj/item/device/taperecorder, /turf/simulated/floor/carpet, /area/journalistoffice) +"hBb" = ( +/obj/effect/map_effect/window_spawner/full/shuttle/scc{ + spawn_firedoor = 1; + spawn_grille = 1 + }, +/obj/machinery/door/blast/shutters/open{ + dir = 8; + id = "intrepid_bay_windows"; + name = "Intrepid Shutter" + }, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/engineering) "hBd" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple, /obj/machinery/atmospherics/pipe/simple/visible/purple{ @@ -52712,16 +52516,30 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/bridge/meeting_room) "hBV" = ( -/obj/machinery/atmospherics/binary/pump/fuel{ - dir = 8; - name = "External Ports to Fuel Tank" +/obj/effect/floor_decal/corner/brown{ + dir = 9 }, -/obj/effect/floor_decal/industrial/outline/operations, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/bed/handrail{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/crew_compartment) +/obj/effect/floor_decal/spline/plain/corner/blue{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain/corner/green{ + dir = 4 + }, +/obj/structure/closet/walllocker/emerglocker/west, +/obj/item/clothing/suit/space/emergency, +/obj/item/clothing/suit/space/emergency, +/obj/item/clothing/suit/space/emergency, +/obj/item/clothing/head/helmet/space/emergency, +/obj/item/clothing/head/helmet/space/emergency, +/obj/item/clothing/head/helmet/space/emergency, +/obj/machinery/camera/network/intrepid{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/main_compartment) "hBW" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -53382,9 +53200,6 @@ /turf/simulated/floor/plating, /area/shuttle/quark/cargo_hold) "hHv" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/firealarm/east, /obj/effect/floor_decal/corner/dark_green{ dir = 6 @@ -53619,12 +53434,6 @@ }, /turf/simulated/floor/tiled/full, /area/operations/break_room) -"hIV" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/turf/simulated/floor/lino, -/area/shuttle/intrepid/quarters) "hIW" = ( /obj/structure/platform, /obj/effect/floor_decal/corner/paleblue/full{ @@ -54534,21 +54343,14 @@ /turf/unsimulated/floor, /area/centcom/bar) "hPR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/effect/floor_decal/industrial/warning{ + dir = 5 }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/effect/floor_decal/corner/dark_blue/diagonal, -/obj/structure/bed/handrail{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/quarters) +/turf/simulated/floor/carpet/rubber, +/area/shuttle/intrepid/main_compartment) "hPY" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 @@ -55763,11 +55565,6 @@ /obj/machinery/disposal/small/east, /turf/simulated/floor/tiled/dark/full, /area/operations/lower/machinist) -"hZs" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "7,8" - }, -/area/shuttle/intrepid/quarters) "hZB" = ( /turf/simulated/floor/wood, /area/crew_quarters/lounge) @@ -55900,11 +55697,6 @@ /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/holofloor/grass, /area/horizon/holodeck/source_meetinghall) -"iaD" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "11,24" - }, -/area/shuttle/intrepid/engine_compartment) "iaJ" = ( /obj/effect/spider/stickyweb, /turf/simulated/floor/exoplanet/barren/raskara, @@ -56251,15 +56043,12 @@ }, /area/antag/mercenary) "idU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/corner/purple/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden{ dir = 8 }, -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/intrepid/crew_compartment) +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/main_compartment) "idV" = ( /obj/effect/map_effect/window_spawner/full/reinforced/firedoor, /turf/simulated/floor, @@ -56389,21 +56178,6 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/gravity_gen) -"ieY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/turf/simulated/floor/lino, -/area/shuttle/intrepid/quarters) "ifd" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -56474,23 +56248,6 @@ }, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics/lower) -"ifw" = ( -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/door/blast/shutters/open{ - dir = 4; - id = "intrepid_outer"; - name = "Intrepid Shutter" - }, -/obj/structure/lattice/catwalk/indoor, -/obj/structure/bed/handrail{ - dir = 4 - }, -/obj/item/hullbeacon/red, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/crew_compartment) "ify" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 6 @@ -57191,19 +56948,39 @@ /turf/simulated/floor/tiled/dark/full, /area/rnd/chemistry) "ilY" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "4,23" +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/binary/pump{ + name = "Air Reserve to Airlock Reserve"; + dir = 4 }, -/area/shuttle/intrepid/engine_compartment) +/obj/machinery/atmospherics/binary/pump/fuel{ + name = "Fuel Tank to Thrusters" + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/hatch_tiny/yellow, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/engineering) "ima" = ( /obj/effect/landmark/lobby_mobs_location, /turf/unsimulated/floor, /area/centcom/start) "imc" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "16,16" +/obj/effect/floor_decal/industrial/hatch_door/red, +/obj/machinery/door/airlock/external{ + dir = 8 }, -/area/shuttle/intrepid/crew_compartment) +/obj/effect/map_effect/marker/airlock{ + master_tag = "sccv_intrepid_port"; + name = "sccv_intrepid_port" + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/machinery/door/blast/shutters/open{ + dir = 8; + id = "intrepid_bay_outer"; + name = "Intrepid Shutter" + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/main_compartment) "ime" = ( /obj/machinery/shieldgen, /obj/effect/floor_decal/industrial/outline/yellow, @@ -57265,6 +57042,12 @@ /obj/effect/floor_decal/corner/red/full, /turf/unsimulated/floor, /area/centcom/spawning) +"imG" = ( +/obj/effect/floor_decal/industrial/loading/yellow{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/hangar/intrepid) "imJ" = ( /obj/machinery/door/airlock/glass_medical{ name = "Emergency Surgery"; @@ -57326,10 +57109,13 @@ }, /area/antag/wizard) "inf" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "12,24" +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/light/small{ + dir = 8 }, -/area/shuttle/intrepid/engine_compartment) +/obj/machinery/recharge_station, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/port_storage) "inp" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -57387,11 +57173,6 @@ icon_state = "wood" }, /area/centcom/legion/hangar5) -"inM" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "11,25" - }, -/area/shuttle/intrepid/engine_compartment) "inO" = ( /obj/structure/table/standard, /obj/item/storage/box/fancy/vials{ @@ -57475,9 +57256,6 @@ /obj/effect/floor_decal/corner/black{ dir = 6 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/hangar/intrepid) @@ -57659,11 +57437,6 @@ }, /turf/simulated/floor/tiled/dark, /area/horizon/security/firing_range) -"ipK" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "2,20" - }, -/area/shuttle/intrepid/atmos_compartment) "ipM" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 10 @@ -58827,6 +58600,10 @@ icon_state = "wood" }, /area/centcom/legion/hangar5) +"iyc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/wall, +/area/hangar/control) "iyd" = ( /obj/machinery/light{ dir = 1 @@ -59230,14 +59007,6 @@ /obj/structure/sign/vacuum, /turf/unsimulated/wall/darkshuttlewall, /area/centcom/specops) -"iAP" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "7,26"; - opacity = 1; - outside_part = 0 - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) "iAR" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 7 @@ -59605,41 +59374,6 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_three/primary/central) -"iDh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/access_button{ - pixel_x = -5; - pixel_y = 20 - }, -/obj/machinery/airlock_sensor/airlock_interior{ - pixel_x = -5; - pixel_y = 25 - }, -/obj/machinery/button/remote/blast_door{ - dir = 1; - id = "intrepid_bay_outer"; - name = "inner cargo hold blast doors"; - pixel_x = 7; - pixel_y = 25 - }, -/obj/effect/map_effect/marker/airlock/shuttle{ - cycle_to_external_air = 1; - master_tag = "airlock_shuttle_intrepid"; - name = "airlock_shuttle_intrepid"; - req_one_access = null; - shuttle_tag = "Intrepid" - }, -/obj/effect/map_effect/marker_helper/airlock/interior, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cargo_bay) "iDj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -60010,12 +59744,48 @@ /turf/simulated/floor/grass, /area/horizon/cafeteria) "iHi" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/atmospherics/portables_connector/fuel{ - dir = 1 +/obj/item/bodybag/cryobag{ + pixel_y = -5 }, -/turf/simulated/floor/reinforced, -/area/shuttle/intrepid/quarters) +/obj/item/bodybag/cryobag{ + pixel_x = 7; + pixel_y = -8 + }, +/obj/item/clothing/mask/surgical, +/obj/item/clothing/mask/surgical, +/obj/item/clothing/glasses/hud/health{ + pixel_x = 7; + pixel_y = 4 + }, +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/item/reagent_containers/inhaler/pneumalin{ + pixel_x = 7; + pixel_y = -8 + }, +/obj/item/reagent_containers/inhaler/pneumalin{ + pixel_x = -6; + pixel_y = -4 + }, +/obj/effect/floor_decal/industrial/outline/medical, +/obj/structure/table/standard, +/obj/item/storage/firstaid/fire{ + pixel_x = 7; + pixel_y = 17 + }, +/obj/item/storage/firstaid/toxin{ + pixel_x = -8; + pixel_y = 17 + }, +/obj/machinery/firealarm/north, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/item/storage/firstaid/o2{ + pixel_x = -8; + pixel_y = 8 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/medical) "iHl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -60304,10 +60074,20 @@ /turf/simulated/floor/tiled/dark/full, /area/rnd/telesci) "iJq" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "4,20" +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, -/area/shuttle/intrepid/quarters) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/main_compartment) "iJr" = ( /obj/structure/bed/stool/chair/holochair{ dir = 1 @@ -60434,13 +60214,6 @@ /obj/effect/map_effect/window_spawner/full/reinforced/firedoor, /turf/simulated/floor/tiled/dark/full, /area/engineering/storage_eva) -"iKx" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "12,5"; - outside_part = 0 - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cockpit) "iKA" = ( /obj/effect/map_effect/window_spawner/full/reinforced/firedoor, /turf/simulated/floor/tiled/dark/full, @@ -60792,17 +60565,6 @@ }, /turf/simulated/floor/tiled, /area/horizon/security/brig) -"iLX" = ( -/obj/structure/shuttle_part/scc/research{ - density = 0; - icon_state = "0,21"; - outside_part = 0; - pixel_x = -32 - }, -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "1,21" - }, -/area/shuttle/intrepid/engine_compartment) "iMb" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/standard{ @@ -60849,22 +60611,6 @@ /obj/machinery/r_n_d/protolathe, /turf/simulated/floor/carpet/rubber, /area/rnd/lab) -"iMt" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "6,26"; - opacity = 1; - outside_part = 0 - }, -/obj/structure/shuttle_part/scc/scout{ - desc = "The hull and reinforcement of a Pathfinder class corporate expedition shuttle. The phoron-purple colored bands indicate this, in bold text as the SCCV Intrepid."; - icon = 'icons/obj/spaceship/scc/ship_engine.dmi'; - icon_state = "nozzle"; - name = "pathfinder class shuttle hull"; - opacity = 1; - outside_part = 0 - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) "iMA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -61092,9 +60838,6 @@ /turf/simulated/floor/tiled, /area/bridge/bridge_crew) "iOs" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -61154,26 +60897,6 @@ }, /turf/simulated/floor/plating, /area/merchant_station/warehouse) -"iOW" = ( -/obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_x = 4; - pixel_y = 2 - }, -/obj/item/pen{ - pixel_x = 4; - pixel_y = 2 - }, -/obj/item/flame/candle{ - pixel_x = -7; - pixel_y = 3 - }, -/obj/item/device/radio/intercom/expedition/north, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/shuttle/intrepid/quarters) "iOY" = ( /obj/structure/platform/ledge{ dir = 1 @@ -61362,25 +61085,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark/full, /area/engineering/atmos) -"iQn" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/corner/dark_blue/diagonal, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/structure/bed/handrail{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/quarters) "iQt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ @@ -61388,21 +61092,6 @@ }, /turf/simulated/floor/wood, /area/lawoffice/representative_two) -"iQu" = ( -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/effect/floor_decal/corner/black{ - dir = 9 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) "iQy" = ( /obj/effect/floor_decal/corner/brown{ dir = 6 @@ -61457,14 +61146,14 @@ /turf/simulated/floor/tiled, /area/operations/storage) "iQL" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "10,2" +/obj/effect/floor_decal/industrial/outline/security, +/obj/machinery/computer/shuttle_control/explore/terminal/intrepid{ + dir = 1 }, -/obj/structure/window/shuttle/unique/scc/research/over{ - density = 0; - icon_state = "3,0" +/obj/machinery/camera/network/intrepid{ + dir = 8 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/intrepid/cockpit) "iQM" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ @@ -61683,18 +61372,13 @@ }, /turf/simulated/floor/tiled, /area/engineering/locker_room) -"iSn" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "5,26"; - opacity = 1; - outside_part = 0 - }, +"iSl" = ( /obj/machinery/atmospherics/unary/engine/scc_shuttle, /obj/effect/landmark/entry_point/aft{ - name = "aft, starboard engines" + name = "aft, port thrusters" }, /turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) +/area/shuttle/intrepid/port_storage) "iSo" = ( /obj/structure/shuttle/engine/heater, /turf/simulated/floor/plating, @@ -62494,6 +62178,19 @@ }, /turf/simulated/floor/tiled/full, /area/engineering/storage_hard) +"iYp" = ( +/obj/effect/floor_decal/industrial/hatch_door/red, +/obj/machinery/door/airlock/external{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/effect/map_effect/marker/airlock{ + master_tag = "sccv_intrepid_starboard"; + name = "sccv_intrepid_starboard" + }, +/obj/effect/map_effect/marker_helper/airlock/interior, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/main_compartment) "iYt" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -62567,9 +62264,6 @@ /turf/simulated/floor/plating, /area/maintenance/research_port) "iYT" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/structure/railing/mapped, /turf/simulated/floor/tiled/dark, /area/hangar/intrepid) @@ -63031,10 +62725,11 @@ }, /area/centcom/holding) "jbR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/structure/lattice/catwalk/indoor, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 8 + }, +/turf/simulated/wall/shuttle/scc, +/area/shuttle/intrepid/port_storage) "jbS" = ( /obj/effect/shuttle_landmark/horizon/exterior/deck_1/starboard, /turf/template_noop, @@ -63077,22 +62772,12 @@ /turf/simulated/floor/tiled, /area/horizon/commissary) "jcd" = ( +/obj/effect/floor_decal/corner/dark_green/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 + dir = 8 }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/closet/emcloset, -/obj/effect/floor_decal/industrial/outline/operations, -/obj/machinery/alarm/north{ - req_one_access = list(24,11,47,65) - }, -/turf/simulated/floor/carpet/rubber, -/area/shuttle/intrepid/crew_compartment) +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/main_compartment) "jch" = ( /obj/structure/grille, /obj/machinery/door/firedoor, @@ -63182,19 +62867,21 @@ /turf/simulated/floor/tiled, /area/operations/lobby) "jcD" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/machinery/suit_storage_unit/standard_unit, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/corner/brown/diagonal, +/obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/cargo_bay) +/area/shuttle/intrepid/main_compartment) "jcP" = ( /obj/effect/floor_decal/industrial/warning/cee{ dir = 4 @@ -63225,10 +62912,19 @@ /turf/simulated/floor/plating, /area/operations/lower/machinist) "jcV" = ( -/obj/effect/floor_decal/spline/plain, -/obj/item/device/radio/intercom/expedition/south, -/turf/simulated/floor/lino/diamond, -/area/shuttle/intrepid/quarters) +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/machinery/vending/wallmed1{ + pixel_x = 4; + pixel_y = 31; + req_access = null + }, +/obj/item/device/gps/stationary/sccv_intrepid{ + pixel_x = -10; + pixel_y = 25 + }, +/obj/structure/bed/handrail, +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/medical) "jcZ" = ( /obj/effect/floor_decal/corner/dark_green/full{ dir = 1 @@ -63416,10 +63112,11 @@ /turf/unsimulated/floor/plating, /area/centcom/distress_prep) "jew" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "5,5" +/obj/machinery/iff_beacon/horizon/shuttle{ + pixel_y = -21 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/reinforced, /area/shuttle/intrepid/cockpit) "jeD" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -63641,12 +63338,6 @@ }, /turf/simulated/floor/tiled/dark/full, /area/horizon/security/investigations_hallway) -"jgf" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/hangar/intrepid) "jgk" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -64015,17 +63706,14 @@ /turf/space/dynamic, /area/template_noop) "jjk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 5 +/obj/effect/floor_decal/corner/brown/full{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/spline/plain{ + dir = 4 }, -/obj/effect/floor_decal/corner/dark_blue/diagonal, /turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/quarters) +/area/shuttle/intrepid/main_compartment) "jjn" = ( /obj/structure/shuttle_part/ccia{ icon_state = "3,4" @@ -64180,10 +63868,11 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "jkq" = ( -/obj/structure/lattice/catwalk/indoor, -/obj/structure/closet/firecloset/full, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 10 + }, +/turf/simulated/wall/shuttle/scc, +/area/shuttle/intrepid/engineering) "jks" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -64578,18 +64267,21 @@ /turf/simulated/floor/tiled/full, /area/horizon/secure_ammunition_storage) "jns" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/structure/cable/green{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "1-8" }, -/obj/effect/floor_decal/corner/dark_blue/diagonal, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/quarters) +/turf/simulated/floor/carpet/rubber, +/area/shuttle/intrepid/main_compartment) "jny" = ( /obj/effect/floor_decal/corner{ dir = 4 @@ -64858,12 +64550,6 @@ /obj/structure/sign/staff_only, /turf/unsimulated/wall/darkshuttlewall, /area/centcom/control) -"jpl" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "5,4" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cockpit) "jpq" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -65111,26 +64797,14 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/bar) "jry" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,73) + }, +/obj/effect/floor_decal/industrial/hatch_door/yellow{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/bed/stool/chair/shuttle{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/obj/structure/railing/mapped{ - dir = 4 - }, -/turf/simulated/floor/lino/diamond, -/area/shuttle/intrepid/quarters) +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/main_compartment) "jrA" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -65458,11 +65132,6 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/break_room) -"jtK" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "7,20" - }, -/area/shuttle/intrepid/cargo_bay) "jtX" = ( /obj/machinery/door/airlock/centcom{ name = "Checkpoint"; @@ -65542,14 +65211,6 @@ }, /turf/simulated/floor/tiled/white, /area/horizon/cafeteria) -"juw" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 10 - }, -/obj/structure/railing/mapped, -/obj/item/device/radio/intercom/expedition/south, -/turf/simulated/floor/lino, -/area/shuttle/intrepid/quarters) "juy" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/floor_decal/corner/green/full{ @@ -66058,10 +65719,15 @@ /turf/simulated/wall/r_wall, /area/rnd/xenobiology/xenoflora) "jxU" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "13,8" +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/area/shuttle/intrepid/quarters) +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/medical) "jxW" = ( /turf/simulated/wall/r_wall, /area/engineering/aft_airlock) @@ -66099,24 +65765,6 @@ }, /turf/simulated/floor/carpet, /area/horizon/security/head_of_security) -"jyn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/effect/floor_decal/corner/blue{ - dir = 10 - }, -/obj/structure/bed/stool/chair/shuttle{ - dir = 4 - }, -/turf/simulated/floor/carpet/rubber, -/area/shuttle/intrepid/crew_compartment) "jyv" = ( /obj/effect/floor_decal/corner/red{ dir = 6 @@ -66428,11 +66076,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/research_port) -"jAw" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "4,20" - }, -/area/shuttle/intrepid/atmos_compartment) "jAy" = ( /obj/structure/shuttle_part/scc/scout{ icon_state = "1,4" @@ -67334,26 +66977,15 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "jHp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 9 +/obj/structure/bed/stool/chair/shuttle, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/fuel_port/phoron/scc{ + pixel_y = 27 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/corner/dark_blue{ - dir = 6 - }, -/obj/structure/bed/handrail{ - dir = 8 - }, -/obj/structure/table/rack, -/obj/item/hoist_kit, -/obj/item/device/multitool, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/cargo_bay) +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/main_compartment) "jHt" = ( /obj/structure/table/reinforced/steel, /obj/effect/floor_decal/corner/brown{ @@ -67428,12 +67060,26 @@ /turf/unsimulated/floor, /area/centcom/legion/hangar5) "jIj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/universal, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/corner/brown{ + dir = 6 }, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cargo_bay) +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/main_compartment) "jIp" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -67755,19 +67401,6 @@ }, /turf/simulated/floor/tiled/dark/full, /area/rnd/xenobiology) -"jKC" = ( -/obj/structure/extinguisher_cabinet/east, -/obj/structure/closet/walllocker/emerglocker/south, -/obj/structure/bed/stool/chair/shuttle{ - can_dismantle = 1; - dir = 8; - name = "worn chair" - }, -/obj/effect/floor_decal/spline/plain{ - dir = 6 - }, -/turf/simulated/floor/lino, -/area/shuttle/intrepid/quarters) "jKE" = ( /obj/structure/disposalpipe/segment{ icon_state = "pipe-c" @@ -68867,10 +68500,17 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/security/investigators_office) "jUm" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "3,13" +/obj/effect/map_effect/window_spawner/full/shuttle/scc{ + spawn_firedoor = 1; + spawn_grille = 1 }, -/area/shuttle/intrepid/quarters) +/obj/machinery/door/blast/shutters/open{ + dir = 8; + id = "intrepid_bay_windows"; + name = "Intrepid Shutter" + }, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/main_compartment) "jUr" = ( /obj/effect/map_effect/window_spawner/full/borosilicate/reinforced, /obj/machinery/door/blast/regular/open{ @@ -69072,22 +68712,12 @@ /turf/space/dynamic, /area/engineering/atmos/propulsion) "jVL" = ( -/obj/structure/shuttle_part/scc/research{ - density = 0; - icon_state = "4,11"; - outside_part = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/bed/handrail{ dir = 4 }, -/obj/machinery/computer/ship/navigation{ - dir = 4 - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 10 - }, -/turf/simulated/floor/wood, -/area/shuttle/intrepid/quarters) +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/main_compartment) "jVR" = ( /obj/effect/floor_decal/corner/dark_green{ dir = 9 @@ -69378,12 +69008,12 @@ /turf/simulated/floor/lino, /area/horizon/cafeteria) "jXW" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red{ - dir = 8 +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 }, -/obj/machinery/door/airlock/external{ - dir = 1; - icon_state = "door_locked" +/obj/machinery/door/airlock/external, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 }, /obj/effect/map_effect/marker/airlock/shuttle{ cycle_to_external_air = 1; @@ -69393,8 +69023,8 @@ shuttle_tag = "Intrepid" }, /obj/effect/map_effect/marker_helper/airlock/exterior, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cargo_bay) +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/main_compartment) "jYe" = ( /obj/effect/floor_decal/corner/grey/diagonal, /turf/simulated/floor/marble, @@ -69832,12 +69462,6 @@ }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) -"kaM" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "9,0" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cockpit) "kaN" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "Combustion Turbine Grid Bypass" @@ -70197,12 +69821,24 @@ /turf/simulated/floor/tiled/white, /area/rnd/lab) "kcW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1 +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/atmos_compartment) +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/shuttle/intrepid/engineering) "kdb" = ( /obj/effect/floor_decal/corner/red{ dir = 9 @@ -70481,11 +70117,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/central_one) -"ker" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "16,19" - }, -/area/shuttle/intrepid/cargo_bay) "keI" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -70574,12 +70205,6 @@ }, /turf/simulated/floor/carpet, /area/bridge/cciaroom) -"kfv" = ( -/obj/structure/window/shuttle/unique/scc/tall{ - icon_state = "short1_top" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/quarters) "kfw" = ( /obj/effect/floor_decal/spline/plain, /turf/unsimulated/floor, @@ -71257,11 +70882,6 @@ /obj/structure/bed/handrail{ dir = 4 }, -/obj/machinery/camera/network/intrepid{ - c_tag = "Intrepid - Airlock Aft"; - dir = 4 - }, -/obj/structure/lattice/catwalk/indoor, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 1 }, @@ -71273,8 +70893,9 @@ shuttle_tag = "Intrepid" }, /obj/effect/map_effect/marker_helper/airlock/out, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, -/area/shuttle/intrepid/cargo_bay) +/area/shuttle/intrepid/main_compartment) "kko" = ( /obj/effect/floor_decal/corner/grey{ dir = 10 @@ -71525,17 +71146,6 @@ /obj/random/weapon_and_ammo, /turf/simulated/floor/plating, /area/shuttle/skipjack) -"kmo" = ( -/obj/structure/shuttle_part/scc/research{ - density = 0; - icon_state = "18,21"; - outside_part = 0; - pixel_x = 32 - }, -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "17,21" - }, -/area/shuttle/intrepid/engine_compartment) "kms" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 @@ -71766,35 +71376,9 @@ /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) "kol" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/closet/cabinet, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/obj/structure/coatrack{ - pixel_x = -14 - }, -/obj/machinery/power/apc/intrepid/north, -/obj/item/storage/box/snack{ - pixel_x = 1; - pixel_y = -3 - }, -/obj/item/clothing/suit/storage/hooded/wintercoat/scc, -/obj/item/tank/emergency_oxygen{ - pixel_x = -3 - }, -/obj/item/tank/emergency_oxygen{ - pixel_x = 5; - pixel_y = -2 - }, -/obj/item/clothing/mask/breath, -/obj/item/tent/big/scc, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 5 - }, -/turf/simulated/floor/wood, -/area/shuttle/intrepid/quarters) +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/main_compartment) "kop" = ( /obj/effect/floor_decal/corner/white/diagonal, /obj/effect/floor_decal/industrial/outline/grey, @@ -71904,12 +71488,13 @@ /turf/simulated/floor/tiled/full, /area/medical/washroom) "koV" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/atmospherics/portables_connector{ - dir = 1 +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/light/small{ + dir = 8 }, -/turf/simulated/floor/reinforced, -/area/shuttle/intrepid/quarters) +/obj/machinery/firealarm/north, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/cargo_bay) "koW" = ( /obj/structure/bed/stool/chair/office/bridge, /turf/simulated/floor/tiled/dark, @@ -72053,6 +71638,17 @@ }, /turf/simulated/floor, /area/maintenance/security_port) +"kqv" = ( +/obj/effect/map_effect/window_spawner/full/shuttle/scc{ + spawn_firedoor = 1; + spawn_grille = 1 + }, +/obj/machinery/door/blast/shutters/open{ + id = "intrepid_bay_windows"; + name = "Intrepid Shutter" + }, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/cockpit) "kqw" = ( /obj/effect/landmark/entry_point/fore{ name = "fore, port ballast" @@ -72109,9 +71705,6 @@ /turf/simulated/floor/tiled, /area/horizon/security/brig) "kqT" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/structure/cable/green{ icon_state = "1-8" }, @@ -72206,20 +71799,20 @@ /turf/simulated/floor/wood, /area/horizon/security/head_of_security) "krx" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/structure/closet/crate, -/obj/item/clothing/suit/space/emergency, -/obj/item/tank/air, -/obj/item/clothing/head/helmet/space/emergency, -/obj/item/storage/toolbox/emergency, -/obj/item/clothing/suit/space/emergency, -/obj/item/tank/air, -/obj/item/clothing/head/helmet/space/emergency, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/quarters) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/carpet/rubber, +/area/shuttle/intrepid/main_compartment) "krG" = ( /obj/structure/shuttle_part/scc/scout{ density = 0; @@ -72391,16 +71984,11 @@ /turf/simulated/floor/holofloor/tiled, /area/horizon/holodeck/source_emptycourt) "ksN" = ( -/obj/structure/shuttle_part/scc/research{ - density = 0; - icon_state = "2,25"; - outside_part = 0; - pixel_x = -32 +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 }, -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "3,25" - }, -/area/shuttle/intrepid/engine_compartment) +/turf/simulated/wall/shuttle/scc, +/area/shuttle/intrepid/engineering) "ksQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -73057,28 +72645,6 @@ }, /turf/simulated/floor/marble/dark, /area/horizon/holodeck/source_trinary) -"kxk" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume, -/obj/structure/lattice/catwalk/indoor/grate, -/obj/structure/bed/handrail{ - dir = 8 - }, -/obj/machinery/door/blast/shutters/open{ - dir = 2; - id = "intrepid_bay_outer"; - name = "Intrepid Shutter" - }, -/obj/item/device/radio/intercom/expedition/east, -/obj/effect/map_effect/marker/airlock/shuttle{ - cycle_to_external_air = 1; - master_tag = "airlock_shuttle_intrepid"; - name = "airlock_shuttle_intrepid"; - req_one_access = null; - shuttle_tag = "Intrepid" - }, -/obj/effect/map_effect/marker_helper/airlock/exterior, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cargo_bay) "kxr" = ( /obj/effect/floor_decal/corner_wide/yellow/diagonal, /obj/structure/table/steel, @@ -73258,17 +72824,11 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/port) "kyK" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "9,2"; - outside_part = 0 +/obj/machinery/computer/ship/helm/terminal{ + dir = 1 }, -/obj/structure/window/shuttle/unique/scc/research/over{ - icon_state = "2,0" - }, -/obj/machinery/door/firedoor{ - req_one_access = list(24,11,67,73) - }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline/security, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/intrepid/cockpit) "kyV" = ( /obj/structure/lattice/catwalk, @@ -73710,11 +73270,18 @@ /turf/simulated/floor/tiled/white, /area/medical/gen_treatment) "kCb" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 6 +/obj/effect/floor_decal/corner/brown{ + dir = 10 }, -/turf/simulated/floor/lino, -/area/shuttle/intrepid/quarters) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/main_compartment) "kCf" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -73808,19 +73375,6 @@ /obj/machinery/light, /turf/simulated/floor/carpet, /area/crew_quarters/heads/chief) -"kCU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/machinery/sleeper, -/obj/machinery/vending/wallmed1{ - pixel_x = -4; - pixel_y = 26; - req_access = null - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/intrepid/crew_compartment) "kCV" = ( /obj/effect/floor_decal/corner/yellow{ dir = 10 @@ -74142,9 +73696,6 @@ /turf/unsimulated/floor/plating, /area/tdome/tdomeobserve) "kEW" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/dark_green{ @@ -74468,20 +74019,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/rnd/lab) -"kHF" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "7,6"; - outside_part = 0 - }, -/obj/structure/window/shuttle/unique/scc/research/over{ - icon_state = "0,4" - }, -/obj/machinery/door/firedoor{ - req_one_access = list(24,11,67,73); - dir = 4 - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cockpit) "kHJ" = ( /obj/structure/bed/stool/chair/office/dark, /turf/simulated/floor/carpet/rubber, @@ -75148,12 +74685,6 @@ /obj/effect/map_effect/marker_helper/airlock/exterior, /turf/simulated/floor/plating, /area/engineering/atmos/propulsion) -"kMG" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/turf/simulated/wall/shuttle/scc_space_ship/cardinal, -/area/hangar/intrepid) "kMK" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 @@ -75381,17 +74912,18 @@ /turf/simulated/floor/tiled, /area/bridge/controlroom) "kOR" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/fuel, -/obj/machinery/meter{ - name = "Fuel Reserve"; - pixel_x = 7; - pixel_y = 10 +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 1 }, -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/shuttle/intrepid/engineering) "kPy" = ( /obj/effect/shuttle_landmark/horizon/exterior/deck_2/starboard_aft, /turf/template_noop, @@ -75770,11 +75302,6 @@ }, /turf/simulated/floor/tiled/dark, /area/hangar/intrepid) -"kSs" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "4,10" - }, -/area/shuttle/intrepid/quarters) "kSw" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -75860,10 +75387,16 @@ /turf/simulated/floor/exoplanet/grass, /area/centcom/shared_dream) "kTh" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "12,7" +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/machinery/iv_drip, +/obj/machinery/light/small, +/obj/item/tank/oxygen, +/obj/item/clothing/mask/breath/medical, +/obj/machinery/light/small{ + dir = 8 }, -/area/shuttle/intrepid/cockpit) +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/medical) "kTi" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 4 @@ -76313,11 +75846,6 @@ }, /turf/simulated/floor/tiled/dark, /area/maintenance/wing/port/far) -"kVX" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "7,17" - }, -/area/shuttle/intrepid/atmos_compartment) "kWc" = ( /turf/simulated/floor/tiled/dark, /area/maintenance/wing/port/far) @@ -76841,13 +76369,6 @@ }, /turf/simulated/floor/plating, /area/shuttle/canary) -"lbc" = ( -/obj/structure/shuttle_part/scc/research{ - density = 0; - icon_state = "8,0" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cockpit) "lbm" = ( /turf/unsimulated/wall/fakeairlock{ icon = 'icons/obj/doors/Doorext.dmi'; @@ -76856,10 +76377,12 @@ }, /area/centcom/ferry) "lbo" = ( -/obj/structure/window/reinforced, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/cargo_bay) +/obj/structure/bed/stool/chair/shuttle{ + dir = 1 + }, +/obj/item/device/radio/intercom/expedition/south, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/main_compartment) "lbr" = ( /obj/effect/floor_decal/corner_wide/purple{ dir = 10 @@ -77576,21 +77099,10 @@ /turf/simulated/floor/tiled/dark, /area/engineering/aft_airlock) "lgN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/effect/floor_decal/corner/lime/diagonal, -/turf/simulated/floor/tiled/white, -/area/shuttle/intrepid/crew_compartment) +/obj/structure/bed/stool/chair/shuttle, +/obj/item/device/radio/intercom/expedition/north, +/turf/simulated/floor/lino/diamond, +/area/shuttle/intrepid/main_compartment) "lgP" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 6 @@ -77743,12 +77255,6 @@ temperature = 278 }, /area/medical/surgery) -"lit" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "3,10" - }, -/area/shuttle/intrepid/quarters) "lix" = ( /obj/effect/floor_decal/corner_wide/lime{ dir = 9 @@ -78126,12 +77632,6 @@ /obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/tiled/dark/full, /area/engineering/engine_room/rust) -"lkH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "8,13" - }, -/area/shuttle/intrepid/quarters) "lkK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -78826,10 +78326,31 @@ /turf/unsimulated/floor, /area/centcom/bar) "lqO" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "7,19" +/obj/machinery/door/airlock/glass_engineering{ + dir = 8; + name = "Engineering Compartment" }, -/area/shuttle/intrepid/atmos_compartment) +/obj/effect/floor_decal/industrial/hatch_door/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/engineering) "lqX" = ( /obj/structure/cable{ icon_state = "4-8" @@ -79399,10 +78920,9 @@ }, /area/antag/raider) "luZ" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "4,24" - }, -/area/shuttle/intrepid/engine_compartment) +/obj/machinery/atmospherics/pipe/tank/carbon_dioxide/scc_shuttle, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/engineering) "lvc" = ( /obj/machinery/door/window/brigdoor/southleft{ name = "AI Core Access"; @@ -79519,22 +79039,6 @@ }, /turf/simulated/floor/tiled, /area/operations/lobby) -"lvI" = ( -/obj/item/bodybag/cryobag, -/obj/item/bodybag/cryobag, -/obj/item/clothing/mask/surgical, -/obj/item/clothing/mask/surgical, -/obj/item/clothing/glasses/hud/health, -/obj/item/storage/firstaid/o2, -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/item/reagent_containers/inhaler/pneumalin, -/obj/item/reagent_containers/inhaler/pneumalin, -/obj/effect/floor_decal/industrial/outline/medical, -/obj/structure/table/standard, -/obj/item/storage/firstaid/fire, -/obj/item/storage/firstaid/toxin, -/turf/simulated/floor/tiled/white, -/area/shuttle/intrepid/crew_compartment) "lvM" = ( /obj/structure/bed/stool/chair/office/bridge{ dir = 1 @@ -79885,30 +79389,19 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/wing/port/far) -"lyH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "3,10" - }, -/area/shuttle/intrepid/quarters) "lyN" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/firealarm/east, +/obj/structure/bed/handrail{ + dir = 8 }, -/obj/machinery/power/smes/buildable/horizon_shuttle{ - RCon_tag = "Intrepid" +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/item/device/radio/intercom/expedition/east{ - pixel_y = 21 - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/engineering) "lyO" = ( /obj/structure/bed/stool/chair/sofa/corner/concave/brown{ dir = 4 @@ -80223,6 +79716,23 @@ icon_state = "wood" }, /area/centcom/specops) +"lBC" = ( +/obj/effect/floor_decal/industrial/hatch_door/red, +/obj/machinery/door/airlock/external{ + dir = 8 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "sccv_intrepid_starboard"; + name = "sccv_intrepid_starboard" + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/machinery/door/blast/shutters/open{ + dir = 8; + id = "intrepid_bay_outer"; + name = "Intrepid Shutter" + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/main_compartment) "lBE" = ( /obj/structure/closet/radiation, /obj/effect/floor_decal/industrial/outline/yellow, @@ -80901,8 +80411,7 @@ /area/horizon/holodeck/source_lasertag) "lFG" = ( /obj/machinery/light/small{ - dir = 4; - must_start_working = 1 + dir = 4 }, /obj/effect/floor_decal/corner/dark_blue{ dir = 4 @@ -81328,19 +80837,39 @@ /turf/simulated/floor/wood, /area/bridge/meeting_room) "lIM" = ( -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/door/blast/shutters/open{ - dir = 4; - id = "intrepid_outer"; - name = "Intrepid Shutter" +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/structure/table/standard, +/obj/item/roller{ + pixel_x = -8 }, -/obj/structure/lattice/catwalk/indoor, -/obj/structure/bed/handrail{ - dir = 4 +/obj/item/roller{ + pixel_x = -8 }, -/obj/item/hullbeacon/red, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/crew_compartment) +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -7; + pixel_y = 15 + }, +/obj/item/reagent_containers/glass/bottle/inaprovaline{ + pixel_x = 4; + pixel_y = 11 + }, +/obj/machinery/power/apc/east{ + req_access = null; + req_one_access = list(11, 24, 47, 65) + }, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/item/storage/box/bodybags{ + pixel_x = 5; + pixel_y = 7 + }, +/obj/item/storage/box/gloves{ + pixel_x = 5; + pixel_y = -1 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/medical) "lIP" = ( /obj/item/storage/bag/inflatable{ pixel_y = 2 @@ -81621,9 +81150,6 @@ /turf/simulated/floor/plating, /area/maintenance/research_port) "lKY" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/dark_green{ @@ -82882,21 +82408,6 @@ }, /turf/simulated/floor/plating, /area/rnd/xenoarch_atrium) -"lTZ" = ( -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/effect/floor_decal/corner/black{ - dir = 9 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) "lUc" = ( /obj/machinery/door/airlock/hatch{ dir = 1; @@ -83259,10 +82770,15 @@ /turf/simulated/floor/plating, /area/horizon/hallway/deck_three/primary/starboard/docks) "lWy" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "4,22" +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 }, -/area/shuttle/intrepid/engine_compartment) +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/engineering) "lWz" = ( /obj/machinery/light{ dir = 8 @@ -83323,17 +82839,6 @@ icon_state = "dark_preview" }, /area/centcom/holding) -"lWV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 9 - }, -/obj/structure/lattice/catwalk/indoor, -/obj/machinery/light/small/red{ - dir = 4 - }, -/obj/structure/reagent_dispensers/watertank, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) "lXa" = ( /obj/structure/cable, /obj/machinery/power/terminal{ @@ -83555,6 +83060,18 @@ color = "#8f5847" }, /area/centcom/bar) +"lZI" = ( +/obj/effect/map_effect/window_spawner/full/shuttle/scc{ + spawn_firedoor = 1; + spawn_grille = 1 + }, +/obj/machinery/door/blast/shutters/open{ + dir = 8; + id = "intrepid_bay_windows"; + name = "Intrepid Shutter" + }, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/cockpit) "lZJ" = ( /obj/structure/lattice, /obj/structure/cable/green{ @@ -83939,15 +83456,18 @@ /turf/simulated/floor/plating, /area/maintenance/engineering_ladder) "mbZ" = ( -/obj/machinery/atmospherics/portables_connector{ +/obj/effect/floor_decal/corner/brown{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/portable_atmospherics/canister/empty, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/floor_decal/industrial/warning/corner, -/obj/structure/closet/walllocker/emerglocker/west, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cargo_bay) +/obj/machinery/firealarm/west, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/main_compartment) "mch" = ( /obj/effect/floor_decal/corner/dark_green{ dir = 8 @@ -85155,14 +84675,6 @@ /obj/structure/table/standard, /turf/simulated/floor/carpet/rubber, /area/tcommsat/entrance) -"mlL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/structure/bed/roller, -/turf/simulated/floor/tiled/white, -/area/shuttle/intrepid/crew_compartment) "mlR" = ( /obj/structure/window/shuttle/scc_space_ship, /obj/structure/grille, @@ -85626,32 +85138,6 @@ }, /turf/simulated/floor/wood, /area/chapel/office) -"moH" = ( -/obj/effect/floor_decal/corner/yellow{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 - }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/obj/structure/closet/firecloset/full, -/obj/effect/floor_decal/industrial/outline/firefighting_closet, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/power/apc/intrepid/north, -/obj/machinery/vending/wallmed1{ - pixel_x = -23; - req_access = null - }, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/atmos_compartment) "moI" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -86592,11 +86078,6 @@ /obj/effect/map_effect/marker_helper/airlock/exterior, /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) -"mvO" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "7,20" - }, -/area/shuttle/intrepid/atmos_compartment) "mvP" = ( /obj/effect/floor_decal/industrial/outline/security, /obj/structure/target_stake, @@ -86669,6 +86150,24 @@ }, /turf/unsimulated/floor/plating, /area/shuttle/legion) +"mwD" = ( +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/machinery/atmospherics/unary/vent_pump/high_volume, +/obj/machinery/door/blast/shutters/open{ + dir = 2; + id = "intrepid_bay_outer"; + name = "Intrepid Shutter" + }, +/obj/effect/map_effect/marker/airlock/shuttle{ + cycle_to_external_air = 1; + master_tag = "airlock_shuttle_intrepid"; + name = "airlock_shuttle_intrepid"; + req_one_access = null; + shuttle_tag = "Intrepid" + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/main_compartment) "mwO" = ( /turf/simulated/floor/plating, /area/hangar/operations) @@ -86690,23 +86189,15 @@ /turf/simulated/floor/tiled/dark, /area/horizon/longbow) "mwR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 5 +/obj/effect/floor_decal/corner/purple/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 8 }, -/obj/machinery/door/airlock/external{ - dir = 1; - icon_state = "door_locked" +/obj/machinery/light/small{ + must_start_working = 1 }, -/obj/effect/map_effect/marker/airlock/shuttle{ - cycle_to_external_air = 1; - master_tag = "airlock_shuttle_intrepid"; - name = "airlock_shuttle_intrepid"; - req_one_access = null; - shuttle_tag = "Intrepid" - }, -/obj/effect/map_effect/marker_helper/airlock/interior, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cargo_bay) +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/main_compartment) "mwZ" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 10 @@ -87228,9 +86719,17 @@ /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "mAY" = ( -/obj/machinery/hologram/holopad/long_range, /obj/effect/floor_decal/corner/dark_blue/diagonal, -/obj/effect/overmap/visitable/ship/landable/intrepid, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/cockpit) "mBa" = ( @@ -87448,10 +86947,20 @@ }, /area/centcom/control) "mCJ" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "14,22" +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 }, -/area/shuttle/intrepid/engine_compartment) +/obj/structure/bed/handrail{ + dir = 1 + }, +/obj/machinery/camera/network/intrepid{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/port_storage) "mCP" = ( /obj/effect/floor_decal/corner/grey{ dir = 5 @@ -87734,24 +87243,16 @@ /turf/simulated/floor/tiled/dark, /area/engineering/engine_room/turbine) "mFo" = ( -/obj/machinery/door/firedoor{ - req_one_access = list(24,11,67,73) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/glass_command{ - dir = 1; - id_tag = "intrepid_cockpit"; - name = "Intrepid Cockpit"; - req_access = list(73) - }, +/obj/effect/floor_decal/industrial/warning, /obj/structure/cable/green{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cockpit) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/carpet/rubber, +/area/shuttle/intrepid/main_compartment) "mFv" = ( /obj/structure/holostool, /turf/simulated/floor/wood/maple, @@ -88159,12 +87660,15 @@ /turf/simulated/floor/tiled, /area/operations/office) "mIX" = ( -/obj/structure/shuttle_part/scc/research{ - density = 0; - icon_state = "14,7" +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/structure/bed/handrail{ + dir = 1 }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cockpit) +/obj/machinery/camera/network/intrepid{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/medical) "mJd" = ( /obj/structure/table/wood, /obj/item/flame/candle{ @@ -88328,12 +87832,20 @@ /turf/simulated/floor/holofloor/tiled/dark, /area/tdome/tdome1) "mLu" = ( -/obj/machinery/light/small{ - dir = 4 +/obj/effect/map_effect/window_spawner/full/shuttle/scc{ + spawn_firedoor = 1; + spawn_grille = 1 }, -/obj/effect/floor_decal/corner/dark_blue/diagonal, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/cargo_bay) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/blast/shutters/open{ + dir = 8; + id = "intrepid_bay_windows"; + name = "Intrepid Shutter" + }, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/main_compartment) "mLw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, /obj/structure/cable{ @@ -89147,6 +88659,12 @@ }, /turf/simulated/floor/wood, /area/operations/qm) +"mSD" = ( +/obj/effect/landmark/entry_point/port{ + name = "port, port nacelle" + }, +/turf/simulated/wall/shuttle/scc, +/area/shuttle/intrepid/port_storage) "mSE" = ( /obj/structure/table/rack, /obj/item/storage/toolbox/mechanical, @@ -90131,9 +89649,6 @@ /obj/effect/floor_decal/corner/black{ dir = 6 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light/spot{ dir = 8 @@ -90196,12 +89711,23 @@ /turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_three/primary/starboard) "nar" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/fuel, +/obj/machinery/door/airlock/hatch{ + name = "Port Nacelle" + }, +/obj/effect/floor_decal/industrial/hatch_door/yellow{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cargo_bay) +/area/shuttle/intrepid/port_storage) "nav" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -90462,11 +89988,6 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/xenoflora) -"ncq" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "2,16" - }, -/area/shuttle/intrepid/atmos_compartment) "ncs" = ( /obj/effect/floor_decal/corner/mauve/full{ dir = 4 @@ -90697,21 +90218,14 @@ /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/fitness/showers) "neC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/effect/floor_decal/corner/brown{ + dir = 6 }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/spline/plain{ +/obj/effect/floor_decal/spline/plain/purple{ dir = 4 }, -/turf/simulated/floor/carpet/rubber, -/area/shuttle/intrepid/crew_compartment) +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/main_compartment) "neF" = ( /obj/structure/table/reinforced/wood, /obj/effect/floor_decal/spline/fancy/wood{ @@ -91889,11 +91403,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/bluespace_drive) -"nmW" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "13,17" - }, -/area/shuttle/intrepid/cargo_bay) "nnb" = ( /obj/effect/landmark/entry_point/starboard{ name = "starboard, ballast aft" @@ -92472,12 +91981,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/hallway) -"nrz" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "17,20" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cargo_bay) "nrB" = ( /obj/effect/floor_decal/spline/plain{ dir = 10 @@ -92994,8 +92497,8 @@ /turf/simulated/floor/tiled/white, /area/rnd/chemistry) "nvn" = ( +/obj/structure/lattice/catwalk/indoor/grate/dark, /obj/machinery/atmospherics/unary/vent_pump/high_volume, -/obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/door/blast/shutters/open{ dir = 2; id = "intrepid_bay_outer"; @@ -93009,8 +92512,18 @@ shuttle_tag = "Intrepid" }, /obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/machinery/access_button{ + dir = 4; + pixel_x = -22; + pixel_y = -3 + }, +/obj/machinery/airlock_sensor/airlock_exterior{ + dir = 4; + pixel_x = -21; + pixel_y = 7 + }, /turf/simulated/floor/plating, -/area/shuttle/intrepid/cargo_bay) +/area/shuttle/intrepid/main_compartment) "nvs" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/structure/railing/mapped{ @@ -93164,6 +92677,16 @@ "nww" = ( /turf/simulated/floor/plating, /area/rnd/eva) +"nwy" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/bed/handrail{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/full, +/area/shuttle/intrepid/main_compartment) "nwz" = ( /obj/structure/table/glass{ table_reinf = "glass" @@ -93207,28 +92730,6 @@ /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/reinforced, /area/shuttle/hapt) -"nwF" = ( -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/structure/table/standard, -/obj/item/roller{ - pixel_x = -8 - }, -/obj/item/roller{ - pixel_x = -8 - }, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = 19 - }, -/obj/item/reagent_containers/glass/bottle/inaprovaline{ - pixel_x = 4; - pixel_y = 11 - }, -/obj/item/storage/box/gloves{ - pixel_x = 5; - pixel_y = -1 - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/intrepid/crew_compartment) "nwI" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -93274,12 +92775,8 @@ /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) "nxj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 9 - }, -/obj/machinery/door/airlock/external{ - dir = 1; - icon_state = "door_locked" +/obj/structure/bed/handrail{ + dir = 8 }, /obj/effect/map_effect/marker/airlock/shuttle{ cycle_to_external_air = 1; @@ -93288,9 +92785,13 @@ req_one_access = null; shuttle_tag = "Intrepid" }, -/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/machinery/atmospherics/unary/vent_pump/high_volume, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, -/area/shuttle/intrepid/cargo_bay) +/area/shuttle/intrepid/main_compartment) "nxl" = ( /obj/structure/sign/flag/nanotrasen{ pixel_y = 30 @@ -93376,6 +92877,28 @@ "nyp" = ( /turf/simulated/floor/grass, /area/horizon/hydroponics/lower) +"nyu" = ( +/obj/effect/floor_decal/industrial/hatch_door/red, +/obj/machinery/door/airlock/external{ + dir = 8 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "sccv_intrepid_starboard"; + name = "sccv_intrepid_starboard" + }, +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/machinery/access_button{ + pixel_y = -29; + pixel_x = -7; + dir = 8 + }, +/obj/machinery/door/blast/shutters/open{ + dir = 8; + id = "intrepid_bay_outer"; + name = "Intrepid Shutter" + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/main_compartment) "nyv" = ( /obj/structure/table/reinforced/steel, /obj/random/tech_supply, @@ -93401,17 +92924,6 @@ }, /turf/unsimulated/floor/plating, /area/shuttle/transport1) -"nyz" = ( -/obj/structure/shuttle_part/scc/research{ - density = 0; - icon_state = "1,13"; - outside_part = 0; - pixel_x = -32 - }, -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "2,13" - }, -/area/shuttle/intrepid/quarters) "nyB" = ( /obj/structure/table/steel, /turf/simulated/floor/carpet/art, @@ -93735,11 +93247,6 @@ color = "#8f5847" }, /area/antag/raider) -"nBh" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "11,23" - }, -/area/shuttle/intrepid/engine_compartment) "nBy" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 9 @@ -93833,17 +93340,16 @@ /turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "nBT" = ( -/obj/machinery/light_switch{ - dir = 1; - pixel_x = -2; - pixel_y = 26 +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/structure/bed/stool/chair/shuttle, -/obj/effect/floor_decal/spline/plain{ - dir = 5 - }, -/turf/simulated/floor/lino, -/area/shuttle/intrepid/quarters) +/turf/simulated/floor/plating, +/area/shuttle/intrepid/main_compartment) "nBU" = ( /obj/effect/step_trigger/thrower/shuttle/south, /turf/template_noop, @@ -93928,22 +93434,17 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/hangar/auxiliary) "nCH" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/door/firedoor{ - req_one_access = list(24,11,67,73) +/obj/effect/floor_decal/corner/brown{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/command{ - dir = 1; - name = "Fore Crew Compartment" +/obj/effect/floor_decal/spline/plain{ + dir = 4 }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/quarters) +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/main_compartment) "nCL" = ( /obj/effect/floor_decal/spline/plain/cee, /obj/effect/landmark/skrell_srom, @@ -93995,16 +93496,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/engineering) -"nDc" = ( -/obj/machinery/alarm/north{ - req_one_access = list(24,11,47,65) - }, -/obj/structure/bed/stool/chair/shuttle, -/obj/effect/floor_decal/spline/plain{ - dir = 5 - }, -/turf/simulated/floor/lino, -/area/shuttle/intrepid/quarters) "nDk" = ( /obj/effect/floor_decal/corner/brown{ dir = 5 @@ -94477,16 +93968,17 @@ /turf/simulated/floor/tiled/full, /area/horizon/security/brig) "nGF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/atmospherics/pipe/simple/hidden/green{ +/obj/effect/floor_decal/corner/brown{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/effect/floor_decal/industrial/warning, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cargo_bay) +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/main_compartment) "nGV" = ( /obj/item/storage/box/zipties{ pixel_x = 6; @@ -94910,11 +94402,6 @@ icon_state = "dark_preview" }, /area/centcom/specops) -"nJB" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "7,16" - }, -/area/shuttle/intrepid/atmos_compartment) "nJK" = ( /obj/structure/table/rack, /obj/item/clothing/shoes/magboots, @@ -95210,12 +94697,21 @@ /turf/simulated/floor/plating, /area/maintenance/engineering) "nME" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "3,23"; - opacity = 1 +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 + }, +/obj/machinery/meter{ + name = "Air Reserve" + }, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/bed/handrail{ + dir = 4 }, /turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) +/area/shuttle/intrepid/engineering) "nMG" = ( /obj/effect/floor_decal/corner_wide/paleblue{ dir = 5 @@ -95387,15 +94883,6 @@ }, /turf/simulated/floor/tiled/dark, /area/storage/eva) -"nOb" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "2,22"; - opacity = 1; - outside_part = 0 - }, -/obj/machinery/atmospherics/unary/engine/scc_shuttle, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) "nOh" = ( /obj/structure/railing/mapped{ dir = 4 @@ -95752,19 +95239,21 @@ /turf/simulated/floor/tiled/dark/full, /area/rnd/xenobiology) "nQH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux, -/obj/effect/floor_decal/industrial/warning{ +/obj/effect/floor_decal/industrial/hatch_door/red{ dir = 1 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/door/airlock/external, +/obj/effect/map_effect/marker/airlock/shuttle{ + cycle_to_external_air = 1; + master_tag = "airlock_shuttle_intrepid"; + name = "airlock_shuttle_intrepid"; + req_one_access = null; + shuttle_tag = "Intrepid" }, -/obj/structure/bed/handrail, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/machinery/atmospherics/pipe/manifold4w/hidden, /turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cargo_bay) +/area/shuttle/intrepid/main_compartment) "nQJ" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 10 @@ -95824,13 +95313,6 @@ /obj/structure/grille/diagonal, /turf/simulated/floor/tiled/dark, /area/shuttle/merchant) -"nQT" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "12,4"; - outside_part = 0 - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cockpit) "nQW" = ( /obj/effect/floor_decal/spline/plain{ dir = 6 @@ -97190,18 +96672,25 @@ /turf/simulated/floor/tiled, /area/horizon/crew_quarters/fitness/changing) "ocp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/glass_command{ + dir = 1; + id_tag = "intrepid_cockpit"; + name = "Intrepid Cockpit"; + req_access = list(73) }, /obj/structure/cable/green{ - icon_state = "1-4" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/effect/floor_decal/corner/dark_blue/diagonal, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/cockpit) +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/industrial/hatch_door/yellow{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/main_compartment) "oct" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -97358,20 +96847,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/captain) -"odb" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/obj/structure/bed/stool/chair/shuttle{ - can_dismantle = 1; - dir = 4; - name = "worn chair" - }, -/obj/structure/railing/mapped{ - dir = 8 - }, -/turf/simulated/floor/lino, -/area/shuttle/intrepid/quarters) "odc" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 10 @@ -97467,11 +96942,13 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "oea" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "13,7" +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/structure/bed/roller, +/obj/machinery/alarm/south{ + req_one_access = list(11, 24, 47, 65) }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cockpit) +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/medical) "oeb" = ( /turf/unsimulated/wall/darkshuttlewall, /area/centcom/bar) @@ -97526,13 +97003,6 @@ }, /turf/simulated/floor/wood, /area/rnd/conference) -"oeq" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "6,6"; - outside_part = 0 - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cockpit) "oew" = ( /obj/machinery/access_button{ command = "cycle_interior"; @@ -98014,12 +97484,12 @@ /obj/effect/floor_decal/corner/black{ dir = 9 }, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled/dark, /area/hangar/intrepid) "ohn" = ( @@ -98136,21 +97606,22 @@ /turf/unsimulated/floor/plating, /area/centcom/distress_prep) "ois" = ( -/obj/structure/window/shuttle/unique/scc/research/over{ - density = 0; - icon_state = "1,3" - }, -/obj/structure/bed/stool/chair/office/bridge{ +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/obj/structure/bed/handrail, +/obj/structure/bed/stool/chair/office/dark{ dir = 8 }, -/obj/machinery/computer/ship/sensors/cockpit{ - pixel_x = -22; - pixel_y = 7 +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 }, -/obj/effect/floor_decal/corner/dark_blue{ - dir = 6 +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/power/apc/north{ + req_access = null; + req_one_access = list(11, 73) }, -/obj/item/device/radio/intercom/expedition/south, /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/cockpit) "oiw" = ( @@ -98860,17 +98331,14 @@ }, /area/shuttle/legion) "onT" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ +/obj/effect/floor_decal/corner/brown/full{ dir = 1 }, -/obj/structure/cable/green{ - icon_state = "2-8" +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cargo_bay) +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/main_compartment) "onU" = ( /obj/machinery/atmospherics/pipe/zpipe/up/black, /obj/structure/lattice, @@ -99090,14 +98558,6 @@ name = "coast" }, /area/horizon/holodeck/source_konyang) -"oqj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 10 - }, -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "15,11" - }, -/area/shuttle/intrepid/quarters) "oqm" = ( /obj/machinery/door/blast/shutters{ dir = 8; @@ -99493,17 +98953,14 @@ /turf/simulated/floor/carpet, /area/lawoffice/consular_two) "otE" = ( -/obj/machinery/atmospherics/portables_connector/aux, -/obj/machinery/portable_atmospherics/canister/air/airlock, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/warning/corner, +/obj/machinery/floodlight, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, -/obj/machinery/firealarm/north, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/cargo_bay) +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/port_storage) "otK" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/portable_atmospherics/canister/oxygen, @@ -99972,12 +99429,6 @@ /obj/effect/map_effect/marker/mapmanip/submap/insert/sccv_horizon/ops_warehouse_small_storage, /turf/simulated/floor/tiled, /area/operations/storage) -"owM" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "11,2" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cockpit) "owP" = ( /obj/effect/floor_decal/industrial/outline/red, /obj/structure/disposalpipe/segment, @@ -99985,6 +99436,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/operations) +"owS" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/hangar/intrepid) "oxg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -100107,24 +99565,6 @@ }, /turf/simulated/floor/tiled/dark/full, /area/horizon/longbow) -"oxX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/effect/floor_decal/corner/yellow{ - dir = 6 - }, -/obj/effect/floor_decal/corner/blue{ - dir = 8 - }, -/turf/simulated/floor/carpet/rubber, -/area/shuttle/intrepid/crew_compartment) "oxZ" = ( /obj/structure/shuttle_part/mercenary/small{ icon_state = "5,1" @@ -100849,10 +100289,10 @@ /turf/unsimulated/floor/plating, /area/antag/raider) "oDE" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "6,16" - }, -/area/shuttle/intrepid/quarters) +/obj/structure/bed/stool/chair/shuttle, +/obj/effect/floor_decal/corner/lime/diagonal, +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/main_compartment) "oDL" = ( /turf/simulated/wall/shuttle/scc, /area/shuttle/quark/cargo_hold) @@ -101664,14 +101104,12 @@ /turf/simulated/floor/shuttle/dark_blue, /area/shuttle/escape_pod/pod1) "oKJ" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "8,2" +/obj/machinery/computer/ship/sensors/terminal{ + dir = 1 }, -/obj/structure/window/shuttle/unique/scc/research/over{ - density = 0; - icon_state = "1,0" - }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline/security, +/obj/item/device/radio/intercom/expedition/west, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/intrepid/cockpit) "oKK" = ( /obj/structure/cable{ @@ -101940,11 +101378,6 @@ }, /turf/simulated/floor/tiled/dark, /area/centcom/bar) -"oMU" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "7,18" - }, -/area/shuttle/intrepid/atmos_compartment) "oMX" = ( /obj/machinery/door/airlock/highsecurity{ dir = 4; @@ -102590,16 +102023,6 @@ name = "service airlock" }, /area/centcom/specops) -"oSi" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "9,1"; - outside_part = 0 - }, -/obj/effect/landmark/entry_point/fore{ - name = "fore, bridge" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cockpit) "oSk" = ( /obj/effect/decal/fake_object{ dir = 4; @@ -103240,13 +102663,6 @@ /obj/machinery/r_n_d/server/advanced/core, /turf/simulated/floor/bluegrid/server, /area/server) -"oXW" = ( -/obj/machinery/shipsensors/weak/scc_shuttle{ - pixel_y = -15 - }, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/reinforced, -/area/shuttle/intrepid/cockpit) "oYd" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -103764,12 +103180,11 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "pbX" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "6,4"; - outside_part = 0 +/obj/effect/landmark/entry_point/starboard{ + name = "starboard, atmospherics" }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cockpit) +/turf/simulated/wall/shuttle/scc, +/area/shuttle/intrepid/engineering) "pbY" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/visible/universal{ @@ -103895,29 +103310,12 @@ /turf/unsimulated/floor, /area/centcom/legion/hangar5) "pcQ" = ( -/obj/item/device/gps/stationary/sccv_intrepid{ - pixel_x = 3; - pixel_y = 24 - }, -/obj/effect/floor_decal/industrial/warning/corner{ +/obj/machinery/light/small{ dir = 1 }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/obj/machinery/camera/network/intrepid{ - c_tag = "Intrepid - Medbay" - }, -/obj/structure/bedsheetbin{ - pixel_y = 7 - }, -/obj/structure/table/standard, -/turf/simulated/floor/tiled/white, -/area/shuttle/intrepid/crew_compartment) +/obj/structure/bed/stool/chair/shuttle, +/turf/simulated/floor/lino/diamond, +/area/shuttle/intrepid/main_compartment) "pcX" = ( /obj/structure/window/shuttle/unique/mercenary/small{ icon_state = "2,13"; @@ -103946,19 +103344,6 @@ }, /turf/simulated/floor/tiled, /area/horizon/crew_quarters/fitness/changing) -"pdv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 - }, -/obj/machinery/atmospherics/binary/passive_gate/supply{ - dir = 4; - target_pressure = 250 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/carpet/rubber, -/area/shuttle/intrepid/crew_compartment) "pdA" = ( /obj/structure/railing/mapped, /obj/structure/filingcabinet/chestdrawer, @@ -104593,24 +103978,6 @@ }, /turf/simulated/floor/wood, /area/bridge/minibar) -"phg" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "8,3"; - outside_part = 0 - }, -/obj/structure/window/shuttle/unique/scc/research/over{ - icon_state = "1,1" - }, -/obj/effect/floor_decal/corner/dark_blue{ - dir = 4 - }, -/obj/machinery/door/firedoor{ - req_one_access = list(24,11,67,73); - dir = 4 - }, -/obj/structure/table/reinforced, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/cockpit) "phj" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, @@ -104787,14 +104154,32 @@ /turf/simulated/floor, /area/horizon/maintenance/deck_three/aft/starboard) "piD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 4 +/obj/structure/bed/stool/chair/shuttle, +/obj/effect/map_effect/marker/airlock/shuttle{ + cycle_to_external_air = 1; + master_tag = "airlock_shuttle_intrepid"; + name = "airlock_shuttle_intrepid"; + req_one_access = null; + shuttle_tag = "Intrepid" }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/access_button{ + pixel_x = -7; + pixel_y = 22 }, +/obj/machinery/airlock_sensor/airlock_interior{ + pixel_x = -8; + pixel_y = 28 + }, +/obj/machinery/button/remote/blast_door{ + dir = 1; + id = "intrepid_bay_outer"; + name = "Airlock Shutters"; + pixel_x = 6; + pixel_y = 25 + }, +/obj/effect/map_effect/marker_helper/airlock/interior, /turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cargo_bay) +/area/shuttle/intrepid/main_compartment) "piF" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -105369,19 +104754,6 @@ }, /turf/simulated/floor/plating, /area/engineering/atmos/air) -"pnm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/effect/floor_decal/corner/dark_blue/diagonal, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/quarters) "pnn" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/ladder/up{ @@ -105620,13 +104992,6 @@ /obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/dark/full, /area/chapel/office) -"poM" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "12,6"; - outside_part = 0 - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cockpit) "poO" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/effect/floor_decal/industrial/hatch/yellow, @@ -105645,18 +105010,14 @@ /turf/unsimulated/floor/plating, /area/centcom/spawning) "ppi" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 6 +/obj/effect/floor_decal/industrial/warning{ + dir = 9 }, -/obj/structure/bed/stool/chair/shuttle{ - dir = 8 - }, -/obj/structure/railing/mapped{ +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/structure/railing/mapped, -/turf/simulated/floor/lino/diamond, -/area/shuttle/intrepid/quarters) +/turf/simulated/floor/carpet/rubber, +/area/shuttle/intrepid/main_compartment) "ppl" = ( /obj/effect/step_trigger/thrower/shuttle/southeast, /turf/template_noop, @@ -105731,9 +105092,19 @@ /turf/simulated/floor/tiled/dark/full, /area/storage/eva) "ppH" = ( -/obj/effect/floor_decal/corner/dark_blue/diagonal, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/cargo_bay) +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/bed/handrail{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/main_compartment) "ppI" = ( /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor, @@ -105754,10 +105125,20 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "ppS" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "4,16" +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 4 }, -/area/shuttle/intrepid/atmos_compartment) +/obj/effect/map_effect/marker/airlock{ + master_tag = "sccv_intrepid_starboard"; + name = "sccv_intrepid_starboard" + }, +/obj/machinery/airlock_sensor{ + pixel_y = -24; + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/main_compartment) "ppU" = ( /obj/structure/ladder/up{ pixel_y = 13 @@ -105891,11 +105272,6 @@ /obj/effect/floor_decal/corner/dark_green/diagonal, /turf/simulated/floor/tiled, /area/hallway/primary/central_one) -"pru" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "2,17" - }, -/area/shuttle/intrepid/atmos_compartment) "prw" = ( /obj/effect/floor_decal/corner/dark_green{ dir = 6 @@ -107436,15 +106812,6 @@ }, /turf/simulated/floor/tiled/full, /area/operations/office_aux) -"pBV" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "16,22"; - opacity = 1; - outside_part = 0 - }, -/obj/machinery/atmospherics/unary/engine/scc_shuttle, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) "pCa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -107899,9 +107266,6 @@ /turf/simulated/floor/tiled/dark, /area/outpost/research/anomaly_storage) "pEi" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, /obj/structure/closet/emcloset, /obj/effect/floor_decal/industrial/outline/emergency_closet, /obj/effect/floor_decal/corner/dark_green/full{ @@ -108251,16 +107615,11 @@ /turf/simulated/floor/shuttle/black, /area/shuttle/mercenary) "pGP" = ( -/obj/structure/shuttle_part/scc/research{ - density = 0; - icon_state = "16,25"; - outside_part = 0; - pixel_x = 32 +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 }, -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "15,25" - }, -/area/shuttle/intrepid/engine_compartment) +/turf/simulated/wall/shuttle/scc, +/area/shuttle/intrepid/port_storage) "pGU" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 10 @@ -108461,22 +107820,6 @@ icon_state = "wood" }, /area/centcom/distress_prep) -"pIR" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "4,26"; - opacity = 1; - outside_part = 0 - }, -/obj/structure/shuttle_part/scc/scout{ - desc = "The hull and reinforcement of a Pathfinder class corporate expedition shuttle. The phoron-purple colored bands indicate this, in bold text as the SCCV Intrepid."; - icon = 'icons/obj/spaceship/scc/ship_engine.dmi'; - icon_state = "nozzle"; - name = "pathfinder class shuttle hull"; - opacity = 1; - outside_part = 0 - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) "pJc" = ( /obj/item/toy/stressball{ pixel_x = -8 @@ -108771,13 +108114,22 @@ /turf/simulated/floor/plating, /area/maintenance/wing/port/deck1) "pLV" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/fuel, -/obj/effect/floor_decal/industrial/outline/operations, -/obj/machinery/atmospherics/binary/pump{ - name = "Air Reserve to Airlock Cycling" +/obj/structure/bed/stool/chair/shuttle{ + dir = 1 }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/atmos_compartment) +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/south{ + req_access = null; + req_one_access = list(11, 24, 47, 65) + }, +/obj/structure/cable/green, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/full, +/area/shuttle/intrepid/engineering) "pMd" = ( /obj/structure/table/standard, /obj/item/autopsy_scanner{ @@ -108873,28 +108225,7 @@ }, /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics) -"pMz" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/door/firedoor{ - req_one_access = list(24,11,67,73) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/glass_command{ - dir = 1; - name = "Intrepid Cargo Bay" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cargo_bay) "pMA" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/effect/floor_decal/corner/dark_green{ dir = 6 }, @@ -109822,21 +109153,6 @@ /obj/effect/floor_decal/corner/full, /turf/simulated/floor/marble/dark, /area/horizon/holodeck/source_trinary) -"pTd" = ( -/obj/structure/shuttle_part/scc/research{ - density = 0; - icon_state = "9,3"; - outside_part = 0 - }, -/obj/structure/window/shuttle/unique/scc/research/over{ - density = 0 - }, -/obj/machinery/computer/ship/helm/cockpit, -/obj/effect/floor_decal/corner/dark_blue{ - dir = 5 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/cockpit) "pTf" = ( /obj/machinery/computer/ship/navigation{ dir = 8 @@ -109859,8 +109175,6 @@ /turf/simulated/floor/reinforced/phoron, /area/engineering/atmos) "pTp" = ( -/obj/structure/lattice/catwalk/indoor, -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, /obj/effect/map_effect/marker/airlock/shuttle{ cycle_to_external_air = 1; master_tag = "airlock_shuttle_intrepid"; @@ -109868,8 +109182,10 @@ req_one_access = null; shuttle_tag = "Intrepid" }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, -/area/shuttle/intrepid/cargo_bay) +/area/shuttle/intrepid/main_compartment) "pTq" = ( /turf/simulated/wall/shuttle/unique/tcfl{ icon_state = "3,2" @@ -110235,12 +109551,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor, /area/bridge/upperdeck) -"pVK" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "16,12" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/quarters) "pVS" = ( /obj/structure/table/reinforced/steel, /obj/item/airbubble/syndie{ @@ -111817,12 +111127,6 @@ }, /turf/simulated/floor/plating, /area/shuttle/mining) -"qhL" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "16,10" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/quarters) "qhN" = ( /obj/effect/floor_decal/corner/purple/diagonal, /obj/machinery/light{ @@ -112435,11 +111739,6 @@ }, /turf/simulated/floor/tiled/white, /area/horizon/security/forensic_laboratory) -"qnb" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "16,17" - }, -/area/shuttle/intrepid/cargo_bay) "qnc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/purple, /turf/simulated/wall/shuttle/scc_space_ship/cardinal, @@ -113331,12 +112630,6 @@ /obj/machinery/light, /turf/unsimulated/floor, /area/antag/loner) -"qui" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "17,19" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cargo_bay) "quj" = ( /obj/machinery/door/blast/regular{ id = "thunderdomegen"; @@ -113582,12 +112875,15 @@ /turf/simulated/floor/plating, /area/maintenance/hangar/starboard) "qwt" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "15,23"; - opacity = 1 +/obj/machinery/atmospherics/portables_connector/fuel{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/alarm/east{ + req_one_access = list(11, 24, 47, 65) + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/port_storage) "qwx" = ( /obj/structure/table/stone/marble, /obj/item/material/ashtray/bronze{ @@ -113857,6 +113153,21 @@ /obj/machinery/firealarm/east, /turf/simulated/floor/plating, /area/engineering/bluespace_drive) +"qyk" = ( +/obj/structure/bed/handrail{ + dir = 4 + }, +/obj/effect/map_effect/marker/airlock/shuttle{ + cycle_to_external_air = 1; + master_tag = "airlock_shuttle_intrepid"; + name = "airlock_shuttle_intrepid"; + req_one_access = null; + shuttle_tag = "Intrepid" + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/main_compartment) "qyq" = ( /obj/structure/railing/mapped, /obj/structure/lattice/catwalk/indoor/grate, @@ -114504,9 +113815,6 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) "qCA" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/structure/cable/green{ icon_state = "1-4" }, @@ -115422,9 +114730,12 @@ /area/horizon/hydroponics/lower) "qIS" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/window/reinforced, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/cargo_bay) +/obj/machinery/light/small, +/obj/structure/bed/handrail{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/main_compartment) "qIT" = ( /obj/machinery/vending/coffee, /obj/effect/floor_decal/corner/purple/full, @@ -115451,6 +114762,24 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/wing/starboard/far) +"qJb" = ( +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 + }, +/obj/machinery/door/airlock/external, +/obj/effect/map_effect/marker/airlock/shuttle{ + cycle_to_external_air = 1; + master_tag = "airlock_shuttle_intrepid"; + name = "airlock_shuttle_intrepid"; + req_one_access = null; + shuttle_tag = "Intrepid" + }, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/main_compartment) "qJf" = ( /obj/structure/lattice, /obj/structure/railing/mapped, @@ -115988,8 +115317,7 @@ /area/engineering/engine_room) "qMY" = ( /obj/machinery/light/small{ - dir = 4; - must_start_working = 1 + dir = 4 }, /turf/simulated/floor/plating, /area/turbolift/primary/deck_1) @@ -116132,6 +115460,14 @@ }, /turf/simulated/floor/lino, /area/chapel/main) +"qOb" = ( +/obj/structure/bed/stool/chair/shuttle, +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/main_compartment) "qOl" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass_service{ @@ -117360,39 +116696,6 @@ /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/tiled/dark, /area/shuttle/mercenary) -"qWK" = ( -/obj/effect/floor_decal/corner/yellow{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/effect/floor_decal/industrial/outline/emergency_closet, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/table/rack, -/obj/item/stack/material/glass/full, -/obj/item/stack/material/glass/full, -/obj/item/stack/rods{ - amount = 50 - }, -/obj/item/stack/rods{ - amount = 50 - }, -/obj/item/stack/material/glass/reinforced{ - amount = 50 - }, -/obj/item/stack/material/glass/reinforced{ - amount = 50 - }, -/obj/item/stack/material/steel/full, -/obj/item/stack/material/steel/full, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/atmos_compartment) "qWQ" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 @@ -118446,14 +117749,9 @@ /turf/simulated/floor/tiled, /area/hangar/intrepid) "reg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/turf/simulated/floor/lino, -/area/shuttle/intrepid/quarters) +/obj/effect/floor_decal/corner/lime/diagonal, +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/main_compartment) "ren" = ( /obj/effect/floor_decal/spline/plain{ dir = 4 @@ -118706,13 +118004,9 @@ /turf/simulated/floor/tiled/white, /area/medical/washroom) "rfT" = ( -/obj/structure/lattice/catwalk/indoor, -/obj/machinery/portable_atmospherics/powered/pump/filled, -/obj/machinery/light/small/red{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel, +/turf/simulated/wall/shuttle/scc, +/area/shuttle/intrepid/engineering) "rfV" = ( /obj/structure/table/reinforced/steel, /obj/effect/floor_decal/corner/lime{ @@ -119982,10 +119276,14 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) "rqa" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "14,24" +/obj/machinery/firealarm/north, +/obj/structure/bed/handrail, +/obj/machinery/atmospherics/binary/pump/supply{ + dir = 8; + name = "Canister to Air Distribution" }, -/area/shuttle/intrepid/engine_compartment) +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/port_storage) "rqb" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/horizon/hallway/deck_three/primary/starboard/docks) @@ -120136,13 +119434,6 @@ icon_state = "wood" }, /area/centcom/specops) -"rrS" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "6,5"; - outside_part = 0 - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cockpit) "rrX" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -120474,12 +119765,6 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) -"rtF" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "2,9" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/quarters) "rtJ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -120807,12 +120092,20 @@ /area/rnd/hallway) "rvR" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, -/obj/machinery/suit_storage_unit/standard_unit, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/cargo_bay) +/obj/machinery/power/smes/buildable/horizon_shuttle{ + RCon_tag = "Intrepid" + }, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/main_compartment) "rvU" = ( /obj/effect/floor_decal/corner_wide/green/full, /obj/machinery/light, @@ -121303,20 +120596,13 @@ /turf/simulated/floor/reinforced, /area/rnd/test_range) "rAg" = ( -/obj/structure/bed/stool/chair/shuttle{ - can_dismantle = 1; - dir = 4; - name = "worn chair" +/obj/effect/floor_decal/industrial/hatch_door/yellow, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,73); + dir = 4 }, -/obj/effect/floor_decal/spline/plain{ - dir = 10 - }, -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/machinery/light/small, -/turf/simulated/floor/lino, -/area/shuttle/intrepid/quarters) +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/cargo_bay) "rAk" = ( /turf/unsimulated/floor{ icon_state = "wood" @@ -121414,18 +120700,6 @@ icon_state = "wood" }, /area/centcom/control) -"rAV" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "16,13" - }, -/obj/structure/shuttle_part/scc/research{ - density = 0; - icon_state = "17,13"; - outside_part = 0; - pixel_x = 32 - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/quarters) "rAX" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -121700,11 +120974,6 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_storage) -"rCK" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "2,19" - }, -/area/shuttle/intrepid/atmos_compartment) "rDa" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -122511,12 +121780,12 @@ /turf/unsimulated/floor, /area/centcom/holding) "rKh" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red{ - dir = 4 +/obj/effect/floor_decal/industrial/hatch_door/red{ + dir = 1 }, -/obj/machinery/door/airlock/external{ - dir = 1; - icon_state = "door_locked" +/obj/machinery/door/airlock/external, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 }, /obj/effect/map_effect/marker/airlock/shuttle{ cycle_to_external_air = 1; @@ -122526,8 +121795,8 @@ shuttle_tag = "Intrepid" }, /obj/effect/map_effect/marker_helper/airlock/exterior, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cargo_bay) +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/main_compartment) "rKl" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/effect/floor_decal/corner_wide/lime{ @@ -122644,15 +121913,15 @@ /turf/unsimulated/floor, /area/antag/mercenary) "rLd" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "11,3"; - outside_part = 0 +/obj/machinery/light/small, +/obj/machinery/papershredder{ + pixel_x = -6 }, -/obj/structure/window/shuttle/unique/scc/research/over{ - density = 0; - icon_state = "4,1" +/obj/structure/filingcabinet/filingcabinet{ + pixel_x = 9; + pixel_y = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/intrepid/cockpit) "rLj" = ( /turf/simulated/floor/tiled/ramp/bottom{ @@ -123420,18 +122689,21 @@ /turf/simulated/floor/plating, /area/medical/cryo) "rRE" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/door/firedoor{ - req_one_access = list(24,11,67,73) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/door/blast/shutters/open{ - dir = 2; - id = "intrepid_inner"; - name = "Intrepid Shutter" +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cargo_bay) +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/main_compartment) "rRG" = ( /obj/machinery/door/airlock/maintenance_hatch{ dir = 1 @@ -123725,25 +122997,24 @@ /turf/simulated/floor/tiled/dark, /area/horizon/maintenance/deck_three/aft/starboard) "rTW" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/effect/floor_decal/industrial/hatch_door/red, +/obj/machinery/door/airlock/external{ dir = 8 }, -/obj/machinery/firealarm/north{ - pixel_x = -20 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 }, -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/item/reagent_containers/blood/OMinus, -/obj/item/reagent_containers/blood/OMinus, -/obj/item/reagent_containers/blood/OMinus, -/obj/machinery/light/small{ - dir = 1 +/obj/effect/map_effect/marker/airlock{ + master_tag = "sccv_intrepid_port"; + name = "sccv_intrepid_port" }, -/obj/structure/closet/walllocker/medical/secure{ - name = "O- Blood Locker"; - pixel_y = 32 +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/machinery/access_button{ + pixel_y = 26; + pixel_x = -32 }, -/turf/simulated/floor/tiled/white, -/area/shuttle/intrepid/crew_compartment) +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/main_compartment) "rUd" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 @@ -125082,25 +124353,6 @@ }, /turf/simulated/floor, /area/crew_quarters/captain) -"set" = ( -/obj/structure/shuttle_part/scc/research{ - density = 0; - icon_state = "4,12"; - outside_part = 0 - }, -/obj/structure/table/wood, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/item/folder/blue{ - pixel_x = 8; - pixel_y = 1 - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 9 - }, -/turf/simulated/floor/wood, -/area/shuttle/intrepid/quarters) "sew" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -125564,11 +124816,6 @@ "shZ" = ( /turf/simulated/floor/holofloor/reinforced, /area/template_noop) -"sib" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "7,22" - }, -/area/shuttle/intrepid/engine_compartment) "sie" = ( /obj/machinery/door/blast/regular{ dir = 4; @@ -125890,18 +125137,6 @@ }, /turf/simulated/floor/tiled, /area/horizon/security/brig) -"skB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8 - }, -/obj/structure/bed/stool/chair/shuttle{ - can_dismantle = 1; - dir = 8; - name = "worn chair" - }, -/obj/effect/floor_decal/corner/dark_blue/diagonal, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/quarters) "skE" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/dark/airless, @@ -126431,16 +125666,17 @@ /turf/simulated/floor/tiled, /area/hallway/primary/central_one) "spQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/machinery/bluespace_beacon, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/carpet/rubber, -/area/shuttle/intrepid/crew_compartment) +/turf/simulated/floor/plating, +/area/shuttle/intrepid/main_compartment) "spU" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -126463,6 +125699,9 @@ }, /turf/unsimulated/floor, /area/centcom/ferry) +"sql" = ( +/turf/simulated/wall/shuttle/scc, +/area/shuttle/intrepid/main_compartment) "sqs" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -127200,14 +126439,6 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/engineering) -"svJ" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "1,22"; - opacity = 1 - }, -/obj/item/hullbeacon/green, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) "svL" = ( /obj/structure/bed/stool/chair/office/dark{ dir = 8 @@ -127538,11 +126769,6 @@ "syz" = ( /turf/simulated/floor/carpet, /area/hallway/primary/central_two) -"syB" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "14,10" - }, -/area/shuttle/intrepid/quarters) "syE" = ( /obj/effect/floor_decal/corner_wide/purple{ dir = 10 @@ -128113,14 +127339,12 @@ /turf/unsimulated/floor, /area/centcom/legion/hangar5) "sDd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/structure/lattice/catwalk/indoor, -/obj/structure/bed/handrail{ - dir = 8 +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, -/obj/machinery/alarm/west, +/obj/machinery/atmospherics/pipe/tank/air/scc_shuttle/airlock, /turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) +/area/shuttle/intrepid/engineering) "sDj" = ( /obj/structure/table/standard, /obj/item/device/hand_labeler, @@ -128568,9 +127792,12 @@ /turf/simulated/floor/tiled, /area/hallway/engineering) "sGo" = ( -/obj/effect/floor_decal/spline/plain/corner, -/turf/simulated/floor/lino/diamond, -/area/shuttle/intrepid/quarters) +/obj/effect/floor_decal/corner/brown/full, +/obj/effect/floor_decal/spline/plain/blue{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/main_compartment) "sGA" = ( /obj/structure/cable{ icon_state = "1-2" @@ -130072,18 +129299,12 @@ }, /area/centcom/bar) "sRH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/effect/floor_decal/corner/brown/full{ + dir = 1 }, -/obj/effect/floor_decal/corner/dark_blue/diagonal, -/obj/machinery/recharger{ - pixel_x = 6; - pixel_y = 3 - }, -/obj/machinery/light/small, -/obj/structure/table/reinforced/steel, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/quarters) +/obj/structure/bed/handrail, +/turf/simulated/floor/tiled, +/area/shuttle/intrepid/cargo_bay) "sRN" = ( /obj/structure/cable/green{ icon_state = "0-8" @@ -130651,10 +129872,11 @@ /turf/simulated/floor/carpet/rubber, /area/rnd/lab) "sWq" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "13,5" +/obj/machinery/shipsensors/weak/scc_shuttle{ + pixel_y = -21 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/reinforced, /area/shuttle/intrepid/cockpit) "sWr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -131164,15 +130386,12 @@ /turf/simulated/floor/marble/dark, /area/horizon/holodeck/source_tribunal) "tbm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/universal{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 +/obj/structure/bed/stool/chair/shuttle{ + dir = 1 }, /obj/machinery/light/small, /turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cargo_bay) +/area/shuttle/intrepid/main_compartment) "tbr" = ( /obj/structure/table/stone/marble, /obj/machinery/chemical_dispenser/bar_soft/full{ @@ -131748,10 +130967,34 @@ /turf/simulated/floor, /area/horizon/maintenance/deck_three/aft/starboard) "tfA" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "10,7" +/obj/effect/floor_decal/industrial/warning{ + dir = 6 }, -/area/shuttle/intrepid/cockpit) +/obj/machinery/alarm/east{ + req_one_access = list(11, 24, 47, 65) + }, +/obj/structure/table/reinforced/steel, +/obj/item/storage/toolbox/mechanical{ + pixel_x = 1; + pixel_y = 15 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/recharger{ + pixel_x = 6; + pixel_y = 1 + }, +/obj/machinery/recharger{ + pixel_x = -5; + pixel_y = 1 + }, +/obj/item/device/binoculars{ + pixel_x = 1; + pixel_y = 3 + }, +/turf/simulated/floor/carpet/rubber, +/area/shuttle/intrepid/main_compartment) "tfB" = ( /turf/simulated/floor/exoplanet/water/shallow, /area/horizon/hydroponics/lower) @@ -131932,17 +131175,16 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/maintenance/wing/starboard) "thu" = ( -/obj/machinery/meter{ - name = "Air Reserve" +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1 +/obj/structure/bed/handrail{ + dir = 4 }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/atmos_compartment) +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/simulated/floor/tiled/full, +/area/shuttle/intrepid/engineering) "thw" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/light/small/emergency, @@ -132556,12 +131798,6 @@ }, /turf/simulated/floor/tiled/full, /area/hallway/primary/central_one) -"tmH" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "2,11" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/quarters) "tmN" = ( /turf/simulated/wall, /area/medical/reception) @@ -133405,12 +132641,6 @@ }, /turf/simulated/floor/shuttle/tan, /area/centcom/bar) -"tsR" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "10,1" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cockpit) "ttb" = ( /obj/effect/floor_decal/corner/dark_blue/full{ dir = 4 @@ -133748,11 +132978,6 @@ icon_state = "4,2" }, /area/shuttle/mining) -"tuA" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "16,20" - }, -/area/shuttle/intrepid/cargo_bay) "tuK" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/door/blast/shutters{ @@ -133783,6 +133008,18 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/engineering/lower) +"tuR" = ( +/obj/effect/floor_decal/corner/brown{ + dir = 9 + }, +/obj/effect/floor_decal/spline/plain/blue{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/main_compartment) "tuS" = ( /obj/structure/table/reinforced/wood, /obj/machinery/chemical_dispenser/coffee/full{ @@ -133850,6 +133087,31 @@ }, /turf/simulated/floor/tiled/dark, /area/horizon/holodeck/source_pool) +"tvu" = ( +/obj/structure/bed/handrail{ + dir = 8 + }, +/obj/effect/map_effect/marker/airlock/shuttle{ + cycle_to_external_air = 1; + master_tag = "airlock_shuttle_intrepid"; + name = "airlock_shuttle_intrepid"; + req_one_access = null; + shuttle_tag = "Intrepid" + }, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + dir = 8; + pixel_x = 21; + pixel_y = 6 + }, +/obj/machinery/airlock_sensor{ + dir = 8; + pixel_x = 22; + pixel_y = -6 + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/main_compartment) "tvw" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 @@ -133891,16 +133153,6 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/telesci) -"tvK" = ( -/obj/structure/lattice/catwalk/indoor, -/obj/machinery/camera/network/intrepid{ - c_tag = "Intrepid - Engine Compartment"; - dir = 1 - }, -/obj/machinery/recharge_station, -/obj/machinery/alarm/west, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) "tvU" = ( /obj/structure/bed/stool/chair/padded/red{ dir = 4 @@ -134019,22 +133271,24 @@ /turf/simulated/floor/tiled/dark, /area/horizon/security/firing_range) "twR" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/door/firedoor{ - req_one_access = list(24,11,67,73) +/obj/effect/floor_decal/corner/brown{ + dir = 6 }, -/obj/machinery/door/blast/shutters/open{ - dir = 2; - id = "intrepid_inner"; - name = "Intrepid Shutter" +/obj/structure/bed/handrail{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/spline/plain/corner/purple, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 }, -/obj/effect/floor_decal/spline/plain/corner, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cargo_bay) +/obj/machinery/alarm/east{ + req_one_access = list(11, 24, 47, 65) + }, +/obj/machinery/camera/network/intrepid{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/main_compartment) "twU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -134092,6 +133346,16 @@ }, /turf/simulated/floor/lino, /area/horizon/crew_quarters/lounge/bar) +"txg" = ( +/obj/structure/bed/stool/chair/shuttle{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/machinery/light/small{ + must_start_working = 1 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/main_compartment) "txj" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 8 @@ -134835,14 +134099,20 @@ /turf/simulated/wall/r_wall, /area/bridge/upperdeck) "tDa" = ( -/obj/machinery/atmospherics/pipe/tank/carbon_dioxide/scc_shuttle{ - dir = 8 +/obj/structure/bed/stool/chair/shuttle{ + dir = 1 }, -/obj/effect/floor_decal/corner/yellow{ - dir = 6 +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 }, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/atmos_compartment) +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/camera/network/intrepid{ + dir = 1 + }, +/turf/simulated/floor/tiled/full, +/area/shuttle/intrepid/engineering) "tDb" = ( /obj/machinery/iv_drip, /obj/effect/floor_decal/corner_wide/green{ @@ -135092,16 +134362,6 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/engineering) -"tEV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cargo_bay) "tEY" = ( /obj/structure/grille, /obj/structure/window/shuttle/scc_space_ship, @@ -135765,14 +135025,12 @@ /area/antag/raider) "tKf" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/door/firedoor{ - req_one_access = list(24,11,67,73) +/obj/structure/bed/handrail{ + dir = 4 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/atmos_compartment) +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/turf/simulated/floor/tiled/full, +/area/shuttle/intrepid/engineering) "tKg" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 @@ -136982,12 +136240,6 @@ /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/holofloor/lino, /area/horizon/holodeck/source_courtroom) -"tTg" = ( -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/dark, -/area/hangar/intrepid) "tTh" = ( /obj/random/loot, /obj/structure/closet, @@ -137320,10 +136572,13 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) "tVf" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "6,20" +/obj/structure/bed/stool/chair/shuttle{ + dir = 8 }, -/area/shuttle/intrepid/atmos_compartment) +/obj/effect/floor_decal/industrial/warning/corner, +/obj/item/device/radio/intercom/expedition/east, +/turf/simulated/floor/tiled/full, +/area/shuttle/intrepid/engineering) "tVj" = ( /obj/machinery/light, /obj/machinery/door/window/brigdoor/westright{ @@ -137584,13 +136839,14 @@ /turf/simulated/floor/tiled, /area/hangar/intrepid) "tXp" = ( -/obj/structure/closet/walllocker/emerglocker/north, -/obj/structure/bed/stool/chair/shuttle, -/obj/effect/floor_decal/spline/plain{ - dir = 9 +/obj/structure/bed/stool/chair/shuttle{ + dir = 1 }, -/turf/simulated/floor/lino, -/area/shuttle/intrepid/quarters) +/obj/machinery/light/small{ + must_start_working = 1 + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/main_compartment) "tXr" = ( /obj/machinery/light{ dir = 8 @@ -137829,19 +137085,6 @@ /obj/effect/floor_decal/corner/mauve/full, /turf/simulated/floor/tiled/white, /area/rnd/chemistry) -"tZm" = ( -/obj/structure/window/shuttle/unique/scc/tall{ - icon_state = "long2-1" - }, -/obj/machinery/door/firedoor{ - req_one_access = list(24,11,67,73); - dir = 4 - }, -/obj/effect/landmark/entry_point/port{ - name = "port, medbay" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/crew_compartment) "tZn" = ( /obj/machinery/vending/assist/synd, /obj/effect/floor_decal/corner/red/diagonal, @@ -137922,11 +137165,19 @@ /turf/simulated/open/airless, /area/template_noop) "uab" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "5,7" +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/alarm/south{ + req_one_access = list(11, 24, 47, 65) }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cockpit) +/obj/structure/closet/crate/freezer/rations, +/obj/item/storage/box/produce, +/obj/item/storage/box/produce, +/obj/item/reagent_containers/food/snacks/koisbar_clean, +/obj/item/reagent_containers/food/snacks/koisbar_clean, +/obj/item/storage/box/fancy/egg_box, +/obj/item/reagent_containers/food/drinks/carton/milk, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/cargo_bay) "uac" = ( /obj/structure/cable/green{ icon_state = "0-2" @@ -138424,29 +137675,17 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard/docks) "udv" = ( -/obj/structure/closet/crate, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, +/obj/effect/floor_decal/corner/brown{ + dir = 9 + }, +/obj/effect/floor_decal/spline/plain/green{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/outline/operations, -/obj/item/tent/big/scc, -/turf/simulated/floor/carpet/rubber, -/area/shuttle/intrepid/crew_compartment) +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/main_compartment) "udw" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 @@ -139584,21 +138823,6 @@ }, /turf/simulated/floor/wood, /area/merchant_station) -"umg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/corner/blue{ - dir = 10 - }, -/turf/simulated/floor/carpet/rubber, -/area/shuttle/intrepid/crew_compartment) "umm" = ( /obj/structure/railing/mapped{ name = "adjusted railing" @@ -141590,6 +140814,21 @@ }, /turf/simulated/floor/airless, /area/engineering/atmos) +"uAj" = ( +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/effect/floor_decal/corner/black{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/loading/yellow{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/hangar/intrepid) "uAp" = ( /obj/effect/floor_decal/corner/green/diagonal, /obj/effect/floor_decal/spline/fancy{ @@ -142762,22 +142001,10 @@ /turf/unsimulated/floor, /area/centcom/control) "uJi" = ( -/obj/machinery/door/firedoor{ - req_one_access = list(24,11,67,73) - }, -/obj/machinery/atmospherics/valve/digital/open{ - name = "airlock shutoff valve" - }, -/obj/effect/floor_decal/industrial/outline/emergency_closet, -/obj/machinery/door/window/southright{ - req_one_access = list(73,11,24) - }, -/obj/machinery/light_switch{ - pixel_x = 21; - pixel_y = 9 - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/atmos_compartment) +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/bed/handrail, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/main_compartment) "uJk" = ( /obj/effect/floor_decal/corner/dark_blue/full{ dir = 4 @@ -142926,12 +142153,6 @@ }, /turf/simulated/floor/holofloor/tiled/ramp/bottom, /area/horizon/stairwell/central) -"uKn" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "13,4" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cockpit) "uKo" = ( /obj/effect/decal/cleanable/spiderling_remains, /turf/simulated/floor/exoplanet/barren/raskara, @@ -143145,20 +142366,14 @@ /turf/simulated/floor/tiled, /area/operations/storage) "uLN" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/binary/pump/fuel{ - dir = 1; - name = "Fuel Tank to Thrusters" +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 1 }, -/obj/machinery/door/firedoor{ - req_one_access = list(24,11,67,73) - }, -/obj/machinery/camera/network/intrepid{ - c_tag = "Intrepid - Atmos Compartment"; - dir = 8 - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/atmos_compartment) +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/shuttle/intrepid/engineering) "uLY" = ( /turf/simulated/floor/carpet/brown, /area/horizon/library) @@ -143672,10 +142887,24 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/skipjack) "uRe" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "6,23" +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 }, -/area/shuttle/intrepid/engine_compartment) +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/bed/handrail{ + dir = 8 + }, +/obj/machinery/atmospherics/binary/pump/scrubber/on{ + dir = 1; + name = "Scrubbers to Waste"; + target_pressure = 15000 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/engineering) "uRf" = ( /obj/effect/map_effect/window_spawner/full/reinforced/indestructible, /turf/unsimulated/floor/plating, @@ -143791,17 +143020,14 @@ /turf/simulated/floor/reinforced, /area/crew_quarters/lounge) "uRV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/corner/brown{ + dir = 6 }, -/obj/effect/floor_decal/corner/dark_blue{ - dir = 5 +/obj/effect/floor_decal/spline/plain{ + dir = 4 }, /turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/quarters) +/area/shuttle/intrepid/main_compartment) "uSc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel, /obj/structure/shuttle_part/scc/scout{ @@ -143816,28 +143042,6 @@ opacity = 1 }, /area/shuttle/canary) -"uSd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/obj/effect/floor_decal/corner/yellow{ - dir = 6 - }, -/obj/effect/floor_decal/industrial/outline/operations, -/obj/machinery/cell_charger, -/obj/structure/table/reinforced, -/obj/random/powercell, -/obj/random/powercell, -/obj/machinery/power/apc/intrepid/north, -/turf/simulated/floor/carpet/rubber, -/area/shuttle/intrepid/crew_compartment) "uSe" = ( /obj/structure/railing/mapped, /obj/effect/floor_decal/corner/black{ @@ -143910,15 +143114,12 @@ /turf/simulated/floor/tiled, /area/horizon/security/brig) "uSU" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "7,3"; - outside_part = 0 +/obj/machinery/computer/ship/engines/terminal{ + dir = 4 }, -/obj/structure/window/shuttle/unique/scc/research/over{ - density = 0; - icon_state = "0,1" - }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline/security, +/obj/machinery/light/small, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/intrepid/cockpit) "uSZ" = ( /obj/structure/lattice/catwalk, @@ -144074,10 +143275,12 @@ /turf/simulated/open, /area/operations/office) "uUx" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "6,16" +/obj/machinery/atmospherics/unary/engine/scc_shuttle, +/obj/effect/landmark/entry_point/aft{ + name = "aft, starboard thrusters" }, -/area/shuttle/intrepid/atmos_compartment) +/turf/simulated/floor/plating, +/area/shuttle/intrepid/engineering) "uUE" = ( /obj/vehicle/droppod/legion{ connected_blastdoor = "tcfl_droppod_1" @@ -144149,6 +143352,14 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/hallway/engineering) +"uVl" = ( +/obj/effect/floor_decal/industrial/hatch_door/yellow, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,73); + dir = 4 + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/medical) "uVn" = ( /obj/vehicle/bike/speeder, /obj/effect/floor_decal/industrial/warning{ @@ -144288,23 +143499,21 @@ /turf/unsimulated/floor/plating, /area/antag/raider) "uWc" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/effect/floor_decal/corner/brown/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + dir = 4 }, -/obj/effect/floor_decal/corner/dark_blue{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" }, /turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/cargo_bay) +/area/shuttle/intrepid/main_compartment) "uWh" = ( /obj/effect/floor_decal/industrial/outline/blue, /obj/structure/table/rack, @@ -144860,9 +144069,6 @@ /turf/simulated/floor/plating, /area/engineering/engine_room) "uZN" = ( -/obj/structure/cable/green{ - icon_state = "1-4" - }, /obj/structure/closet/emcloset, /obj/effect/floor_decal/corner/dark_green/full, /obj/effect/floor_decal/industrial/outline/emergency_closet, @@ -144922,21 +144128,24 @@ /turf/unsimulated/floor, /area/centcom/legion/hangar5) "vab" = ( -/obj/machinery/door/firedoor{ - req_one_access = list(24,11,67,73) +/obj/effect/floor_decal/industrial/hatch_door/red, +/obj/machinery/door/airlock/external{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/map_effect/marker/airlock{ + master_tag = "sccv_intrepid_starboard"; + name = "sccv_intrepid_starboard" }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/atmos_compartment) +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/machinery/access_button{ + pixel_y = 26; + pixel_x = 32 + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/main_compartment) "vac" = ( /obj/effect/floor_decal/corner_wide/yellow/diagonal{ dir = 4 @@ -145641,19 +144850,6 @@ /obj/structure/closet/athletic_mixed, /turf/simulated/floor/tiled, /area/horizon/crew_quarters/fitness/changing) -"vfk" = ( -/obj/machinery/door/window/westleft, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/structure/closet/crate/freezer/rations, -/obj/item/storage/box/kitchen, -/obj/item/storage/box/kitchen, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cargo_bay) "vfl" = ( /obj/item/shovel, /turf/simulated/floor/exoplanet/barren, @@ -145751,19 +144947,6 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) -"vgi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/atmos_compartment) "vgm" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/corner/dark_blue{ @@ -147633,22 +146816,11 @@ /turf/unsimulated/floor, /area/antag/burglar) "vvq" = ( -/obj/machinery/light/small{ - dir = 8 +/obj/effect/floor_decal/corner/brown{ + dir = 5 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/item/device/flashlight/lamp{ - pixel_y = 4 - }, -/obj/item/device/binoculars{ - pixel_x = 19 - }, -/obj/effect/floor_decal/corner/dark_blue/diagonal, -/obj/structure/table/reinforced/steel, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/quarters) +/turf/simulated/floor/tiled, +/area/shuttle/intrepid/cargo_bay) "vvt" = ( /obj/structure/shuttle_part/ccia{ icon_state = "7,0"; @@ -147710,11 +146882,6 @@ temperature = 278 }, /area/turret_protected/ai) -"vvK" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "7,25" - }, -/area/shuttle/intrepid/engine_compartment) "vvQ" = ( /obj/structure/shuttle_part/ert{ icon_state = "4,0"; @@ -148071,12 +147238,6 @@ }, /turf/simulated/floor/reinforced/airless, /area/engineering/atmos/propulsion/starboard) -"vyI" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "5,3" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cockpit) "vyK" = ( /obj/effect/floor_decal/corner_wide/purple{ dir = 5 @@ -148396,19 +147557,13 @@ /turf/simulated/floor/tiled/white, /area/horizon/kitchen) "vBb" = ( -/obj/structure/window/shuttle/unique/scc/research/over{ - density = 0; - icon_state = "3,3" +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/obj/structure/bed/handrail, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 }, -/obj/structure/bed/stool/chair/office/bridge{ - dir = 4 - }, -/obj/machinery/computer/ship/engines/cockpit{ - pixel_x = 24; - pixel_y = 7 - }, -/obj/effect/floor_decal/corner/dark_blue{ - dir = 9 +/obj/machinery/alarm/north{ + req_one_access = list(11, 73) }, /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/cockpit) @@ -148698,6 +147853,23 @@ /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/holofloor/carpet/rubber, /area/horizon/holodeck/source_basketball) +"vCV" = ( +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 4 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "sccv_intrepid_starboard"; + name = "sccv_intrepid_starboard" + }, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + pixel_y = 23 + }, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/main_compartment) "vCX" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -149500,6 +148672,23 @@ /obj/machinery/power/apc/low/west, /turf/simulated/floor/carpet/rubber, /area/maintenance/engineering/auxillary) +"vJG" = ( +/obj/effect/floor_decal/industrial/hatch_door/yellow, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,73); + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/medical) "vJM" = ( /obj/structure/table/steel, /obj/item/device/radio/intercom/north, @@ -149552,20 +148741,6 @@ }, /turf/simulated/floor/exoplanet/grass/grove, /area/centcom/shared_dream) -"vKl" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "11,6"; - outside_part = 0 - }, -/obj/structure/window/shuttle/unique/scc/research/over{ - icon_state = "4,4" - }, -/obj/machinery/door/firedoor{ - req_one_access = list(24,11,67,73); - dir = 4 - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cockpit) "vKu" = ( /obj/effect/shuttle_landmark/legion/interim, /turf/space/transit/east, @@ -149747,20 +148922,6 @@ }, /turf/simulated/floor/tiled/dark, /area/horizon/grauwolf) -"vMd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/obj/machinery/iv_drip, -/obj/machinery/light/small, -/obj/item/tank/oxygen, -/obj/item/clothing/mask/breath/medical, -/turf/simulated/floor/tiled/white, -/area/shuttle/intrepid/crew_compartment) "vMh" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/effect/decal/cleanable/dirt, @@ -150223,18 +149384,6 @@ }, /turf/simulated/floor/tiled, /area/bridge/controlroom) -"vQA" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/fuel_port/phoron/scc{ - pixel_x = 5; - pixel_y = 23 - }, -/obj/effect/floor_decal/corner/dark_blue/diagonal, -/obj/structure/table/steel, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/quarters) "vQC" = ( /obj/structure/table/rack, /turf/simulated/floor/tiled/dark, @@ -151231,19 +150380,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/hallway/secondary) -"vWs" = ( -/obj/machinery/atmospherics/pipe/tank/air/scc_shuttle{ - dir = 8; - name = "Pressure Tank (Air - Main Airlock)" - }, -/obj/effect/floor_decal/corner/yellow{ - dir = 6 - }, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/atmos_compartment) "vWt" = ( /obj/structure/bed/stool/chair{ name = "uncomfortable chair" @@ -151478,12 +150614,6 @@ }, /turf/simulated/floor/reinforced/airmix, /area/engineering/atmos/air) -"vYX" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "16,9" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/quarters) "vZa" = ( /obj/structure/bed/stool/chair/office/bridge/generic, /obj/effect/floor_decal/corner/dark_blue{ @@ -151691,20 +150821,11 @@ /turf/simulated/floor/wood, /area/maintenance/wing/starboard) "wan" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 +/obj/machinery/door/airlock/glass_mining{ + name = "Cargo Hold" }, -/obj/machinery/alarm/west{ - req_one_access = list(24,11,47,65) - }, -/obj/structure/bed/stool/chair/shuttle{ - can_dismantle = 1; - dir = 4; - name = "worn chair" - }, -/obj/effect/floor_decal/corner/dark_blue/diagonal, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/quarters) +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/cargo_bay) "war" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/tcommsat/chamber) @@ -152552,6 +151673,14 @@ }, /turf/simulated/floor/plating, /area/maintenance/research_port) +"whL" = ( +/obj/effect/floor_decal/corner/dark_green/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/south, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/main_compartment) "whM" = ( /obj/effect/decal/fake_object{ color = "#545c68"; @@ -153416,26 +152545,6 @@ /obj/structure/sign/electricshock, /turf/simulated/wall/r_wall, /area/tcommsat/chamber) -"wnQ" = ( -/obj/effect/floor_decal/corner/dark_blue{ - dir = 9 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/obj/machinery/camera/network/intrepid{ - c_tag = "Intrepid - Cockpit"; - dir = 8 - }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/machinery/power/apc/intrepid/north, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/cockpit) "wnR" = ( /obj/machinery/door/airlock/centcom{ dir = 1; @@ -153445,11 +152554,16 @@ /turf/unsimulated/floor, /area/antag/mercenary) "wnV" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/aux, -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "11,17" +/obj/effect/map_effect/marker/airlock/shuttle{ + cycle_to_external_air = 1; + master_tag = "airlock_shuttle_intrepid"; + name = "airlock_shuttle_intrepid"; + req_one_access = null; + shuttle_tag = "Intrepid" }, -/area/shuttle/intrepid/cargo_bay) +/obj/machinery/atmospherics/pipe/manifold4w/hidden, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/main_compartment) "wnW" = ( /obj/machinery/porta_turret, /obj/structure/cable/green{ @@ -153985,21 +153099,22 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop/xo) "wrl" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /obj/structure/cable/green{ - icon_state = "2-4" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/effect/floor_decal/corner/dark_blue/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/bed/handrail{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/quarters) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/carpet/rubber, +/area/shuttle/intrepid/main_compartment) "wro" = ( /obj/structure/shuttle_part/scc_space_ship{ icon_state = "d3-4" @@ -155179,11 +154294,6 @@ }, /turf/unsimulated/floor/plating, /area/centcom/specops) -"wzA" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "7,24" - }, -/area/shuttle/intrepid/engine_compartment) "wzC" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -155678,12 +154788,9 @@ }, /area/antag/wizard) "wCW" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "3,24"; - opacity = 1 - }, +/obj/machinery/atmospherics/pipe/tank/air/scc_shuttle, /turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) +/area/shuttle/intrepid/engineering) "wDq" = ( /turf/simulated/floor/tiled, /area/maintenance/wing/starboard/far) @@ -155701,25 +154808,6 @@ }, /turf/unsimulated/floor/plating, /area/centcom/legion) -"wDu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/door/firedoor{ - req_one_access = list(24,11,67,73); - dir = 4 - }, -/obj/machinery/door/airlock/hatch{ - dir = 4; - name = "Utility and Atmosphere Control"; - req_one_access = list(73,11,24) - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/engine_compartment) "wDy" = ( /obj/machinery/door/firedoor, /obj/effect/floor_decal/corner/dark_green{ @@ -156053,19 +155141,11 @@ /turf/simulated/floor/plating, /area/maintenance/research_port) "wFb" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "11,4"; - outside_part = 0 +/obj/structure/bed/stool/chair/shuttle{ + dir = 8 }, -/obj/structure/window/shuttle/unique/scc/research/over{ - density = 0; - icon_state = "4,2" - }, -/obj/machinery/door/firedoor{ - req_one_access = list(24,11,67,73); - dir = 4 - }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/industrial/outline/security, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/intrepid/cockpit) "wFd" = ( /obj/structure/railing/mapped, @@ -156400,9 +155480,6 @@ /turf/simulated/floor/tiled/white, /area/rnd/conference) "wHX" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light/spot{ dir = 4 @@ -156562,10 +155639,12 @@ /turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "wIU" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "4,9" +/obj/effect/floor_decal/corner/brown/full{ + dir = 8 }, -/area/shuttle/intrepid/quarters) +/obj/structure/bed/handrail, +/turf/simulated/floor/tiled, +/area/shuttle/intrepid/cargo_bay) "wIV" = ( /obj/machinery/acting/changer{ density = 0; @@ -157426,11 +156505,6 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/mining) -"wOI" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "16,18" - }, -/area/shuttle/intrepid/cargo_bay) "wOJ" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -157464,15 +156538,18 @@ /turf/unsimulated/floor/plating, /area/shuttle/syndicate_elite) "wOT" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/effect/floor_decal/industrial/hatch_door/red, +/obj/machinery/door/airlock/external{ dir = 8 }, -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/effect/map_effect/marker/airlock{ + master_tag = "sccv_intrepid_port"; + name = "sccv_intrepid_port" }, -/turf/simulated/floor/tiled/white, -/area/shuttle/intrepid/crew_compartment) +/obj/effect/map_effect/marker_helper/airlock/interior, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/main_compartment) "wOU" = ( /turf/simulated/wall/shuttle/unique/ccia{ icon_state = "4,4" @@ -157657,11 +156734,8 @@ }, /area/centcom/legion/hangar5) "wQn" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/atmos_compartment) +/turf/simulated/wall/shuttle/scc, +/area/shuttle/intrepid/cargo_bay) "wQo" = ( /obj/structure/reagent_dispensers/keg/mead, /obj/effect/decal/cleanable/dirt, @@ -158845,20 +157919,17 @@ /turf/unsimulated/floor/plating, /area/centcom/evac) "wYT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 +/obj/effect/floor_decal/corner/brown{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/spline/plain{ +/obj/effect/floor_decal/spline/plain/purple{ dir = 4 }, -/turf/simulated/floor/carpet/rubber, -/area/shuttle/intrepid/crew_compartment) +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/main_compartment) "wYX" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -158933,12 +158004,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) -"wZl" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "2,10" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/quarters) "wZr" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 1 @@ -160118,20 +159183,20 @@ /turf/simulated/floor/tiled/dark, /area/security/checkpoint2) "xhT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 4 +/obj/structure/bed/stool/chair/shuttle{ + dir = 8 }, -/obj/machinery/power/terminal{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 }, -/obj/structure/cable{ - icon_state = "0-4" +/obj/machinery/alarm/east{ + req_one_access = list(11, 24, 47, 65) }, -/obj/structure/bed/handrail{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) +/turf/simulated/floor/tiled/full, +/area/shuttle/intrepid/engineering) "xib" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -160185,9 +159250,6 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/mining) "xiq" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/dark_green{ @@ -160355,16 +159417,9 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) "xjL" = ( -/obj/machinery/airlock_sensor{ - dir = 4; - pixel_x = -24; - pixel_y = -6 - }, /obj/structure/bed/handrail{ dir = 4 }, -/obj/structure/lattice/catwalk/indoor, -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, /obj/effect/map_effect/marker/airlock/shuttle{ cycle_to_external_air = 1; master_tag = "airlock_shuttle_intrepid"; @@ -160372,8 +159427,17 @@ req_one_access = null; shuttle_tag = "Intrepid" }, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume, +/obj/machinery/atmospherics/unary/vent_pump/high_volume, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, -/area/shuttle/intrepid/cargo_bay) +/area/shuttle/intrepid/main_compartment) "xjQ" = ( /obj/structure/cable/green{ icon_state = "0-4" @@ -160730,14 +159794,6 @@ /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/plating, /area/maintenance/wing/port/deck1) -"xlX" = ( -/obj/structure/window/shuttle/unique/scc/tall, -/obj/machinery/door/firedoor{ - req_one_access = list(24,11,67,73); - dir = 4 - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/crew_compartment) "xlZ" = ( /obj/effect/floor_decal/corner/dark_blue/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ @@ -160950,21 +160006,8 @@ /turf/simulated/floor/tiled/white, /area/horizon/kitchen) "xnF" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "10,3"; - outside_part = 0 - }, -/obj/structure/window/shuttle/unique/scc/research/over{ - icon_state = "3,1" - }, -/obj/effect/floor_decal/corner/dark_blue{ - dir = 1 - }, -/obj/machinery/door/firedoor{ - req_one_access = list(24,11,67,73); - dir = 4 - }, -/obj/structure/table/reinforced, +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/obj/structure/bed/stool/chair/office/bridge, /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/cockpit) "xnP" = ( @@ -161265,19 +160308,6 @@ }, /turf/simulated/floor/tiled/dark/full, /area/turbolift/scc_ship/operations_lift) -"xqo" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, -/obj/structure/lattice/catwalk/indoor, -/obj/item/device/radio/intercom/expedition/east, -/obj/effect/map_effect/marker/airlock/shuttle{ - cycle_to_external_air = 1; - master_tag = "airlock_shuttle_intrepid"; - name = "airlock_shuttle_intrepid"; - req_one_access = null; - shuttle_tag = "Intrepid" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/cargo_bay) "xqq" = ( /obj/structure/platform_stairs, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -161285,14 +160315,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/rnd/lab) -"xqv" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "11,26"; - opacity = 1; - outside_part = 0 - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) "xqC" = ( /obj/effect/floor_decal/corner/dark_green/full, /turf/simulated/floor/tiled, @@ -161395,22 +160417,17 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "xrp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/button/remote/blast_door{ - dir = 1; - id = "intrepid_inner"; - name = "inner cargo hold blast doors"; - pixel_x = -24; - pixel_y = 26 - }, -/turf/simulated/floor/carpet/rubber, -/area/shuttle/intrepid/crew_compartment) +/turf/simulated/floor/plating, +/area/shuttle/intrepid/main_compartment) "xrr" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 @@ -161663,21 +160680,9 @@ /turf/simulated/wall/r_wall, /area/rnd/xenoarch_atrium) "xtM" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "14,26"; - opacity = 1; - outside_part = 0 - }, -/obj/structure/shuttle_part/scc/scout{ - desc = "The hull and reinforcement of a Pathfinder class corporate expedition shuttle. The phoron-purple colored bands indicate this, in bold text as the SCCV Intrepid."; - icon = 'icons/obj/spaceship/scc/ship_engine.dmi'; - icon_state = "nozzle"; - name = "pathfinder class shuttle hull"; - opacity = 1; - outside_part = 0 - }, +/obj/machinery/atmospherics/unary/engine/scc_shuttle, /turf/simulated/floor/plating, -/area/shuttle/intrepid/engine_compartment) +/area/shuttle/intrepid/engineering) "xtU" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -161895,12 +160900,17 @@ /turf/simulated/floor/plating, /area/maintenance/research_port) "xvk" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "4,8" +/obj/effect/floor_decal/corner/brown{ + dir = 9 }, -/obj/item/hullbeacon/green, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/quarters) +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/shuttle/intrepid/cargo_bay) "xvl" = ( /obj/machinery/light{ dir = 4 @@ -163369,6 +162379,9 @@ icon_state = "wood" }, /area/centcom/control) +"xFW" = ( +/turf/simulated/wall/shuttle/scc, +/area/shuttle/intrepid/cockpit) "xGe" = ( /obj/machinery/door/airlock/engineering{ dir = 1; @@ -164512,9 +163525,6 @@ c_tag = "First Deck - Hangar 4"; dir = 8 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/dark_green{ @@ -164863,12 +163873,6 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/merchant) -"xPX" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "2,12" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/quarters) "xQb" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan, /obj/structure/railing/mapped{ @@ -165609,15 +164613,17 @@ /turf/simulated/floor/tiled/dark, /area/hangar/intrepid) "xVW" = ( -/obj/structure/shuttle_part/scc/research{ - density = 0; - icon_state = "14,11"; - outside_part = 0 +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/structure/bed/handrail, +/obj/structure/closet/walllocker/medical/secure{ + name = "O- Blood Locker"; + pixel_y = 32 }, -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "14,9" - }, -/area/shuttle/intrepid/quarters) +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/medical) "xWb" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/effect/floor_decal/spline/plain{ @@ -165689,11 +164695,6 @@ }, /turf/simulated/floor/carpet/red, /area/horizon/library) -"xWD" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "11,7" - }, -/area/shuttle/intrepid/cockpit) "xWF" = ( /obj/effect/floor_decal/corner_wide/lime/diagonal, /obj/structure/disposalpipe/segment, @@ -166515,9 +165516,6 @@ /turf/simulated/floor/tiled/full, /area/horizon/security/evidence_storage) "ycu" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/firealarm/west, /obj/effect/floor_decal/corner/dark_green{ dir = 9 @@ -167271,6 +166269,16 @@ }, /turf/simulated/floor/tiled, /area/engineering/lobby) +"yhm" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/bed/handrail{ + dir = 4 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/main_compartment) "yhn" = ( /obj/structure/grille/diagonal{ dir = 1 @@ -167367,10 +166375,9 @@ }, /area/centcom/control) "yib" = ( -/obj/machinery/light/small/red{ - dir = 4 +/obj/structure/bed/handrail{ + dir = 8 }, -/obj/structure/lattice/catwalk/indoor, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 1 }, @@ -167381,14 +166388,13 @@ req_one_access = null; shuttle_tag = "Intrepid" }, -/obj/effect/map_effect/marker_helper/airlock/out, -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 8; - pixel_x = 20; - pixel_y = 6 +/obj/machinery/light/small{ + dir = 4 }, +/obj/effect/map_effect/marker_helper/airlock/out, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, -/area/shuttle/intrepid/cargo_bay) +/area/shuttle/intrepid/main_compartment) "yie" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -167727,18 +166733,20 @@ /turf/simulated/floor/wood, /area/operations/qm) "ykn" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "7,4"; - outside_part = 0 +/obj/structure/table/reinforced/steel, +/obj/item/paper_bin{ + pixel_x = 6; + pixel_y = 18 }, -/obj/structure/window/shuttle/unique/scc/research/over{ - icon_state = "0,2" +/obj/item/device/binoculars/high_power{ + pixel_x = 7; + pixel_y = 3 }, -/obj/machinery/door/firedoor{ - req_one_access = list(24,11,67,73); - dir = 4 +/obj/item/device/flashlight/lamp{ + pixel_y = 1; + pixel_x = -7 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/intrepid/cockpit) "ykp" = ( /obj/machinery/light, @@ -198478,29 +197486,29 @@ xVU xVU fpp xVU +xVU +xVU fEy mNH mNH lMA xVU xVU -xVU -xVU eIC ioq mZD -bli -bli -bli -bli -bli -bli -bli -bli -bli -bli -gwA nDI +nDI +nDI +nDI +nDI +nDI +nDI +nDI +nDI +nDI +nDI +eSV eSV eSV eSV @@ -198728,14 +197736,6 @@ aIE cCt toF hYy -oWu -iRC -iRC -iRC -svJ -iLX -gmo -gJM iRC iRC iRC @@ -198743,6 +197743,14 @@ iRC iRC iRC iRC +iRC +iRC +iRC +imG +imG +iRC +iRC +iRC nWZ kEJ kEJ @@ -198755,7 +197763,6 @@ kEJ jHG kEJ kEJ -kEJ aRG nDI eSV @@ -198841,6 +197848,7 @@ eSV eSV eSV eSV +eSV "} (121,1,1) = {" eSV @@ -198985,28 +197993,27 @@ ckZ evm toF cFF -fcb +foG +foG +foG +pbX +foG +foG iRC iRC iRC -nOb -bKA -ipK -rCK -bEN -pru -ncq -ewy -ewy -nyz -xPX -tmH -wZl -rtF -iRC +sql +lBC +nyu +sql iRC iRC iRC +wQn +wQn +aFh +wQn +wQn iRC iRC iRC @@ -199098,6 +198105,7 @@ eSV eSV eSV eSV +eSV "} (122,1,1) = {" eSV @@ -199242,28 +198250,27 @@ xeJ xeJ ueH oWu -eHK +xtM ksN wCW nME bVo -fIy -jAw -moH -aiN -qWK +foG +hBb +hBb +hBb +sql +vCV ppS -eyW -xlX +sql jUm -kfv -eVn -lyH +jUm +jUm +wQn koV -iRC -iRC -iRC -iRC +czS +gkU +wQn iRC iRC iRC @@ -199355,6 +198362,7 @@ eSV eSV eSV eSV +eSV "} (123,1,1) = {" eSV @@ -199499,7 +198507,7 @@ edp evm gom xAe -pIR +uUx rfT luZ ilY @@ -199508,20 +198516,19 @@ hxL tKf thu cEf -vgi +sql vab -fye -jyn -aLc -set +iYp +sql +yhm jVL -kSs +jVL +wQn wIU xvk dLs -iRC -iRC -iRC +wQn +xFW iRC iRC iRC @@ -199612,6 +198619,7 @@ eSV eSV eSV eSV +eSV "} (124,1,1) = {" eSV @@ -199756,8 +198764,8 @@ edp evm ofA xAe -iSn -jbR +xtM +rfT sDd gmT gar @@ -199765,21 +198773,20 @@ kOR uLN kcW pLV -wQn +sql uJi -pdv -cpn -aEw -iOW -aFh +daD +sql +cpV +kol +kol wan vvq con uab -iRC +wQn jew -jpl -vyI +iRC iRC iRC iRC @@ -199869,6 +198876,7 @@ eSV eSV eSV eSV +eSV "} (125,1,1) = {" eSV @@ -200013,7 +199021,7 @@ edp evm xkS cgf -iMt +foG jkq bWz uRe @@ -200022,23 +199030,22 @@ xhT tVf coc tDa -vWs -uUx -jcd -umg -lkH +sql +lgN +whL +sql +bKa kol hwA -pnm +wQn sRH cJx fjA -oeq -rrS -pbX -cmX -iRC -iRC +wQn +lZI +lZI +lZI +xFW iRC iRC iRC @@ -200126,6 +199133,7 @@ eSV eSV eSV eSV +eSV "} (126,1,1) = {" eSV @@ -200270,33 +199278,32 @@ edp aHY wuD qgo -iAP -vvK -wzA -cZe -sib -wDu -mvO +foG +foG +foG +foG +foG +foG +foG lqO -oMU -kVX -nJB -uSd -oxX -aEw +foG +sql +pcQ +jcd +sql +dRx +kol tXp -hIV -ieY -juw -hZs -epb -kHF +wQn +rAg +aYc +wQn +wQn fgJ ykn uSU -hqo -iRC -iRC +xFW +xFW iRC iRC cLV @@ -200383,6 +199390,7 @@ eSV eSV eSV eSV +eSV "} (127,1,1) = {" eSV @@ -200527,11 +199535,11 @@ hYy pvn aob pvn -fZQ +nvn jXW kki +qyk xjL -mwR cqU eqw eSa @@ -200540,20 +199548,19 @@ fGD dlv udv hBV -aEw +tuR gPk sGo jry ppi krx bPT -flh +sql ois dJY -phg +xnF oKJ -ebk -lbc +kqv iRC iRC cLV @@ -200640,6 +199647,7 @@ eSV eSV eSV eSV +eSV "} (128,1,1) = {" eSV @@ -200781,10 +199789,10 @@ aaa ckV mjC hYy -eEc -dSQ +pvn +pvn guq -nvn +mwD gDj dir pTp @@ -200807,10 +199815,9 @@ mFo ocp mAY hcq -pTd +xnF kyK -oSi -kaM +fNt iRC iRC xsx @@ -200897,6 +199904,7 @@ eSV eSV eSV eSV +eSV "} (129,1,1) = {" eSV @@ -201041,12 +200049,12 @@ hYy pvn nkZ pvn -kxk +mwD rKh yib -xqo +tvu nxj -dJe +qJb onT jIj nGF @@ -201057,17 +200065,16 @@ blW nCH uRV jjk -iQn +jry hPR gPe tfA -wnQ +sql vBb gSU xnF iQL -tsR -bFM +kqv iRC iRC cLV @@ -201154,6 +200161,7 @@ eSV eSV eSV eSV +eSV "} (130,1,1) = {" eSV @@ -201298,33 +200306,32 @@ edp aHY wuD jXx -xqv -inM -iaD -nBh -hdl -iDh +aJI +aJI +aJI +aJI +aJI +aJI piD -gdy +uWc tbm -eWB +sql pcQ -hzv -vMd +idU +sql oDE -eTp -cCb -odb -rAg -aYc -xWD -vKl +reg +txg +bSh +uVl +vJG +bSh +bSh fry wFb rLd -owM -iRC -iRC +xFW +xFW iRC iRC cLV @@ -201411,6 +200418,7 @@ eSV eSV eSV eSV +eSV "} (131,1,1) = {" eSV @@ -201555,32 +200563,31 @@ edp fPt hMm xqY -fNt -tvK +aJI +aJI inf dyG otE -tEV +aJI jHp uWc -ghy -pMz +hwA +sql lgN -cfJ -mlL -aEw -bNZ -fmT -ahX +eEc +sql +qOb +reg +cCb +bSh jcV fFx kTh -poM -iKx -nQT -oXW -iRC -iRC +bSh +lZI +lZI +lZI +xFW iRC iRC iRC @@ -201668,6 +200675,7 @@ eSV eSV eSV eSV +eSV "} (132,1,1) = {" eSV @@ -201812,7 +200820,7 @@ edp lRY tfc xAe -hAl +gkk jbR fYr drK @@ -201821,21 +200829,20 @@ nar jcD eNa lbo -nmW -kCU -idU -nwF +sql +uJi +mwR +sql aEw -nDc +reg reg gKh -jKC +hlh jxU oea -iRC +bSh sWq -uKn -eZW +iRC iRC iRC iRC @@ -201925,6 +200932,7 @@ eSV eSV eSV eSV +eSV "} (133,1,1) = {" eSV @@ -202069,29 +201077,28 @@ edp adH kdo xAe -xtM -hqn +iSl +bbg rqa gMb mCJ -euz +aJI rvR ppH qIS -gkN +sql rTW wOT -lvI -aEw -vQA -skB -syB +sql +nwy +ezr +ezr +bSh xVW brZ mIX -iRC -iRC -iRC +bSh +xFW iRC iRC iRC @@ -202182,6 +201189,7 @@ eSV eSV eSV eSV +eSV "} (134,1,1) = {" eSV @@ -202326,28 +201334,27 @@ hJG hJG trY oWu -dhJ +gkk pGP gBD qwt aHB -vfk -aCM +aJI +jUm mLu -qIS -jtK -brR +jUm +sql eaS -tZm -bOA -bRj -oqj -lit +eLg +sql +jUm +jUm +jUm +bSh iHi -iRC -iRC -iRC -iRC +lIM +bYa +bSh iRC iRC iRC @@ -202439,6 +201446,7 @@ eSV eSV eSV eSV +eSV "} (135,1,1) = {" eSV @@ -202583,28 +201591,27 @@ fXM fXM toF uhY -jgf +aJI +aJI +aJI +mSD +aJI +aJI iRC +eKr iRC -iRC -pBV -lWV -tuA -ker -wOI -qnb +sql imc -ifw -lIM -rAV -pVK -bXg -qhL -vYX -iRC +cKK +sql iRC iRC iRC +bSh +bSh +fzG +bSh +bSh iRC iRC iRC @@ -202696,6 +201703,7 @@ eSV eSV eSV eSV +eSV "} (136,1,1) = {" eSV @@ -202840,24 +201848,23 @@ rGK rGK toF hYy -oWu iRC iRC iRC -dRx -kmo -nrz -qui +iRC iRC iRC iRC eKr iRC iRC -cbu -uRt -uRt -jgf +bNV +bNV +iRC +iRC +iRC +iRC +iRC iRC iRC iRC @@ -202953,6 +201960,7 @@ eSV eSV eSV eSV +eSV "} (137,1,1) = {" eSV @@ -203105,11 +202113,11 @@ cnb cnb ujK ohm -iQu -iQu -iQu -lTZ dhi +uAj +owS +owS +gFb dhi nVZ hQr @@ -203124,7 +202132,6 @@ uRt uRt uRt uRt -uRt eVk nDI eSV @@ -203210,6 +202217,7 @@ eSV eSV eSV eSV +eSV "} (138,1,1) = {" eSV @@ -203369,21 +202377,21 @@ hYy hYy hYy hYy -tTg +hYy iYT -bli -bli -bli -bli -bli -bli -bli -bli -bli -bli -bli -kMG nDI +nDI +nDI +nDI +nDI +nDI +nDI +nDI +nDI +nDI +nDI +nDI +eSV eSV eSV eSV @@ -203871,7 +202879,7 @@ aWP vht vht vht -aWP +iyc aWP bCi bCi