diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index e682f517258..16eb50d43db 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -196,3 +196,8 @@ #define TRAIT_UNHITTABLE_BY_PROJECTILES "unhittable_by_projectiles" ///This mob is currently blocking a projectile. #define TRAIT_BLOCKING_PROJECTILES "blocking_projectiles" + +/// This trait is used for double shuttle seats in a single tile, used in handling occupant density. +#define TRAIT_DOUBLE_SEATS "double_seats" +/// Apply this to make a mob passable by other mobs. +#define TRAIT_UNDENSE "undense" diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index ee5d05ffdd4..d67b7cbbdb7 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -227,6 +227,68 @@ if(!buckled) generate_overlay_cache(material, CACHE_TYPE_SPECIAL, ABOVE_HUMAN_LAYER) +/// Unique feature - you can put two seats on same tile with different pixel_offsets, humans will be buckled with respective offsets +/// and only when both seats taken, seats will be made dense and, therefore, tile will become unpassible +/// **Does not support more than two seats on a tile. It causes layer issues when used facing horizontal directions in a vertical row.** +/obj/structure/bed/stool/chair/shuttle/double + obj_flags = NONE // We don't want this subtype able to be rotated. + var/buckle_offset_x = 0 + var/buckle_offset_y = 0 + var/mob_old_x = 0 + var/mob_old_y = 0 + +/obj/structure/bed/stool/chair/shuttle/double/Initialize() + . = ..() + + addtimer(CALLBACK(src, PROC_REF(setup_buckle_offsets)), 1 SECONDS) + +/obj/structure/bed/stool/chair/shuttle/double/CanPass(atom/movable/mover, turf/target, height, air_group) + return TRUE + +/obj/structure/bed/stool/chair/shuttle/double/proc/setup_buckle_offsets() + if(pixel_x != 0) + buckle_offset_x = pixel_x + if(pixel_y != 0) + buckle_offset_y = pixel_y + +/// Buckling offset and density adjustment. +/obj/structure/bed/stool/chair/shuttle/double/post_buckle(mob/M) + . = ..() + if(buckled) + if(buckled != M) + return + + if(buckle_offset_x != 0) + mob_old_x = M.pixel_x + M.pixel_x = buckle_offset_x + if(buckle_offset_y != 0) + mob_old_y = M.pixel_y + M.pixel_y = buckle_offset_y + else + icon_state = initial(icon_state) + + if(buckle_offset_x != 0) + M.pixel_x = mob_old_x + mob_old_x = 0 + if(buckle_offset_y != 0) + M.pixel_y = mob_old_y + mob_old_y = 0 + + for(var/obj/structure/bed/stool/chair/shuttle/double/VS in get_turf(src)) + if(VS != src) + //if both seats on same tile have buckled mob, we become dense, otherwise, not dense. + if(buckled) + if(VS.buckled) + REMOVE_TRAIT(buckled, TRAIT_UNDENSE, TRAIT_DOUBLE_SEATS) + REMOVE_TRAIT(VS.buckled, TRAIT_UNDENSE, TRAIT_DOUBLE_SEATS) + else + ADD_TRAIT(buckled, TRAIT_UNDENSE, TRAIT_DOUBLE_SEATS) + else + if(VS.buckled) + ADD_TRAIT(VS.buckled, TRAIT_UNDENSE, TRAIT_DOUBLE_SEATS) + REMOVE_TRAIT(M, TRAIT_UNDENSE, TRAIT_DOUBLE_SEATS) + break + /obj/structure/bed/stool/chair/cockpit name = "cockpit seating" icon_state = "cockpit_preview" diff --git a/code/modules/cooking/machinery/cooking_machines/oven.dm b/code/modules/cooking/machinery/cooking_machines/oven.dm index 7ff7a4111f9..bec7563cb47 100644 --- a/code/modules/cooking/machinery/cooking_machines/oven.dm +++ b/code/modules/cooking/machinery/cooking_machines/oven.dm @@ -20,6 +20,12 @@ var/open = FALSE // Start closed so people don't heat up ovens with the door open ///Looping sound for the oven var/datum/looping_sound/oven/oven_loop + ///Open door icon_state + var/door_open = "ovenopen" + ///Closed door icon_state + var/door_closed = "ovenclosed" + var/door_open_overlay = "ovenopen_on" + var/door_closed_overlay = "ovenclosed_on" starts_with = list( /obj/item/reagent_containers/cooking_container/oven, @@ -54,15 +60,15 @@ ClearOverlays() update_baking_audio() if(!open) - icon_state = "ovenclosed" + icon_state = door_closed if(!stat) - var/image/ovenclosed_on = image('icons/obj/machinery/cooking_machines.dmi', "ovenclosed_on") + var/image/ovenclosed_on = image('icons/obj/machinery/cooking_machines.dmi', door_closed_overlay) ovenclosed_on.plane = EFFECTS_ABOVE_LIGHTING_PLANE AddOverlays(ovenclosed_on) else - icon_state = "ovenopen" + icon_state = door_open if(!stat) - var/image/ovenopen_on = image('icons/obj/machinery/cooking_machines.dmi', "ovenopen_on") + var/image/ovenopen_on = image('icons/obj/machinery/cooking_machines.dmi', door_open_overlay) ovenopen_on.plane = EFFECTS_ABOVE_LIGHTING_PLANE AddOverlays(ovenopen_on) ..() @@ -141,3 +147,15 @@ icon_state = "adhomai_ovenclosed_off" else icon_state = "adhomai_oven_open" + +/obj/machinery/appliance/cooker/oven/small + name = "compact oven" + desc = "A lightweight, small oven. Doesn't hold much, but it cooks just fine." + density = FALSE + + max_contents = 2 + icon_state = "small_ovenopen" + door_open = "small_ovenopen" + door_closed = "small_ovenclosed" + door_open_overlay = "small_ovenopen_on" + door_closed_overlay = "small_ovenclosed_on" diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index cfb594c9e5a..3756eb4f261 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -13,6 +13,8 @@ for(var/obj/item/grab/G in moving_mob.grabbed_by) if(G.assailant == src) return TRUE + if(HAS_TRAIT(src, TRAIT_UNDENSE)) + return TRUE return (!mover.density || !density || lying) else return (!mover.density || !density || lying) diff --git a/html/changelogs/kano-dot-intrepid-dropshippening.yml b/html/changelogs/kano-dot-intrepid-dropshippening.yml new file mode 100644 index 00000000000..cc8aadffd72 --- /dev/null +++ b/html/changelogs/kano-dot-intrepid-dropshippening.yml @@ -0,0 +1,7 @@ +author: Kano + +delete-after: True + +changes: + - rscadd: "Remapped the SCCV Intrepid." + - rscadd: "Ports CM's double vehicle seats." diff --git a/icons/obj/machinery/cooking_machines.dmi b/icons/obj/machinery/cooking_machines.dmi index 9154cded143..f0bf1855d3b 100644 Binary files a/icons/obj/machinery/cooking_machines.dmi and b/icons/obj/machinery/cooking_machines.dmi differ diff --git a/maps/sccv_horizon/code/sccv_horizon_areas.dm b/maps/sccv_horizon/code/sccv_horizon_areas.dm index 0f8aea4591b..e5c14c3e043 100644 --- a/maps/sccv_horizon/code/sccv_horizon_areas.dm +++ b/maps/sccv_horizon/code/sccv_horizon_areas.dm @@ -322,8 +322,17 @@ /area/shuttle/intrepid/main_compartment name = "Intrepid Main Compartment" -/area/shuttle/intrepid/cargo_bay - name = "Intrepid Cargo Bay" +/area/shuttle/intrepid/port_compartment + name = "Intrepid Port Compartment" + +/area/shuttle/intrepid/starboard_compartment + name = "Intrepid Starboard Compartment" + +/area/shuttle/intrepid/junction_compartment + name = "Intrepid Junction Compartment" + +/area/shuttle/intrepid/buffet + name = "Intrepid Buffet" /area/shuttle/intrepid/medical name = "Intrepid Medical Compartment" @@ -334,8 +343,8 @@ /area/shuttle/intrepid/port_storage name = "Intrepid Port Nacelle" -/area/shuttle/intrepid/cockpit - name = "Intrepid Cockpit" +/area/shuttle/intrepid/flight_deck + name = "Intrepid Flight Deck" /area/shuttle/canary name = "Canary" diff --git a/maps/sccv_horizon/code/sccv_horizon_shuttles.dm b/maps/sccv_horizon/code/sccv_horizon_shuttles.dm index 6fdd4482134..f1566116aa0 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/main_compartment, /area/shuttle/intrepid/cargo_bay, /area/shuttle/intrepid/medical, /area/shuttle/intrepid/engineering, /area/shuttle/intrepid/port_storage, /area/shuttle/intrepid/cockpit) + shuttle_area = list(/area/shuttle/intrepid/main_compartment, /area/shuttle/intrepid/port_compartment, /area/shuttle/intrepid/starboard_compartment, /area/shuttle/intrepid/junction_compartment, /area/shuttle/intrepid/buffet, /area/shuttle/intrepid/medical, /area/shuttle/intrepid/engineering, /area/shuttle/intrepid/port_storage, /area/shuttle/intrepid/flight_deck) 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 7031634c246..8915091d8b2 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -3021,12 +3021,6 @@ /turf/simulated/wall/elevator, /area/centcom/bar) "atZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ dir = 4 @@ -4471,7 +4465,7 @@ name = "starboard, cargo bay" }, /turf/simulated/wall/shuttle/scc, -/area/shuttle/intrepid/cargo_bay) +/area/shuttle/intrepid/buffet) "aFB" = ( /obj/effect/floor_decal/corner/mauve{ dir = 6 @@ -5169,11 +5163,10 @@ /turf/simulated/floor/tiled, /area/horizon/commissary) "aKh" = ( -/obj/effect/floor_decal/corner/brown{ - dir = 5 +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/intrepid/main_compartment) "aKn" = ( /obj/effect/floor_decal/corner_wide/purple/full{ @@ -5600,6 +5593,14 @@ }, /turf/simulated/floor/plating, /area/maintenance/research_port) +"aNS" = ( +/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/starboard_compartment) "aNT" = ( /obj/effect/floor_decal/corner_wide/purple{ dir = 4 @@ -7247,22 +7248,20 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "aYc" = ( -/obj/effect/floor_decal/industrial/hatch_door/yellow, -/obj/machinery/door/firedoor{ - req_one_access = list(24,11,67,73); - dir = 4 +/obj/structure/cable/green{ + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "2-4" }, /turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cargo_bay) +/area/shuttle/intrepid/junction_compartment) "aYe" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -9340,20 +9339,21 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) "blW" = ( -/obj/effect/floor_decal/corner/brown{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/structure/bed/handrail{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/effect/floor_decal/spline/plain/corner, -/obj/effect/floor_decal/spline/plain/corner/purple{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/structure/closet/walllocker/firecloset{ - pixel_x = 32 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/effect/floor_decal/corner/brown{ + dir = 9 }, -/obj/item/storage/bag/inflatable/emergency, /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/main_compartment) "bmc" = ( @@ -10115,25 +10115,10 @@ }, /area/horizon/holodeck/source_theatre) "brI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 4 - }, -/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/machinery/atmospherics/pipe/simple/hidden, /obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/shuttle/intrepid/main_compartment) "brN" = ( @@ -10201,9 +10186,6 @@ /area/rnd/conference) "brZ" = ( /obj/effect/floor_decal/corner/lime/diagonal, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -12672,11 +12654,22 @@ /turf/simulated/floor/grass/no_edge, /area/rnd/hallway/secondary) "bKa" = ( -/obj/structure/bed/stool/chair/shuttle, -/obj/machinery/light/small{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/railing/mapped{ dir = 1 }, -/turf/simulated/floor/tiled/dark/full, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/main_compartment) "bKj" = ( /obj/structure/foamedmetal, @@ -13253,12 +13246,6 @@ }, /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" @@ -13565,17 +13552,19 @@ /turf/simulated/floor, /area/maintenance/engineering_ladder) "bPT" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 10 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, -/obj/machinery/light/small{ +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/obj/structure/extinguisher_cabinet/south, +/obj/effect/floor_decal/spline/plain/black{ dir = 8 }, -/obj/machinery/computer/ship/navigation/terminal{ - dir = 1 - }, -/turf/simulated/floor/carpet/rubber, -/area/shuttle/intrepid/main_compartment) +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/junction_compartment) "bPX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -14521,10 +14510,9 @@ /area/horizon/library) "bWz" = ( /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, +/obj/machinery/portable_atmospherics/canister/empty, +/turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/engineering) "bWC" = ( /obj/structure/table/reinforced/steel, @@ -14775,12 +14763,12 @@ req_access = null; req_one_access = list(11, 24, 47, 65) }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, /obj/machinery/sleeper{ dir = 8 }, +/obj/structure/cable/green{ + icon_state = "0-8" + }, /turf/simulated/floor/tiled/white, /area/shuttle/intrepid/medical) "bYb" = ( @@ -17064,14 +17052,21 @@ /turf/simulated/floor/holofloor/lino, /area/horizon/holodeck/source_theatre) "con" = ( +/obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, -/area/shuttle/intrepid/cargo_bay) +/obj/structure/bed/handrail{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/buffet) "coo" = ( /obj/structure/cable{ icon_state = "1-2" @@ -17288,10 +17283,17 @@ /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) +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/sink/kitchen{ + dir = 4; + pixel_x = -21 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/buffet) "cpX" = ( /obj/structure/curtain/open/shower, /obj/machinery/shower{ @@ -18403,15 +18405,29 @@ /area/horizon/security/evidence_storage) "czS" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/cable/green{ - icon_state = "0-4" - }, +/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, /obj/machinery/power/apc/west{ req_access = null; req_one_access = list(11, 24, 47, 65) }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/camera/network/intrepid{ + dir = 1; + c_tag = "Intrepid - Buffet" + }, /turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cargo_bay) +/area/shuttle/intrepid/buffet) "czY" = ( /obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{ id = "psych" @@ -18692,12 +18708,29 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/hydroponics) "cCb" = ( -/obj/structure/bed/stool/chair/shuttle{ - dir = 1 +/obj/structure/table/reinforced/steel, +/obj/item/roller{ + pixel_x = -6 + }, +/obj/item/storage/box/bodybags{ + pixel_x = 7; + pixel_y = 10 + }, +/obj/item/storage/box/gloves{ + pixel_x = 7; + pixel_y = 1 + }, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -7; + pixel_y = 15 + }, +/obj/item/roller{ + pixel_x = -6 }, /obj/effect/floor_decal/corner/lime/diagonal, +/obj/machinery/firealarm/north, /turf/simulated/floor/tiled/white, -/area/shuttle/intrepid/main_compartment) +/area/shuttle/intrepid/medical) "cCd" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -18934,6 +18967,7 @@ /obj/machinery/iv_drip, /obj/item/clothing/mask/breath/medical, /obj/item/tank/oxygen, +/obj/item/device/radio/intercom/expedition/east, /turf/simulated/floor/tiled/white, /area/shuttle/intrepid/medical) "cEh" = ( @@ -19178,19 +19212,21 @@ /turf/simulated/floor/reinforced/airless, /area/horizon/exterior) "cFV" = ( -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/machinery/light/small{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, /obj/structure/bed/handrail{ - dir = 1 + dir = 4 }, -/obj/structure/sink{ - dir = 8; - pixel_x = -12 - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/intrepid/medical) +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/port_compartment) "cFW" = ( /obj/machinery/door/airlock/maintenance{ name = "Xenobiology Maintenance"; @@ -19524,6 +19560,27 @@ name = "overgrowth" }, /area/horizon/holodeck/source_moghes) +"cJm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/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{ + dir = 4 + }, +/obj/item/device/radio/intercom/expedition/north, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/port_compartment) "cJn" = ( /obj/structure/table/stone/marble, /obj/machinery/door/firedoor, @@ -19583,20 +19640,26 @@ /turf/simulated/floor, /area/tdome/tdome1) "cJx" = ( -/obj/effect/floor_decal/corner/brown{ - dir = 6 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,73); dir = 4 }, +/obj/effect/floor_decal/industrial/hatch_door/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, -/area/shuttle/intrepid/cargo_bay) +/obj/machinery/door/airlock/glass_service{ + dir = 8; + name = "Buffet" + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/buffet) "cJy" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -19614,6 +19677,11 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/hallway/engineering) +"cJB" = ( +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/machinery/light/small, +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/medical) "cJJ" = ( /obj/effect/map_effect/window_spawner/full/reinforced/firedoor, /obj/machinery/door/blast/shutters/open{ @@ -19732,10 +19800,6 @@ /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; @@ -19747,8 +19811,13 @@ id = "intrepid_bay_outer"; name = "Intrepid Shutter" }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "sccv_intrepid_port"; + name = "sccv_intrepid_port"; + req_one_access = null + }, /turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/main_compartment) +/area/shuttle/intrepid/port_compartment) "cKM" = ( /turf/simulated/wall/r_wall, /area/crew_quarters/heads/cmo) @@ -21895,15 +21964,22 @@ }, /area/shuttle/canary) "daD" = ( -/obj/effect/floor_decal/corner/dark_green/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 8 + dir = 6 }, -/obj/machinery/light/small{ - must_start_working = 1 +/obj/structure/bed/handrail{ + dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/main_compartment) +/turf/simulated/floor/plating, +/area/shuttle/intrepid/port_compartment) "daE" = ( /obj/effect/floor_decal/corner_wide/black/full, /obj/effect/floor_decal/industrial/warning{ @@ -23286,10 +23362,10 @@ /area/horizon/security/washroom) "dlv" = ( /obj/effect/floor_decal/corner/brown{ - dir = 9 + dir = 6 }, -/obj/effect/floor_decal/spline/plain/green{ - dir = 8 +/obj/effect/floor_decal/spline/plain/black{ + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/main_compartment) @@ -23554,17 +23630,15 @@ /turf/simulated/floor/tiled, /area/engineering/break_room) "dnR" = ( -/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/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/bluespace_beacon, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/intrepid/main_compartment) "dnS" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ @@ -26679,7 +26753,7 @@ dir = 4 }, /turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/cockpit) +/area/shuttle/intrepid/flight_deck) "dKg" = ( /obj/effect/floor_decal/corner/dark_green{ dir = 9 @@ -26821,7 +26895,7 @@ dir = 10 }, /turf/simulated/floor/reinforced, -/area/shuttle/intrepid/cockpit) +/area/shuttle/intrepid/flight_deck) "dLt" = ( /obj/machinery/ammunition_loader/francisca{ weapon_id = "Francisca Rotary Gun" @@ -27490,6 +27564,18 @@ /obj/item/hullbeacon/red, /turf/simulated/floor/reinforced/airless, /area/horizon/exterior) +"dQW" = ( +/obj/structure/bed/handrail{ + dir = 4 + }, +/obj/structure/bed/stool/bar/padded/red{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/junction_compartment) "dRe" = ( /obj/structure/closet/crate/freezer{ name = "Assorted Blood Packs" @@ -27568,9 +27654,19 @@ }, /area/centcom/shared_dream) "dRx" = ( -/obj/structure/bed/stool/chair/shuttle, +/obj/structure/bed/stool/chair/shuttle/double{ + pixel_x = -8; + dir = 1 + }, +/obj/structure/bed/stool/chair/shuttle/double{ + pixel_x = 8; + dir = 1 + }, +/obj/effect/floor_decal/spline/plain/cee/black{ + dir = 1 + }, /turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/main_compartment) +/area/shuttle/intrepid/starboard_compartment) "dRy" = ( /obj/structure/closet/emcloset, /obj/effect/floor_decal/corner/brown{ @@ -28137,21 +28233,16 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "dXh" = ( -/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, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/main_compartment) +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/junction_compartment) "dXk" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 10 @@ -28635,8 +28726,13 @@ /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ pixel_y = 23 }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "sccv_intrepid_port"; + name = "sccv_intrepid_port"; + req_one_access = null + }, /turf/simulated/floor/plating, -/area/shuttle/intrepid/main_compartment) +/area/shuttle/intrepid/port_compartment) "eaU" = ( /obj/structure/cable/green{ icon_state = "11-4" @@ -30898,15 +30994,8 @@ /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 = 8 - }, -/obj/machinery/computer/guestpass{ - pixel_y = 2; - pixel_x = -31 +/obj/effect/floor_decal/corner/brown{ + dir = 9 }, /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/main_compartment) @@ -32072,12 +32161,21 @@ /turf/simulated/floor/tiled, /area/maintenance/wing/port/far) "ezr" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/bed/handrail{ +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/item/device/gps/stationary/sccv_intrepid{ + pixel_x = -10; + pixel_y = 25 + }, +/obj/machinery/vending/wallmed1{ + pixel_x = 4; + pixel_y = 31; + req_access = null + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/full, -/area/shuttle/intrepid/main_compartment) +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/medical) "ezt" = ( /obj/machinery/light/small{ dir = 4 @@ -32712,12 +32810,22 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/security/armoury) "eEc" = ( -/obj/effect/floor_decal/corner/purple/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 8 }, -/obj/structure/extinguisher_cabinet/south, -/turf/simulated/floor/tiled/dark, +/obj/structure/bed/stool/chair/shuttle/double{ + pixel_x = 8 + }, +/obj/structure/bed/stool/chair/shuttle/double{ + pixel_x = -8 + }, +/obj/effect/floor_decal/spline/plain/black{ + dir = 1 + }, +/obj/machinery/alarm/east{ + req_one_access = list(11, 24, 47, 65) + }, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/intrepid/main_compartment) "eEi" = ( /obj/structure/railing/mapped, @@ -33605,12 +33713,6 @@ /obj/machinery/mech_recharger, /turf/simulated/floor/plating, /area/assembly/chargebay) -"eKr" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/hangar/intrepid) "eKs" = ( /obj/effect/floor_decal/corner_wide/purple{ dir = 6 @@ -33757,8 +33859,13 @@ pixel_y = -24; dir = 1 }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "sccv_intrepid_port"; + name = "sccv_intrepid_port"; + req_one_access = null + }, /turf/simulated/floor/plating, -/area/shuttle/intrepid/main_compartment) +/area/shuttle/intrepid/port_compartment) "eLr" = ( /obj/effect/floor_decal/corner/red/full{ dir = 4 @@ -33864,21 +33971,16 @@ /turf/simulated/floor/tiled/white, /area/medical/reception) "eNa" = ( -/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/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-8" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/main_compartment) +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/port_compartment) "eNb" = ( /obj/structure/cable{ icon_state = "4-8" @@ -34578,26 +34680,11 @@ /area/outpost/mining_main/refinery) "eSa" = ( /obj/effect/floor_decal/corner/brown{ - dir = 9 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 6 }, /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" = ( @@ -35147,6 +35234,15 @@ /obj/structure/bed/stool/chair/office/dark, /turf/simulated/floor/wood, /area/shuttle/merchant) +"eWo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 4 + }, +/obj/effect/floor_decal/corner/brown{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/starboard_compartment) "eWy" = ( /obj/structure/railing/mapped{ dir = 8 @@ -36676,8 +36772,8 @@ }, /obj/machinery/button/remote/airlock{ dir = 1; - id = "intrepid_cockpit"; - name = "Cockpit Bolts Control"; + id = "intrepid_flightdeck"; + name = "Flight Deck Bolts Control"; specialfunctions = 4; pixel_y = 6; pixel_x = 6 @@ -36702,7 +36798,7 @@ pixel_y = -5 }, /turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cockpit) +/area/shuttle/intrepid/flight_deck) "fgP" = ( /obj/machinery/vending/tacticool/ert, /turf/simulated/floor/shuttle/black, @@ -37040,14 +37136,20 @@ /turf/simulated/floor/tiled/white, /area/medical/ward) "fjA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/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" + icon_state = "2-4" }, -/turf/simulated/floor/tiled/dark/full, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/plating, /area/shuttle/intrepid/main_compartment) "fjB" = ( /obj/effect/floor_decal/corner/red{ @@ -38046,7 +38148,7 @@ }, /obj/structure/extinguisher_cabinet/north, /turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cockpit) +/area/shuttle/intrepid/flight_deck) "frA" = ( /obj/effect/floor_decal/spline/fancy/wood/cee{ dir = 8 @@ -39729,12 +39831,12 @@ /area/maintenance/engineering_ladder) "fFx" = ( /obj/effect/floor_decal/corner/lime/diagonal, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -39869,22 +39971,20 @@ }, /area/centcom/legion) "fGD" = ( -/obj/effect/floor_decal/corner/brown{ - dir = 9 - }, -/obj/structure/bed/handrail{ - dir = 4 - }, -/obj/effect/floor_decal/spline/plain/corner/green{ +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 8 }, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" +/obj/structure/bed/stool/chair/shuttle/double{ + pixel_x = -8 }, -/obj/machinery/power/apc/west{ - req_access = null; - req_one_access = list(11, 24, 47, 65) +/obj/effect/floor_decal/corner/brown{ + dir = 6 + }, +/obj/effect/floor_decal/spline/plain/black{ + dir = 5 + }, +/obj/structure/cable/green{ + icon_state = "4-8" }, /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/main_compartment) @@ -40385,6 +40485,9 @@ }, /turf/simulated/floor/tiled, /area/operations/mail_room) +"fKp" = ( +/turf/simulated/wall/shuttle/scc, +/area/shuttle/intrepid/port_compartment) "fKB" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/item/bikehorn/rubberducky{ @@ -40831,7 +40934,7 @@ name = "Intrepid Shutter" }, /turf/simulated/floor/plating, -/area/shuttle/intrepid/cockpit) +/area/shuttle/intrepid/flight_deck) "fNz" = ( /obj/machinery/power/smes/buildable/substation{ RCon_tag = "Substation - Deck 3 Command" @@ -40868,6 +40971,16 @@ }, /turf/simulated/floor/reinforced/airless, /area/template_noop) +"fOa" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/bed/handrail{ + dir = 4 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/starboard_compartment) "fOe" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -42157,13 +42270,20 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/horizon/security/firing_range) "fXy" = ( -/obj/structure/bed/stool/chair/shuttle, -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/machinery/alarm/north{ - req_one_access = list(24,11,47,65,73) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/turf/simulated/floor/tiled/white, -/area/shuttle/intrepid/main_compartment) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/port_compartment) "fXF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -42570,15 +42690,17 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard/far) "fZQ" = ( -/obj/effect/floor_decal/corner/brown{ - dir = 6 - }, -/obj/structure/bed/handrail{ +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 8 }, -/obj/effect/floor_decal/spline/plain/corner/purple, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 +/obj/structure/bed/stool/chair/shuttle/double{ + pixel_x = 8 + }, +/obj/effect/floor_decal/corner/brown{ + dir = 9 + }, +/obj/effect/floor_decal/spline/plain/black{ + dir = 9 }, /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/main_compartment) @@ -42644,14 +42766,22 @@ /turf/simulated/floor/tiled/white, /area/shuttle/hapt) "gar" = ( -/obj/machinery/meter{ - name = "Propellant Line" +/obj/effect/floor_decal/industrial/warning/corner, +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/cable/green{ + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ dir = 1 }, -/obj/structure/lattice/catwalk/indoor/grate/dark, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/engineering) "gas" = ( /turf/simulated/wall/r_wall, @@ -43744,6 +43874,18 @@ }, /turf/simulated/floor/shuttle/black, /area/shuttle/specops) +"gjh" = ( +/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/buffet) "gji" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 10 @@ -44205,9 +44347,11 @@ /obj/effect/floor_decal/industrial/warning{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/hidden, /obj/machinery/meter{ - name = "Airlock Reserve" + name = "Air Reserve" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 }, /turf/simulated/floor/plating, /area/shuttle/intrepid/engineering) @@ -46543,6 +46687,17 @@ }, /turf/simulated/floor, /area/maintenance/engineering_ladder) +"gDe" = ( +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,73); + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch_door/yellow, +/obj/machinery/computer/guestpass{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/port_compartment) "gDh" = ( /obj/structure/railing/mapped{ dir = 1 @@ -46946,6 +47101,23 @@ /obj/structure/engineer_maintenance/pipe, /turf/simulated/floor/tiled/white, /area/operations/lower/machinist/surgicalbay) +"gFC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/obj/structure/bed/handrail{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/starboard_compartment) "gFD" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 8 @@ -47200,6 +47372,19 @@ "gHl" = ( /turf/simulated/wall/r_wall, /area/horizon/hallway/deck_three/primary/central) +"gHm" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/obj/item/hullbeacon/red, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/structure/bed/handrail{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/shuttle/intrepid/main_compartment) "gHp" = ( /obj/structure/closet/secure_closet/cabinet{ anchored = 1; @@ -47620,26 +47805,19 @@ /turf/simulated/floor/holofloor/tiled, /area/horizon/holodeck/source_emptycourt) "gKh" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 +/obj/structure/cable/green{ + icon_state = "0-4" }, -/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/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/hatch_tiny/yellow, +/obj/machinery/atmospherics/binary/passive_gate/on{ + name = "Air Tank to Air Distribution" }, -/obj/item/stack/rods{ - amount = 50 +/obj/machinery/power/apc/west{ + req_access = null; + req_one_access = list(11, 24, 47, 65) }, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/item/stack/material/graphite/full, -/obj/item/stack/material/steel/full, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/engineering) "gKn" = ( /obj/effect/floor_decal/industrial/outline/grey, @@ -48200,20 +48378,21 @@ /turf/simulated/floor/tiled, /area/medical/paramedic) "gPe" = ( -/obj/effect/floor_decal/industrial/warning{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 8 }, /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/carpet/rubber, -/area/shuttle/intrepid/main_compartment) +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/obj/effect/floor_decal/spline/plain/black{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/junction_compartment) "gPf" = ( /obj/machinery/camera/network/engineering{ c_tag = "Engineering - Starboard Combustion Chamber"; @@ -48226,13 +48405,26 @@ /turf/simulated/floor/reinforced/airless, /area/engineering/atmos/propulsion/starboard) "gPk" = ( -/obj/effect/floor_decal/corner/brown{ - dir = 9 - }, -/obj/effect/floor_decal/spline/plain/blue{ +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/bed/stool/chair/shuttle/double{ + pixel_x = 8 + }, +/obj/effect/floor_decal/spline/plain/black{ + dir = 1 + }, +/obj/structure/bed/stool/chair/shuttle/double{ + pixel_x = -8 + }, +/obj/machinery/power/apc/west{ + req_access = null; + req_one_access = list(11, 24, 47, 65) + }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/intrepid/main_compartment) "gPm" = ( /obj/structure/foamedmetal, @@ -48316,6 +48508,12 @@ }, /turf/unsimulated/floor/wood, /area/antag/actor) +"gPN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 8 + }, +/turf/simulated/wall/shuttle/scc, +/area/shuttle/intrepid/port_compartment) "gPS" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -48734,7 +48932,7 @@ dir = 8 }, /turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/cockpit) +/area/shuttle/intrepid/flight_deck) "gSY" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -49739,6 +49937,19 @@ }, /turf/simulated/floor/tiled/dark, /area/centcom/spawning) +"haD" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/structure/bed/handrail{ + dir = 1 + }, +/obj/item/hullbeacon/green, +/turf/simulated/floor/reinforced, +/area/shuttle/intrepid/main_compartment) "haE" = ( /obj/effect/floor_decal/industrial/warning{ dir = 9 @@ -49986,7 +50197,7 @@ }, /obj/effect/overmap/visitable/ship/landable/intrepid, /turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cockpit) +/area/shuttle/intrepid/flight_deck) "hcr" = ( /turf/simulated/floor/carpet/red, /area/horizon/bar) @@ -51779,21 +51990,14 @@ /turf/simulated/floor/tiled/freezer, /area/operations/break_room) "hqg" = ( -/obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,73); dir = 4 }, -/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/main_compartment) +/obj/effect/floor_decal/industrial/hatch_door/yellow, +/obj/structure/curtain/open/medical, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/medical) "hqx" = ( /turf/unsimulated/floor{ dir = 4 @@ -52684,11 +52888,18 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/cafeteria) "hwA" = ( -/obj/structure/bed/stool/chair/shuttle{ - dir = 1 +/obj/structure/table/stone/marble, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,73); + dir = 4 + }, +/obj/machinery/door/blast/shutters{ + id = "intrepid_buffet"; + name = "Buffet Desk Shutter"; + dir = 4 }, /turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/main_compartment) +/area/shuttle/intrepid/buffet) "hwH" = ( /obj/effect/floor_decal/corner/dark_green{ dir = 6 @@ -52876,16 +53087,13 @@ /turf/simulated/floor/grass/no_edge, /area/horizon/hallway/deck_three/primary/port) "hxL" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/bed/handrail{ - dir = 4 +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/effect/floor_decal/spline/plain{ + dir = 1 }, -/obj/effect/floor_decal/industrial/hatch_tiny/yellow, -/obj/machinery/atmospherics/binary/passive_gate/on{ - name = "Air Tank to Air Distribution" - }, -/turf/simulated/floor/tiled/full, -/area/shuttle/intrepid/engineering) +/obj/structure/bed/handrail, +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/buffet) "hxM" = ( /obj/structure/table/wood, /obj/machinery/light, @@ -53233,17 +53441,11 @@ /turf/simulated/floor/carpet, /area/journalistoffice) "hBb" = ( -/obj/effect/map_effect/window_spawner/full/shuttle/scc{ - spawn_firedoor = 1; - spawn_grille = 1 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 }, -/obj/machinery/door/blast/shutters/open{ - dir = 8; - id = "intrepid_bay_windows"; - name = "Intrepid Shutter" - }, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engineering) +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/starboard_compartment) "hBd" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple, /obj/machinery/atmospherics/pipe/simple/visible/purple{ @@ -53358,10 +53560,9 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/bridge/meeting_room) "hBV" = ( -/obj/machinery/door/airlock/glass_medical{ - name = "Infirmary" - }, -/turf/simulated/floor/tiled/full, +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/white, /area/shuttle/intrepid/medical) "hBW" = ( /obj/structure/cable/green{ @@ -54603,7 +54804,7 @@ }, /obj/effect/floor_decal/industrial/outline/security, /turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cockpit) +/area/shuttle/intrepid/flight_deck) "hMm" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/closet/crate{ @@ -54981,6 +55182,17 @@ }, /turf/simulated/floor/plating, /area/engineering/bluespace_drive) +"hOT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/main_compartment) "hOV" = ( /obj/effect/floor_decal/corner_wide/grey/diagonal, /obj/machinery/light{ @@ -55146,14 +55358,33 @@ /turf/unsimulated/floor, /area/centcom/bar) "hPR" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 5 +/obj/machinery/alarm/east{ + req_one_access = list(11, 24, 47, 65) }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 +/obj/machinery/light/small{ + dir = 4 }, -/turf/simulated/floor/carpet/rubber, -/area/shuttle/intrepid/main_compartment) +/obj/structure/table/reinforced/steel, +/obj/machinery/recharger{ + pixel_x = 6 + }, +/obj/machinery/recharger{ + pixel_x = -5 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_x = 6; + pixel_y = 14 + }, +/obj/item/device/binoculars{ + pixel_x = -4; + pixel_y = 10 + }, +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/obj/effect/floor_decal/spline/plain/black{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/junction_compartment) "hPY" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 @@ -56846,12 +57077,11 @@ /turf/simulated/floor/holofloor/wood, /area/horizon/holodeck/source_sauna) "idU" = ( -/obj/effect/floor_decal/corner/purple/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 8 }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/main_compartment) +/turf/simulated/wall/shuttle/scc, +/area/shuttle/intrepid/starboard_compartment) "idV" = ( /obj/effect/map_effect/window_spawner/full/reinforced/firedoor, /turf/simulated/floor, @@ -57808,15 +58038,15 @@ /area/rnd/chemistry) "ilY" = ( /obj/effect/floor_decal/industrial/warning, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/hatch_tiny/yellow, +/obj/machinery/atmospherics/binary/pump/fuel{ + name = "Fuel Tank to Thrusters" + }, /obj/machinery/atmospherics/binary/pump{ name = "Air Reserve to Airlock Reserve"; dir = 4 }, -/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" = ( @@ -57828,18 +58058,19 @@ /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/door/blast/shutters/open{ dir = 8; id = "intrepid_bay_outer"; name = "Intrepid Shutter" }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "sccv_intrepid_port"; + name = "sccv_intrepid_port"; + req_one_access = null + }, /turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/main_compartment) +/area/shuttle/intrepid/port_compartment) "ime" = ( /obj/machinery/shieldgen, /obj/effect/floor_decal/industrial/outline/yellow, @@ -57902,11 +58133,16 @@ /turf/unsimulated/floor, /area/centcom/spawning) "imG" = ( -/obj/effect/floor_decal/industrial/loading/yellow{ - dir = 4 +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/alarm/north{ + req_one_access = list(11, 24, 47, 65) }, /turf/simulated/floor/plating, -/area/hangar/intrepid) +/area/shuttle/intrepid/port_compartment) "imJ" = ( /obj/machinery/door/airlock/glass_medical{ name = "Emergency Surgery"; @@ -59462,9 +59698,11 @@ }, /area/centcom/legion/hangar5) "iyc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/wall, -/area/hangar/control) +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 1 + }, +/turf/simulated/wall/shuttle/scc, +/area/shuttle/intrepid/engineering) "iyd" = ( /obj/machinery/light{ dir = 1 @@ -60959,19 +61197,15 @@ /turf/simulated/floor/tiled/dark/full, /area/crew_quarters/heads/hop/xo) "iJq" = ( -/obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/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, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/main_compartment) "iJr" = ( /obj/structure/bed/stool/chair/holochair{ @@ -62054,21 +62288,11 @@ /turf/simulated/floor/tiled, /area/operations/storage) "iQL" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1; - level = 2 +/obj/effect/floor_decal/corner/brown{ + dir = 1 }, -/obj/structure/bed/handrail{ - dir = 4 - }, -/obj/machinery/light/small/red{ - dir = 8 - }, -/obj/structure/table/reinforced/steel, -/obj/item/pipewrench, -/obj/item/hoist_kit, -/turf/simulated/floor/tiled/full, -/area/shuttle/intrepid/engineering) +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/starboard_compartment) "iQM" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 @@ -62778,6 +63002,15 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/maintenance/wing/starboard) +"iWG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/effect/floor_decal/corner/brown{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/starboard_compartment) "iWH" = ( /obj/effect/floor_decal/corner/dark_green{ dir = 6 @@ -63045,13 +63278,14 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/effect/map_effect/marker_helper/airlock/interior, /obj/effect/map_effect/marker/airlock{ master_tag = "sccv_intrepid_starboard"; - name = "sccv_intrepid_starboard" + name = "sccv_intrepid_starboard"; + req_one_access = null }, -/obj/effect/map_effect/marker_helper/airlock/interior, /turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/main_compartment) +/area/shuttle/intrepid/starboard_compartment) "iYt" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -63545,11 +63779,16 @@ /turf/simulated/floor/tiled, /area/horizon/commissary) "jcd" = ( -/obj/effect/floor_decal/corner/dark_green/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 8 +/obj/effect/floor_decal/spline/plain/black, +/obj/structure/bed/stool/chair/shuttle/double{ + pixel_x = 8; + dir = 1 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/bed/stool/chair/shuttle/double{ + pixel_x = -8; + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/intrepid/main_compartment) "jch" = ( /obj/structure/grille, @@ -63640,21 +63879,18 @@ /turf/simulated/floor/tiled, /area/operations/lobby) "jcD" = ( -/obj/effect/floor_decal/corner/brown/diagonal, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/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/main_compartment) +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/port_compartment) "jcN" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 @@ -63692,16 +63928,16 @@ /area/operations/lower/machinist) "jcV" = ( /obj/effect/floor_decal/corner/lime/diagonal, -/obj/machinery/vending/wallmed1{ - pixel_x = 4; - pixel_y = 31; - req_access = null +/obj/structure/sink{ + dir = 8; + pixel_x = -12 }, -/obj/item/device/gps/stationary/sccv_intrepid{ - pixel_x = -10; - pixel_y = 25 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, -/obj/structure/bed/handrail, +/obj/machinery/iv_drip, +/obj/item/clothing/mask/breath/medical, +/obj/item/tank/oxygen, /turf/simulated/floor/tiled/white, /area/shuttle/intrepid/medical) "jcZ" = ( @@ -63882,36 +64118,13 @@ /turf/unsimulated/floor/plating, /area/centcom/distress_prep) "jew" = ( -/obj/machinery/light/small{ - dir = 1 +/obj/effect/floor_decal/corner/brown/full, +/obj/machinery/camera/network/intrepid{ + dir = 1; + c_tag = "Intrepid - Starboard Compartment" }, -/obj/structure/table/reinforced/steel, -/obj/item/device/radio{ - pixel_x = 7; - pixel_y = 3 - }, -/obj/item/device/radio{ - pixel_x = -6; - pixel_y = 3 - }, -/obj/item/device/radio{ - pixel_x = -6; - pixel_y = 3 - }, -/obj/item/device/radio{ - pixel_x = -6; - pixel_y = 3 - }, -/obj/item/device/radio{ - pixel_x = 7; - pixel_y = 3 - }, -/obj/item/device/radio{ - pixel_x = 7; - pixel_y = 3 - }, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/main_compartment) +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/starboard_compartment) "jeD" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -64494,14 +64707,15 @@ /turf/space/dynamic, /area/template_noop) "jjk" = ( -/obj/effect/floor_decal/corner/brown/full{ - dir = 4 +/obj/structure/bed/stool/chair/shuttle{ + dir = 8 }, -/obj/effect/floor_decal/spline/plain{ +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/obj/effect/floor_decal/spline/plain/black{ dir = 4 }, /turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/main_compartment) +/area/shuttle/intrepid/junction_compartment) "jjn" = ( /obj/structure/shuttle_part/ccia{ icon_state = "3,4" @@ -65085,14 +65299,14 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, /obj/structure/cable/green{ icon_state = "1-8" }, -/turf/simulated/floor/carpet/rubber, -/area/shuttle/intrepid/main_compartment) +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/junction_compartment) "jny" = ( /obj/effect/floor_decal/corner{ dir = 4 @@ -66478,7 +66692,10 @@ "jxU" = ( /obj/effect/floor_decal/corner/lime/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, /obj/structure/cable/green{ icon_state = "4-8" @@ -67803,15 +68020,16 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "jHp" = ( -/obj/structure/bed/stool/chair/shuttle, -/obj/effect/floor_decal/industrial/warning/corner{ +/obj/structure/bed/stool/chair/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/obj/effect/floor_decal/spline/plain/black{ dir = 4 }, -/obj/structure/fuel_port/phoron/scc{ - pixel_y = 27 - }, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/main_compartment) +/obj/machinery/firealarm/east, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/junction_compartment) "jHu" = ( /obj/structure/tank_wall{ icon_state = "m-8" @@ -67889,22 +68107,10 @@ /area/centcom/legion/hangar5) "jIj" = ( /obj/effect/floor_decal/corner/brown{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 + dir = 9 }, /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" + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/main_compartment) @@ -69388,7 +69594,7 @@ name = "Intrepid Shutter" }, /turf/simulated/floor/plating, -/area/shuttle/intrepid/main_compartment) +/area/shuttle/intrepid/port_compartment) "jUr" = ( /obj/effect/map_effect/window_spawner/full/borosilicate/reinforced, /obj/machinery/door/blast/regular/open{ @@ -69559,12 +69765,32 @@ /turf/space/dynamic, /area/engineering/atmos/propulsion) "jVL" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/bed/handrail{ - dir = 4 +/obj/machinery/button/remote/blast_door{ + dir = 1; + id = "intrepid_buffet"; + name = "Desk Shutters"; + pixel_x = 8; + pixel_y = 29 + }, +/obj/structure/table/stone/marble, +/obj/machinery/appliance/cooker/oven/small{ + pixel_y = 13; + pixel_x = -5 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup{ + pixel_y = 21; + pixel_x = -2 + }, +/obj/item/reagent_containers/food/condiment/shaker/salt{ + pixel_x = 12; + pixel_y = 14 + }, +/obj/item/reagent_containers/food/condiment/shaker/peppermill{ + pixel_x = 12; + pixel_y = 9 }, /turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/main_compartment) +/area/shuttle/intrepid/buffet) "jVR" = ( /obj/effect/floor_decal/corner/dark_green{ dir = 9 @@ -70648,24 +70874,18 @@ /turf/simulated/floor/tiled/white, /area/rnd/lab) "kcW" = ( -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/manifold/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) +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/starboard_compartment) "kdb" = ( /obj/effect/floor_decal/corner/red{ dir = 9 @@ -71460,6 +71680,15 @@ }, /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/fitness/changing) +"kis" = ( +/obj/structure/lattice/catwalk/indoor, +/obj/effect/floor_decal/industrial/outline/red, +/obj/item/hullbeacon/green, +/obj/structure/bed/handrail{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/starboard_compartment) "kiw" = ( /obj/structure/lattice/catwalk, /obj/structure/ladder/up{ @@ -72264,9 +72493,16 @@ /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) "kol" = ( -/obj/effect/floor_decal/corner/dark_blue/diagonal, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/main_compartment) +/obj/structure/table/stone/marble, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,73) + }, +/obj/machinery/door/blast/shutters{ + id = "intrepid_buffet"; + name = "Buffet Desk Shutter" + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/buffet) "kop" = ( /obj/effect/floor_decal/corner/white/diagonal, /obj/effect/floor_decal/industrial/outline/grey, @@ -72376,13 +72612,13 @@ /turf/simulated/floor/tiled/full, /area/medical/washroom) "koV" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/light/small{ - dir = 8 +/obj/structure/bed/handrail{ + dir = 4 }, -/obj/machinery/firealarm/north, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cargo_bay) +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/buffet) "koW" = ( /obj/structure/bed/stool/chair/office/bridge, /turf/simulated/floor/tiled/dark, @@ -72540,7 +72776,7 @@ name = "Intrepid Shutter" }, /turf/simulated/floor/plating, -/area/shuttle/intrepid/cockpit) +/area/shuttle/intrepid/flight_deck) "kqw" = ( /obj/effect/landmark/entry_point/fore{ name = "fore, port ballast" @@ -72694,20 +72930,21 @@ /turf/simulated/floor/wood, /area/horizon/security/head_of_security) "krx" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/carpet/rubber, -/area/shuttle/intrepid/main_compartment) +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/obj/effect/floor_decal/spline/plain/black{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/junction_compartment) "krG" = ( /obj/structure/shuttle_part/scc/scout{ density = 0; @@ -74137,19 +74374,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/gen_treatment) -"kCb" = ( -/obj/effect/floor_decal/corner/brown{ - dir = 10 - }, -/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" @@ -75210,6 +75434,12 @@ }, /turf/simulated/floor/plating, /area/maintenance/research_port) +"kJH" = ( +/obj/effect/floor_decal/corner/brown{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/starboard_compartment) "kJK" = ( /obj/structure/table/steel, /obj/effect/decal/fake_object{ @@ -75812,17 +76042,25 @@ /turf/simulated/floor/tiled, /area/bridge/controlroom) "kOR" = ( -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 1 +/obj/effect/floor_decal/industrial/hatch_door/yellow{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,73) }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/door/airlock/hatch{ + name = "Starboard Nacelle" }, -/turf/simulated/floor/tiled, +/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{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/intrepid/engineering) "kOX" = ( /obj/structure/bed/stool/chair/office/bridge, @@ -76290,16 +76528,12 @@ /turf/simulated/floor/exoplanet/grass, /area/centcom/shared_dream) "kTh" = ( -/obj/structure/bed/handrail{ - dir = 1 - }, -/obj/machinery/camera/network/intrepid{ - dir = 1; - c_tag = "Intrepid - Cargo Hold" - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cargo_bay) +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/item/device/radio/intercom/expedition/west, +/obj/structure/table/stone/marble, +/obj/machinery/light/small, +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/buffet) "kTi" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 4 @@ -77281,12 +77515,20 @@ }, /area/centcom/ferry) "lbo" = ( -/obj/structure/bed/stool/chair/shuttle{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 }, -/obj/item/device/radio/intercom/expedition/south, /turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/main_compartment) +/area/shuttle/intrepid/starboard_compartment) "lbr" = ( /obj/effect/floor_decal/corner_wide/purple{ dir = 10 @@ -78022,10 +78264,9 @@ /turf/simulated/floor/tiled/dark, /area/engineering/aft_airlock) "lgN" = ( -/obj/structure/bed/stool/chair/shuttle, -/obj/item/device/radio/intercom/expedition/north, -/turf/simulated/floor/lino/diamond, -/area/shuttle/intrepid/main_compartment) +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/port_compartment) "lgP" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 6 @@ -79212,31 +79453,11 @@ /turf/unsimulated/floor, /area/centcom/bar) "lqO" = ( -/obj/machinery/door/airlock/glass_engineering{ - dir = 8; - name = "Engineering Compartment" - }, -/obj/effect/floor_decal/industrial/hatch_door/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ +/obj/machinery/atmospherics/unary/vent_scrubber/on{ 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) +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/main_compartment) "lqX" = ( /obj/structure/cable{ icon_state = "4-8" @@ -79782,9 +80003,26 @@ }, /area/antag/raider) "luZ" = ( -/obj/machinery/atmospherics/pipe/tank/carbon_dioxide/scc_shuttle, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/engineering) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/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{ + dir = 4 + }, +/obj/item/device/radio/intercom/expedition/north, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/starboard_compartment) "lvc" = ( /obj/machinery/door/window/brigdoor/southleft{ name = "AI Core Access"; @@ -80241,17 +80479,26 @@ /turf/simulated/floor/plating, /area/maintenance/wing/port/far) "lyN" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/firealarm/east, -/obj/structure/bed/handrail{ +/obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/dark/full, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/bed/handrail{ + dir = 8 + }, +/obj/machinery/alarm/south{ + req_one_access = list(11, 24, 47, 65) + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/engineering) "lyO" = ( /obj/structure/bed/stool/chair/sofa/corner/concave/brown{ @@ -80582,18 +80829,19 @@ /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" }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "sccv_intrepid_starboard"; + name = "sccv_intrepid_starboard"; + req_one_access = null + }, /turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/main_compartment) +/area/shuttle/intrepid/starboard_compartment) "lBE" = ( /obj/structure/closet/radiation, /obj/effect/floor_decal/industrial/outline/yellow, @@ -81719,7 +81967,6 @@ pixel_x = -8; pixel_y = 17 }, -/obj/machinery/firealarm/north, /obj/machinery/light/small{ dir = 4 }, @@ -82478,6 +82725,13 @@ }, /turf/simulated/floor/tiled/dark, /area/storage/eva) +"lNO" = ( +/obj/structure/bed/handrail{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/starboard_compartment) "lNR" = ( /obj/structure/table/wood, /obj/item/storage/box/fancy/cigarettes, @@ -83741,14 +83995,20 @@ /turf/simulated/floor/plating, /area/horizon/hallway/deck_three/primary/starboard/docks) "lWy" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 +/obj/effect/floor_decal/industrial/warning/corner, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 5 }, -/turf/simulated/floor/tiled/dark/full, +/obj/structure/bed/handrail{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/engineering) "lWz" = ( /obj/machinery/light{ @@ -84029,7 +84289,7 @@ name = "Intrepid Shutter" }, /turf/simulated/floor/plating, -/area/shuttle/intrepid/cockpit) +/area/shuttle/intrepid/flight_deck) "lZJ" = ( /obj/structure/lattice, /obj/structure/cable/green{ @@ -84405,17 +84665,18 @@ /turf/simulated/floor/plating, /area/maintenance/engineering_ladder) "mbZ" = ( -/obj/effect/floor_decal/corner/brown{ - dir = 9 - }, -/obj/effect/floor_decal/industrial/warning/corner{ +/obj/structure/bed/stool/chair/shuttle/double{ + pixel_x = -8; dir = 1 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 +/obj/structure/bed/stool/chair/shuttle/double{ + pixel_x = 8; + dir = 1 }, -/obj/machinery/firealarm/west, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/spline/plain/cee/black{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/intrepid/main_compartment) "mcc" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -86208,6 +86469,18 @@ }, /turf/simulated/floor/carpet, /area/journalistoffice) +"mpo" = ( +/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/medical) "mpr" = ( /obj/structure/window/shuttle/scc_space_ship, /obj/structure/grille, @@ -87185,15 +87458,13 @@ /turf/simulated/floor/tiled/dark, /area/horizon/longbow) "mwR" = ( -/obj/effect/floor_decal/corner/purple/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 8 +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, -/obj/machinery/light/small{ - must_start_working = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/main_compartment) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/medical) "mwZ" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 10 @@ -87729,7 +88000,7 @@ icon_state = "1-8" }, /turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/cockpit) +/area/shuttle/intrepid/flight_deck) "mBa" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 9 @@ -87945,21 +88216,12 @@ }, /area/centcom/control) "mCJ" = ( -/obj/structure/bed/stool/chair/shuttle{ - dir = 1 +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/effect/floor_decal/spline/plain{ + dir = 8 }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/camera/network/intrepid{ - dir = 1; - c_tag = "Intrepid - Engineering Compartment" - }, -/turf/simulated/floor/tiled/full, -/area/shuttle/intrepid/engineering) +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/buffet) "mCP" = ( /obj/effect/floor_decal/corner/grey{ dir = 5 @@ -88239,6 +88501,16 @@ /obj/effect/floor_decal/spline/plain/lime, /turf/simulated/floor/tiled/dark, /area/horizon/hydroponics/garden) +"mEL" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/railing/mapped, +/obj/effect/floor_decal/corner/brown{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/port_compartment) "mER" = ( /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plating, @@ -88269,16 +88541,22 @@ /turf/simulated/floor/tiled/dark, /area/engineering/engine_room/turbine) "mFo" = ( -/obj/effect/floor_decal/industrial/warning, +/obj/structure/platform_stairs/full{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/carpet/rubber, -/area/shuttle/intrepid/main_compartment) +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/junction_compartment) "mFv" = ( /obj/structure/holostool, /turf/simulated/floor/wood/maple, @@ -88693,14 +88971,18 @@ /turf/simulated/floor/tiled, /area/operations/office) "mIX" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/bed/handrail{ - dir = 4 +/obj/structure/bed/stool/chair/shuttle/double{ + pixel_x = -8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/universal, -/obj/machinery/power/portgen/basic, -/turf/simulated/floor/tiled/full, -/area/shuttle/intrepid/engineering) +/obj/structure/bed/stool/chair/shuttle/double{ + pixel_x = 8 + }, +/obj/effect/floor_decal/spline/plain/black{ + dir = 6 + }, +/obj/item/device/radio/intercom/expedition/north, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/starboard_compartment) "mJd" = ( /obj/structure/table/wood, /obj/item/flame/candle{ @@ -88886,7 +89168,7 @@ name = "Intrepid Shutter" }, /turf/simulated/floor/plating, -/area/shuttle/intrepid/main_compartment) +/area/shuttle/intrepid/port_compartment) "mLw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, /obj/structure/cable{ @@ -89480,6 +89762,20 @@ }, /turf/simulated/floor/reinforced/n20, /area/engineering/atmos/air) +"mPY" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/machinery/power/apc/north{ + req_one_access = list(11, 24, 47, 65); + req_access = null + }, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/port_compartment) "mPZ" = ( /obj/machinery/atmospherics/pipe/simple/visible/universal{ dir = 8 @@ -90083,6 +90379,18 @@ }, /turf/simulated/floor/plating, /area/maintenance/research_port) +"mVf" = ( +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/extinguisher_cabinet/west, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/port_compartment) "mVk" = ( /obj/structure/bed/stool/chair, /obj/effect/floor_decal/spline/fancy/wood{ @@ -91342,10 +91650,10 @@ /area/horizon/crew_quarters/fitness/showers) "neC" = ( /obj/effect/floor_decal/corner/brown{ - dir = 6 + dir = 9 }, -/obj/effect/floor_decal/spline/plain/purple{ - dir = 4 +/obj/effect/floor_decal/spline/plain/black{ + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/main_compartment) @@ -93896,10 +94204,10 @@ }, /obj/machinery/camera/network/intrepid{ dir = 8; - c_tag = "Intrepid - Cockpit" + c_tag = "Intrepid - Flight Deck" }, /turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cockpit) +/area/shuttle/intrepid/flight_deck) "nwz" = ( /obj/structure/table/glass{ table_reinf = "glass" @@ -94083,10 +94391,6 @@ /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; @@ -94098,8 +94402,13 @@ id = "intrepid_bay_outer"; name = "Intrepid Shutter" }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "sccv_intrepid_starboard"; + name = "sccv_intrepid_starboard"; + req_one_access = null + }, /turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/main_compartment) +/area/shuttle/intrepid/starboard_compartment) "nyv" = ( /obj/structure/table/reinforced/steel, /obj/random/tech_supply, @@ -94556,15 +94865,20 @@ /turf/unsimulated/floor/rubber_carpet, /area/centcom/control) "nBT" = ( -/obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/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/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/intrepid/main_compartment) "nBU" = ( /obj/effect/step_trigger/thrower/shuttle/south, @@ -94656,17 +94970,25 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/hangar/auxiliary) "nCH" = ( -/obj/effect/floor_decal/corner/brown{ - dir = 6 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/main_compartment) +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/bed/handrail{ + dir = 8 + }, +/obj/structure/closet/walllocker/medical/secure{ + name = "O- Blood Locker"; + pixel_x = 32 + }, +/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) "nCL" = ( /obj/effect/floor_decal/spline/plain/cee, /obj/effect/landmark/skrell_srom, @@ -95146,6 +95468,22 @@ }, /turf/simulated/floor/plating, /area/engineering/drone_fabrication) +"nGo" = ( +/obj/machinery/light/floor{ + dir = 8 + }, +/obj/structure/bed/handrail{ + 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, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/main_compartment) "nGB" = ( /obj/machinery/door/airlock/glass_security{ autoclose = 0; @@ -95170,16 +95508,10 @@ /area/horizon/security/brig) "nGF" = ( /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 - }, /turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/main_compartment) +/area/shuttle/intrepid/port_compartment) "nGV" = ( /obj/item/storage/box/zipties{ pixel_x = 6; @@ -95593,6 +95925,12 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/carpet/rubber, /area/operations/lower/machinist) +"nJs" = ( +/obj/effect/floor_decal/corner/brown{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/port_compartment) "nJt" = ( /obj/structure/shuttle_part/ccia{ icon_state = "12,2" @@ -95868,6 +96206,12 @@ /turf/simulated/floor/plating, /area/maintenance/engineering) "nME" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/bed/handrail{ + dir = 4 + }, /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 8 @@ -95875,12 +96219,6 @@ /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/engineering) "nMG" = ( @@ -97938,25 +98276,27 @@ /turf/simulated/floor/tiled, /area/horizon/crew_quarters/fitness/changing) "ocp" = ( -/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/effect/floor_decal/industrial/hatch_door/yellow{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/firedoor, -/obj/effect/floor_decal/industrial/hatch_door/yellow{ - dir = 8 +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,73) + }, +/obj/machinery/door/airlock/glass_command{ + dir = 1; + id_tag = "intrepid_flightdeck"; + name = "Intrepid Flight Deck"; + req_access = list(73) }, /turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/main_compartment) +/area/shuttle/intrepid/flight_deck) "oct" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -98896,7 +99236,7 @@ req_one_access = list(11, 73) }, /turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/cockpit) +/area/shuttle/intrepid/flight_deck) "oiw" = ( /obj/item/modular_computer/console/preset/engineering, /obj/effect/floor_decal/industrial/outline/yellow, @@ -99519,11 +99859,8 @@ }, /area/shuttle/legion) "onT" = ( -/obj/effect/floor_decal/corner/brown/full{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 +/obj/effect/floor_decal/corner/brown{ + dir = 6 }, /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/main_compartment) @@ -101549,9 +101886,18 @@ /turf/unsimulated/floor/plating, /area/antag/raider) "oDE" = ( -/obj/structure/bed/stool/chair/shuttle, -/obj/effect/floor_decal/corner/lime/diagonal, -/turf/simulated/floor/tiled/white, +/obj/structure/bed/stool/chair/shuttle/double{ + pixel_x = 8; + dir = 1 + }, +/obj/structure/bed/stool/chair/shuttle/double{ + pixel_x = -8; + dir = 1 + }, +/obj/effect/floor_decal/spline/plain/cee/black{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/intrepid/main_compartment) "oDL" = ( /turf/simulated/wall/shuttle/scc, @@ -102341,7 +102687,7 @@ /obj/effect/floor_decal/industrial/outline/security, /obj/item/device/radio/intercom/expedition/west, /turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cockpit) +/area/shuttle/intrepid/flight_deck) "oKK" = ( /obj/structure/cable{ icon_state = "4-8" @@ -104665,11 +105011,17 @@ /turf/unsimulated/floor, /area/centcom/legion/hangar5) "pcQ" = ( -/obj/machinery/light/small{ - dir = 1 +/obj/machinery/light/floor{ + dir = 4 }, -/obj/structure/bed/stool/chair/shuttle, -/turf/simulated/floor/lino/diamond, +/obj/structure/bed/handrail{ + dir = 8 + }, +/obj/structure/closet/walllocker/firecloset{ + pixel_x = 32 + }, +/obj/item/storage/bag/inflatable/emergency, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/intrepid/main_compartment) "pcX" = ( /obj/structure/window/shuttle/unique/mercenary/small{ @@ -105563,14 +105915,6 @@ /turf/simulated/floor, /area/horizon/maintenance/deck_three/aft/starboard) "piD" = ( -/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/machinery/access_button{ pixel_x = -7; pixel_y = 22 @@ -105586,6 +105930,20 @@ pixel_x = 6; pixel_y = 25 }, +/obj/structure/bed/stool/chair/shuttle/double{ + pixel_x = 8 + }, +/obj/structure/bed/stool/chair/shuttle/double{ + pixel_x = -8 + }, +/obj/effect/floor_decal/spline/plain/cee/black, +/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/main_compartment) @@ -106012,12 +106370,20 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/longbow) "pme" = ( -/obj/structure/bed/stool/chair/shuttle{ - dir = 1 +/obj/structure/lattice/catwalk/indoor/grate/dark, +/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{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/alarm/south, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/main_compartment) +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/starboard_compartment) "pmk" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -106408,14 +106774,12 @@ /turf/unsimulated/floor/plating, /area/centcom/spawning) "ppi" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 9 +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/obj/effect/floor_decal/spline/plain/black{ + dir = 8 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/carpet/rubber, -/area/shuttle/intrepid/main_compartment) +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/junction_compartment) "ppl" = ( /obj/effect/step_trigger/thrower/shuttle/southeast, /turf/template_noop, @@ -106494,8 +106858,8 @@ /obj/structure/bed/handrail{ dir = 8 }, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/main_compartment) +/turf/simulated/floor/plating, +/area/shuttle/intrepid/port_compartment) "ppI" = ( /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor, @@ -106520,16 +106884,17 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4 }, -/obj/effect/map_effect/marker/airlock{ - master_tag = "sccv_intrepid_starboard"; - name = "sccv_intrepid_starboard" - }, /obj/machinery/airlock_sensor{ pixel_y = -24; dir = 1 }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "sccv_intrepid_starboard"; + name = "sccv_intrepid_starboard"; + req_one_access = null + }, /turf/simulated/floor/plating, -/area/shuttle/intrepid/main_compartment) +/area/shuttle/intrepid/starboard_compartment) "ppU" = ( /obj/structure/ladder/up{ pixel_y = 13 @@ -108152,6 +108517,9 @@ }, /turf/simulated/floor/tiled/full, /area/operations/office_aux) +"pBP" = ( +/turf/simulated/wall/shuttle/scc, +/area/shuttle/intrepid/starboard_compartment) "pBR" = ( /turf/unsimulated/floor/wood, /area/centcom/evac) @@ -108815,6 +109183,15 @@ }, /turf/template_noop, /area/template_noop) +"pFR" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/effect/floor_decal/corner/brown{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/starboard_compartment) "pFT" = ( /obj/structure/railing/mapped{ dir = 1 @@ -109444,22 +109821,17 @@ /turf/simulated/floor/plating, /area/maintenance/wing/port/deck1) "pLV" = ( -/obj/structure/bed/stool/chair/shuttle{ - dir = 1 - }, +/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 = "0-2" + d1 = 1; + d2 = 2; + icon_state = "1-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) +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/port_compartment) "pMd" = ( /obj/structure/table/standard, /obj/item/autopsy_scanner{ @@ -111208,27 +111580,13 @@ /turf/space/dynamic, /area/horizon/exterior) "pYD" = ( -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/effect/floor_decal/industrial/warning{ +/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/fuel{ - dir = 4 - }, -/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) +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/port_compartment) "pYG" = ( /obj/effect/floor_decal/corner/mauve/full{ dir = 4 @@ -116085,10 +116443,14 @@ /turf/simulated/floor/bluegrid, /area/tdome) "qIS" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/light/small, -/obj/structure/bed/handrail{ - dir = 8 +/obj/effect/floor_decal/spline/plain/black, +/obj/structure/bed/stool/chair/shuttle/double{ + pixel_x = -8; + dir = 1 + }, +/obj/structure/bed/stool/chair/shuttle/double{ + pixel_x = 8; + dir = 1 }, /turf/simulated/floor/tiled/dark/full, /area/shuttle/intrepid/main_compartment) @@ -116293,6 +116655,15 @@ "qJR" = ( /turf/simulated/floor/wood, /area/hallway/primary/central_two) +"qJU" = ( +/obj/effect/floor_decal/corner/brown{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/main_compartment) "qJV" = ( /obj/machinery/light/small{ dir = 1 @@ -116828,13 +117199,13 @@ /turf/simulated/floor/lino, /area/chapel/main) "qOb" = ( -/obj/structure/bed/stool/chair/shuttle, -/obj/effect/floor_decal/corner/lime/diagonal, +/obj/machinery/firealarm/west, +/obj/machinery/appliance/cooker/stove, /obj/machinery/light/small{ dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/shuttle/intrepid/main_compartment) +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/buffet) "qOd" = ( /obj/structure/sink{ pixel_y = 16 @@ -119263,8 +119634,11 @@ /area/hangar/intrepid) "reg" = ( /obj/effect/floor_decal/corner/lime/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/tiled/white, -/area/shuttle/intrepid/main_compartment) +/area/shuttle/intrepid/medical) "rei" = ( /obj/structure/table/wood, /obj/item/paper_bin, @@ -119793,6 +120167,16 @@ }, /turf/simulated/floor/tiled, /area/engineering/lobby) +"rhY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/junction_compartment) "ric" = ( /obj/machinery/door/airlock/maintenance_hatch{ dir = 1 @@ -120408,6 +120792,29 @@ /obj/structure/railing/mapped, /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) +"rnB" = ( +/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/item/stack/material/graphite/full, +/obj/item/stack/material/steel/full, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/machinery/camera/network/intrepid{ + c_tag = "Intrepid - Port Compartment"; + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/port_compartment) "rnD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -121586,9 +121993,6 @@ /area/rnd/hallway) "rvR" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, /obj/machinery/power/smes/buildable/horizon_shuttle{ RCon_tag = "Intrepid" }, @@ -121598,8 +122002,8 @@ /obj/machinery/light/small{ dir = 1 }, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/main_compartment) +/turf/simulated/floor/plating, +/area/shuttle/intrepid/port_compartment) "rvU" = ( /obj/effect/floor_decal/corner_wide/green/full, /obj/machinery/light, @@ -122050,13 +122454,13 @@ /turf/simulated/floor/reinforced, /area/rnd/test_range) "rAg" = ( -/obj/effect/floor_decal/industrial/hatch_door/yellow, -/obj/machinery/door/firedoor{ - req_one_access = list(24,11,67,73); +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/effect/floor_decal/spline/plain/corner{ dir = 4 }, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cargo_bay) +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/buffet) "rAk" = ( /turf/unsimulated/floor{ icon_state = "wood" @@ -123354,7 +123758,7 @@ pixel_y = 1 }, /turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cockpit) +/area/shuttle/intrepid/flight_deck) "rLj" = ( /turf/simulated/floor/tiled/ramp/bottom{ dir = 1 @@ -124136,18 +124540,14 @@ /turf/simulated/floor/plating, /area/medical/cryo) "rRE" = ( -/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/atmospherics/pipe/simple/hidden/fuel{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" + icon_state = "2-8" }, /turf/simulated/floor/tiled/dark/full, /area/shuttle/intrepid/main_compartment) @@ -124448,15 +124848,17 @@ }, /obj/effect/map_effect/marker/airlock{ master_tag = "sccv_intrepid_port"; - name = "sccv_intrepid_port" + name = "sccv_intrepid_port"; + req_one_access = null }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/access_button{ - pixel_y = 26; - pixel_x = -32 + pixel_y = 29; + pixel_x = -7; + dir = 8 }, /turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/main_compartment) +/area/shuttle/intrepid/port_compartment) "rUb" = ( /obj/structure/window/reinforced/crescent{ dir = 8 @@ -124571,6 +124973,24 @@ temperature = 278.15 }, /area/medical/morgue/lower) +"rUZ" = ( +/obj/structure/bed/stool/chair/shuttle/double{ + pixel_x = -8 + }, +/obj/structure/bed/stool/chair/shuttle/double{ + pixel_x = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 1 + }, +/obj/effect/floor_decal/spline/plain/black{ + dir = 10 + }, +/obj/machinery/alarm/north{ + req_one_access = list(11, 24, 47, 65) + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/starboard_compartment) "rVa" = ( /obj/effect/floor_decal/spline/plain/corner{ dir = 8 @@ -125304,6 +125724,10 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenoarch_atrium) +"sbv" = ( +/obj/machinery/atmospherics/pipe/tank/carbon_dioxide/scc_shuttle, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/engineering) "sbC" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -127183,11 +127607,11 @@ /turf/simulated/floor/tiled, /area/hallway/primary/central_one) "spQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/dark/full, /area/shuttle/intrepid/main_compartment) "spU" = ( @@ -129269,12 +129693,13 @@ /turf/simulated/floor/tiled, /area/hallway/engineering) "sGo" = ( -/obj/effect/floor_decal/corner/brown/full, -/obj/effect/floor_decal/spline/plain/blue{ +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/obj/effect/floor_decal/spline/plain/black{ dir = 8 }, +/obj/effect/floor_decal/industrial/arrow/yellow, /turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/main_compartment) +/area/shuttle/intrepid/junction_compartment) "sGA" = ( /obj/structure/cable{ icon_state = "1-2" @@ -130792,12 +131217,22 @@ /turf/simulated/floor/tiled/dark, /area/bridge/aibunker) "sRH" = ( -/obj/effect/floor_decal/corner/brown/full{ - dir = 1 +/obj/structure/table/stone/marble, +/obj/random/pottedplant_small{ + pixel_y = -4; + pixel_x = -6 }, -/obj/structure/bed/handrail, -/turf/simulated/floor/tiled, -/area/shuttle/intrepid/cargo_bay) +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,73); + dir = 4 + }, +/obj/machinery/door/blast/shutters{ + id = "intrepid_buffet"; + name = "Buffet Desk Shutter"; + dir = 4 + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/buffet) "sRN" = ( /obj/structure/cable/green{ icon_state = "0-8" @@ -131294,16 +131729,13 @@ /turf/simulated/floor/carpet/rubber, /area/rnd/lab) "sWq" = ( -/obj/structure/closet/crate/field_kitchen, -/obj/item/tent, -/obj/item/tent, -/obj/item/tent/big/scc, -/obj/machinery/light/small{ +/obj/structure/bed/handrail{ dir = 4 }, /obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cargo_bay) +/obj/machinery/firealarm/south, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/starboard_compartment) "sWr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -131817,6 +132249,18 @@ /obj/item/trash/match, /turf/simulated/floor/marble, /area/horizon/holodeck/source_tribunal) +"taP" = ( +/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/starboard_compartment) "taS" = ( /obj/effect/floor_decal/corner{ dir = 9 @@ -131831,12 +132275,12 @@ /turf/unsimulated/floor/freezer, /area/centcom/distress_prep) "tbm" = ( -/obj/structure/bed/stool/chair/shuttle{ - dir = 1 +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/structure/bed/handrail{ + dir = 8 }, -/obj/machinery/light/small, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/main_compartment) +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/medical) "tbr" = ( /obj/structure/table/stone/marble, /obj/machinery/chemical_dispenser/bar_soft/full{ @@ -132411,34 +132855,21 @@ /turf/simulated/floor, /area/horizon/maintenance/deck_three/aft/starboard) "tfA" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 6 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, -/obj/machinery/alarm/east{ - req_one_access = list(11, 24, 47, 65) +/obj/structure/railing/mapped{ + dir = 8 }, -/obj/structure/table/reinforced/steel, -/obj/item/storage/toolbox/mechanical{ - pixel_x = 1; - pixel_y = 15 +/obj/structure/bed/handrail{ + dir = 1 }, -/obj/machinery/light/small{ +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/obj/effect/floor_decal/spline/plain/black{ 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) +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/junction_compartment) "tfB" = ( /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/sparsegrass, @@ -132663,16 +133094,10 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/maintenance/wing/starboard) "thu" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/bed/handrail{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister/oxygen, -/turf/simulated/floor/tiled/full, -/area/shuttle/intrepid/engineering) +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/structure/bed/roller, +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/medical) "thw" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/light/small/emergency, @@ -133123,6 +133548,18 @@ icon_state = "dark_preview" }, /area/centcom/spawning) +"tlx" = ( +/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{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/starboard_compartment) "tlz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -134492,17 +134929,14 @@ /turf/simulated/floor/plating, /area/maintenance/substation/engineering/lower) "tuR" = ( -/obj/effect/floor_decal/corner/brown{ - dir = 9 +/obj/structure/bed/handrail{ + dir = 1 }, -/obj/effect/floor_decal/spline/plain/blue{ +/obj/effect/floor_decal/corner/brown{ dir = 8 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, /turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/main_compartment) +/area/shuttle/intrepid/starboard_compartment) "tuS" = ( /obj/structure/table/reinforced/wood, /obj/machinery/chemical_dispenser/coffee/full{ @@ -134742,7 +135176,7 @@ dir = 6 }, /turf/simulated/floor/reinforced, -/area/shuttle/intrepid/cockpit) +/area/shuttle/intrepid/flight_deck) "twU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -134801,15 +135235,15 @@ /turf/simulated/floor/lino, /area/horizon/crew_quarters/lounge/bar) "txg" = ( -/obj/structure/bed/stool/chair/shuttle{ - dir = 1 +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/light/small, +/obj/machinery/power/apc/west{ + req_access = null; + req_one_access = list(11, 24, 47, 65) }, -/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) +/obj/structure/cable/green, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/junction_compartment) "txj" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 8 @@ -135552,30 +135986,13 @@ /turf/simulated/wall/r_wall, /area/bridge/upperdeck) "tDa" = ( -/obj/machinery/light/small{ - dir = 1 +/obj/machinery/firealarm/south, +/obj/machinery/computer/ship/navigation/terminal{ + dir = 8 }, -/obj/structure/table/reinforced/steel, -/obj/item/roller{ - pixel_x = -6 - }, -/obj/item/storage/box/bodybags{ - pixel_x = 7; - pixel_y = 10 - }, -/obj/item/storage/box/gloves{ - pixel_x = 7; - pixel_y = 1 - }, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -7; - pixel_y = 15 - }, -/obj/item/roller{ - pixel_x = -6 - }, -/turf/simulated/floor/tiled/full, -/area/shuttle/intrepid/main_compartment) +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/port_compartment) "tDb" = ( /obj/machinery/iv_drip, /obj/effect/floor_decal/corner_wide/green{ @@ -136494,28 +136911,20 @@ /turf/unsimulated/floor, /area/antag/raider) "tKf" = ( -/obj/effect/floor_decal/corner/brown{ - dir = 9 - }, -/obj/structure/bed/handrail{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/spline/plain/corner/blue{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/obj/effect/floor_decal/spline/plain/corner/green{ +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ 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; - c_tag = "Intrepid - Main Compartment" +/obj/effect/floor_decal/corner/brown{ + dir = 6 }, /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/main_compartment) @@ -138067,13 +138476,16 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenoarch_atrium) "tVf" = ( -/obj/structure/bed/stool/chair/shuttle{ - dir = 8 +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,73); + dir = 4 }, -/obj/effect/floor_decal/industrial/warning/corner, -/obj/item/device/radio/intercom/expedition/east, -/turf/simulated/floor/tiled/full, -/area/shuttle/intrepid/engineering) +/obj/effect/floor_decal/industrial/hatch_door/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/starboard_compartment) "tVj" = ( /obj/machinery/light, /obj/machinery/door/window/brigdoor/westright{ @@ -138331,14 +138743,14 @@ /turf/simulated/floor/tiled, /area/hangar/intrepid) "tXp" = ( -/obj/structure/bed/stool/chair/shuttle{ - dir = 1 +/obj/structure/bed/handrail{ + dir = 4 }, -/obj/machinery/light/small{ - must_start_working = 1 +/obj/structure/bed/stool/bar/padded/red{ + dir = 8 }, /turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/main_compartment) +/area/shuttle/intrepid/junction_compartment) "tXr" = ( /obj/machinery/light{ dir = 8 @@ -138655,19 +139067,13 @@ /turf/simulated/open/airless, /area/template_noop) "uab" = ( -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/alarm/south{ req_one_access = list(11, 24, 47, 65) }, -/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) +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/table/stone/marble, +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/buffet) "uac" = ( /obj/structure/cable/green{ icon_state = "0-2" @@ -139004,17 +139410,6 @@ }, /turf/simulated/floor/tiled/dark/full, /area/security/checkpoint2) -"ucB" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/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) "ucG" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 @@ -139144,13 +139539,14 @@ /area/horizon/hallway/deck_three/primary/starboard/docks) "udv" = ( /obj/effect/floor_decal/corner/brown{ - dir = 9 + dir = 6 }, -/obj/effect/floor_decal/spline/plain/green{ - dir = 8 +/obj/effect/floor_decal/spline/plain/black{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 8 +/obj/structure/bed/stool/chair/shuttle/double{ + pixel_x = -8; + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/main_compartment) @@ -143201,6 +143597,13 @@ }, /turf/simulated/floor/tiled/dark/full, /area/engineering/smes) +"uFN" = ( +/obj/random/pottedplant_small{ + pixel_y = -11; + pixel_x = -9 + }, +/turf/simulated/wall/shuttle/scc, +/area/shuttle/intrepid/buffet) "uFT" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -143577,10 +143980,17 @@ /turf/unsimulated/floor, /area/centcom/control) "uJi" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/bed/handrail, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/main_compartment) +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/extinguisher_cabinet/east, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/starboard_compartment) "uJk" = ( /obj/effect/floor_decal/corner/dark_blue/full{ dir = 4 @@ -143977,14 +144387,19 @@ /turf/simulated/floor/tiled, /area/operations/storage) "uLN" = ( -/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); + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/shuttle/intrepid/engineering) +/obj/structure/table/stone/marble, +/obj/machinery/door/blast/shutters{ + id = "intrepid_buffet"; + name = "Buffet Desk Shutter"; + dir = 4 + }, +/obj/machinery/power/outlet, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/buffet) "uLY" = ( /turf/simulated/floor/carpet/brown, /area/horizon/library) @@ -144252,6 +144667,14 @@ }, /turf/simulated/floor/tiled/full, /area/horizon/security/evidence_storage) +"uOP" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/bed/handrail{ + dir = 8 + }, +/obj/machinery/power/portgen/basic, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/port_compartment) "uOQ" = ( /obj/random/pottedplant, /obj/effect/floor_decal/spline/fancy/wood{ @@ -144498,23 +144921,20 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/skipjack) "uRe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 - }, /obj/machinery/light/small{ dir = 4 }, /obj/structure/bed/handrail{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, /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, +/obj/item/device/radio/intercom/expedition/east, +/turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/engineering) "uRf" = ( /obj/effect/map_effect/window_spawner/full/reinforced/indestructible, @@ -144631,13 +145051,20 @@ /turf/simulated/floor/reinforced, /area/crew_quarters/lounge) "uRV" = ( -/obj/effect/floor_decal/corner/brown{ - dir = 6 +/obj/structure/fuel_port/phoron/scc{ + pixel_y = 27 }, -/obj/effect/floor_decal/spline/plain{ +/obj/structure/bed/stool/chair/shuttle/double{ + pixel_x = -8 + }, +/obj/structure/bed/stool/chair/shuttle/double{ + pixel_x = 8 + }, +/obj/effect/floor_decal/spline/plain/cee/black, +/obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/intrepid/main_compartment) "uSc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel, @@ -144731,7 +145158,7 @@ /obj/effect/floor_decal/industrial/outline/security, /obj/machinery/light/small, /turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cockpit) +/area/shuttle/intrepid/flight_deck) "uSZ" = ( /obj/structure/lattice/catwalk, /turf/template_noop, @@ -144988,14 +145415,29 @@ /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 +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/bed/handrail{ + dir = 8 + }, +/obj/machinery/power/apc/east{ + req_access = null; + req_one_access = list(11, 24, 47, 65) + }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" }, -/obj/structure/curtain/open/medical, /turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/medical) +/area/shuttle/intrepid/starboard_compartment) "uVn" = ( /obj/vehicle/bike/speeder, /obj/effect/floor_decal/industrial/warning{ @@ -145135,21 +145577,17 @@ /turf/unsimulated/floor/plating, /area/antag/raider) "uWc" = ( -/obj/effect/floor_decal/corner/brown/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 4 +/obj/machinery/door/blast/shutters/open{ + dir = 8; + id = "intrepid_bay_windows"; + name = "Intrepid Shutter" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/effect/map_effect/window_spawner/full/shuttle/scc{ + spawn_firedoor = 1; + spawn_grille = 1 }, -/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) +/turf/simulated/floor/plating, +/area/shuttle/intrepid/port_compartment) "uWh" = ( /obj/effect/floor_decal/industrial/outline/blue, /obj/structure/table/rack, @@ -145771,15 +146209,17 @@ }, /obj/effect/map_effect/marker/airlock{ master_tag = "sccv_intrepid_starboard"; - name = "sccv_intrepid_starboard" + name = "sccv_intrepid_starboard"; + req_one_access = null }, /obj/effect/map_effect/marker_helper/airlock/interior, /obj/machinery/access_button{ - pixel_y = 26; - pixel_x = 32 + pixel_y = 29; + pixel_x = 7; + dir = 4 }, /turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/main_compartment) +/area/shuttle/intrepid/starboard_compartment) "vac" = ( /obj/effect/floor_decal/corner_wide/yellow/diagonal{ dir = 4 @@ -145843,6 +146283,10 @@ }, /turf/simulated/floor/shuttle/black, /area/shuttle/hapt) +"vaA" = ( +/obj/effect/floor_decal/corner/brown, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/port_compartment) "vaD" = ( /obj/effect/floor_decal/corner/yellow{ dir = 5 @@ -148634,11 +149078,10 @@ /turf/simulated/floor/tiled, /area/operations/break_room) "vvq" = ( -/obj/effect/floor_decal/corner/brown{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/shuttle/intrepid/cargo_bay) +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/buffet) "vvt" = ( /obj/structure/shuttle_part/ccia{ icon_state = "7,0"; @@ -149417,7 +149860,7 @@ req_one_access = list(11, 73) }, /turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/cockpit) +/area/shuttle/intrepid/flight_deck) "vBh" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -149713,15 +150156,16 @@ /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 }, +/obj/effect/map_effect/marker/airlock{ + master_tag = "sccv_intrepid_starboard"; + name = "sccv_intrepid_starboard"; + req_one_access = null + }, /turf/simulated/floor/plating, -/area/shuttle/intrepid/main_compartment) +/area/shuttle/intrepid/starboard_compartment) "vCX" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -150540,17 +150984,17 @@ /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/effect/floor_decal/industrial/hatch_door/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -150817,6 +151261,15 @@ /obj/effect/decal/fake_object/light_source/invisible, /turf/simulated/floor, /area/tdome/tdome2) +"vMm" = ( +/obj/structure/lattice/catwalk/indoor, +/obj/effect/floor_decal/industrial/outline/red, +/obj/structure/bed/handrail{ + dir = 4 + }, +/obj/item/hullbeacon/red, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/port_compartment) "vMB" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/cable{ @@ -152676,11 +153129,9 @@ /turf/simulated/floor/wood, /area/maintenance/wing/starboard) "wan" = ( -/obj/machinery/door/airlock/glass_mining{ - name = "Cargo Hold" - }, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cargo_bay) +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/buffet) "war" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/tcommsat/chamber) @@ -154960,23 +155411,6 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop/xo) -"wrl" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/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" @@ -156985,7 +157419,7 @@ }, /obj/effect/floor_decal/industrial/outline/security, /turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cockpit) +/area/shuttle/intrepid/flight_deck) "wFd" = ( /obj/structure/railing/mapped, /obj/effect/floor_decal/industrial/outline/emergency_closet, @@ -157504,12 +157938,9 @@ /turf/simulated/floor/tiled/dark, /area/engineering/engine_waste) "wIU" = ( -/obj/effect/floor_decal/corner/brown/full{ - dir = 8 - }, -/obj/structure/bed/handrail, -/turf/simulated/floor/tiled, -/area/shuttle/intrepid/cargo_bay) +/obj/structure/railing/mapped, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/main_compartment) "wIV" = ( /obj/effect/floor_decal/corner/grey{ dir = 10 @@ -158380,13 +158811,14 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/effect/map_effect/marker_helper/airlock/interior, /obj/effect/map_effect/marker/airlock{ master_tag = "sccv_intrepid_port"; - name = "sccv_intrepid_port" + name = "sccv_intrepid_port"; + req_one_access = null }, -/obj/effect/map_effect/marker_helper/airlock/interior, /turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/main_compartment) +/area/shuttle/intrepid/port_compartment) "wOU" = ( /turf/simulated/wall/shuttle/unique/ccia{ icon_state = "4,4" @@ -158577,7 +159009,7 @@ /area/centcom/legion/hangar5) "wQn" = ( /turf/simulated/wall/shuttle/scc, -/area/shuttle/intrepid/cargo_bay) +/area/shuttle/intrepid/buffet) "wQo" = ( /obj/structure/reagent_dispensers/keg/mead, /obj/effect/decal/cleanable/dirt, @@ -159784,13 +160216,14 @@ /area/centcom/evac) "wYT" = ( /obj/effect/floor_decal/corner/brown{ - dir = 6 + dir = 9 }, -/obj/effect/floor_decal/spline/plain/purple{ - dir = 4 +/obj/effect/floor_decal/spline/plain/black{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 8 +/obj/structure/bed/stool/chair/shuttle/double{ + pixel_x = 8; + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/main_compartment) @@ -161114,20 +161547,17 @@ /turf/simulated/floor/tiled/dark, /area/security/checkpoint2) "xhT" = ( -/obj/structure/bed/stool/chair/shuttle{ +/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{ - dir = 9 +/obj/machinery/door/airlock/glass_medical{ + name = "Infirmary" }, -/obj/machinery/alarm/east{ - req_one_access = list(11, 24, 47, 65) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/tiled/full, -/area/shuttle/intrepid/engineering) +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/medical) "xib" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -161996,7 +162426,7 @@ /obj/effect/floor_decal/corner/dark_blue/diagonal, /obj/structure/bed/stool/chair/office/bridge, /turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/cockpit) +/area/shuttle/intrepid/flight_deck) "xnP" = ( /obj/machinery/light/floor, /obj/machinery/camera/network/command{ @@ -162476,10 +162906,11 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "xrp" = ( -/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/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/machinery/bluespace_beacon, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -162984,17 +163415,18 @@ /turf/simulated/floor/plating, /area/maintenance/research_port) "xvk" = ( -/obj/effect/floor_decal/corner/brown{ - dir = 9 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, +/obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, -/area/shuttle/intrepid/cargo_bay) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/bed/handrail{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/buffet) "xvl" = ( /obj/machinery/light{ dir = 4 @@ -163862,6 +164294,15 @@ }, /turf/simulated/floor/tiled/white, /area/medical/ors) +"xBs" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/floor_decal/corner/brown{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/port_compartment) "xBJ" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 @@ -164390,7 +164831,7 @@ /area/centcom/control) "xFW" = ( /turf/simulated/wall/shuttle/scc, -/area/shuttle/intrepid/cockpit) +/area/shuttle/intrepid/flight_deck) "xGe" = ( /obj/machinery/door/airlock/engineering{ dir = 1; @@ -166634,17 +167075,12 @@ /turf/simulated/floor/tiled/dark, /area/hangar/intrepid) "xVW" = ( -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/structure/bed/handrail, -/obj/structure/closet/walllocker/medical/secure{ - name = "O- Blood Locker"; - pixel_y = 32 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 }, -/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) +/obj/effect/floor_decal/corner/brown, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/port_compartment) "xWb" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/effect/floor_decal/spline/plain{ @@ -167538,6 +167974,12 @@ /obj/item/flame/candle, /turf/simulated/floor/holofloor/wood, /area/horizon/holodeck/source_sauna) +"ycg" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/main_compartment) "ych" = ( /obj/machinery/light{ dir = 8 @@ -168870,7 +169312,7 @@ pixel_x = -7 }, /turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cockpit) +/area/shuttle/intrepid/flight_deck) "ykp" = ( /obj/machinery/light, /turf/unsimulated/floor{ @@ -169041,6 +169483,41 @@ /obj/random/pottedplant, /turf/simulated/floor/wood, /area/horizon/library) +"ylx" = ( +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,73) + }, +/obj/structure/table/stone/marble, +/obj/item/device/radio{ + pixel_x = -8; + pixel_y = 5 + }, +/obj/item/device/radio{ + pixel_x = -8; + pixel_y = 5 + }, +/obj/item/device/radio{ + pixel_x = -8; + pixel_y = 5 + }, +/obj/item/device/radio{ + pixel_x = -8; + pixel_y = 5 + }, +/obj/item/device/radio{ + pixel_x = -8; + pixel_y = 5 + }, +/obj/item/device/radio{ + pixel_x = -8; + pixel_y = 5 + }, +/obj/machinery/door/blast/shutters{ + id = "intrepid_buffet"; + name = "Buffet Desk Shutter" + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/buffet) "yly" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -199850,14 +200327,14 @@ iRC iRC iRC iRC -iRC -iRC -iRC -iRC -iRC -imG -imG -iRC +foG +taP +taP +taP +pBP +lBC +nyu +pBP iRC nWZ kEJ @@ -200108,18 +200585,18 @@ foG pbX foG foG -iRC -iRC -iRC -sql -lBC -nyu -sql -iRC -iRC -iRC +fOa +lNO +sWq +pBP +vCV +ppS +pBP +kis wQn wQn +gjh +gjh aFh wQn iRC @@ -200364,18 +200841,18 @@ ksN wCW nME gKh -foG +iyc +rUZ hBb -hBb -hBb -sql -vCV -ppS -sql -jUm -jUm -jUm +dRx +pBP +vab +iYp +pBP +taP wQn +qOb +cpV koV czS wQn @@ -200618,22 +201095,22 @@ xAe iRC uUx rfT -luZ +sbv ilY lWy -hxL +foG mIX -thu +eWo +kJH +pFR iQL -sql -vab -iYp -sql +iWG +pFR jew +uFN jVL -jVL -wQn -wIU +hxL +wan xvk kTh wQn @@ -200879,17 +201356,17 @@ sDd gmT gar kOR -uLN +pme kcW -pLV -sql +tlx +uVl uJi -daD -sql -cpV -kol -kol -wan +gFC +lbo +tuR +ylx +mCJ +rAg vvq con uab @@ -201129,27 +201606,27 @@ edp evm xkS cgf -iRC -foG +haD +sql jkq bWz uRe lyN -xhT +foG tVf -pYD -mCJ -sql -lgN -ucB -sql -bKa +aNS +aNS +idU +pBP +pBP +luZ +aNS kol hwA -wQn +uLN sRH cJx -sWq +wQn wQn lZI lZI @@ -201386,28 +201863,28 @@ edp aHY wuD qgo +sql +sql foG foG foG foG foG -foG -foG -foG +uRV lqO -foG +wIU +gPk +nGo +qIS +bKa +mbZ sql -pcQ -jcd -sql -dRx -kol +dQW +tXp tXp -wQn -rAg aYc -wQn -wQn +txg +xFW fgJ ykn uSU @@ -201650,21 +202127,21 @@ qyk xjL cqU iHi -eqw +qJU eSa -mbZ +onT fGD dlv udv tKf -tuR -gPk -sGo +onT jry +sGo +ppi ppi krx bPT -sql +xFW ois dJY xnF @@ -201908,17 +202385,17 @@ wnV nQH spQ aKh +hOT brI -hqg rRE xrp dnR fjA iJq nBT -kCb +rhY +rhY dXh -wrl jns mFo ocp @@ -202164,21 +202641,21 @@ tvu nxj qJb iHi -onT +eqw jIj -nGF +eqw fZQ neC wYT blW -nCH -uRV -jjk +eqw jry +jHp +jjk hPR gPe tfA -sql +xFW vBb gSU xnF @@ -202414,28 +202891,28 @@ edp aHY wuD jXx -aJI -aJI +sql +sql aJI aJI aJI aJI aJI piD -uWc -tbm -sql +ycg +wIU +eEc pcQ -idU -sql +jcd +bKa oDE -reg -txg bSh -uVl +bSh +bSh +bSh vJG -bSh -bSh +hqg +xFW fry wFb rLd @@ -202671,27 +203148,27 @@ edp fPt hMm xqY -iRC -aJI +gHm +sql aJI inf dyG otE aJI -jHp -uWc -lbo -sql -lgN -eEc -sql -qOb -reg -cCb +gDe +pYD +pYD +gPN +fKp +fKp +cJm +pYD bSh +cCb +thu jcV fFx -cFV +cJB bSh lZI lZI @@ -202937,16 +203414,16 @@ gZL nar jcD eNa -pme -sql -uJi -mwR -sql +pLV +cFV +mVf +daD fXy -reg +vaA +xhT reg hBV -hlh +mwR jxU yhm bSh @@ -203192,18 +203669,18 @@ rqa gMb oea aJI -rvR -ppH -qIS -sql -rTW -wOT -sql -tDa -ezr -ezr -bSh +mPY +lgN +nJs +xBs +nGF xVW +mEL +tDa +bSh +ezr +hlh +hlh brZ cEf bSh @@ -203449,17 +203926,17 @@ gBD qwt aHB aJI -jUm -mLu -jUm -sql -eaS -eLg -sql -jUm -jUm +imG +lgN +rnB +fKp +rTW +wOT +fKp jUm bSh +nCH +tbm lIM bYa bSh @@ -203706,18 +204183,18 @@ aJI mSD aJI aJI -iRC -eKr -iRC -sql -imc -cKK -sql -iRC -iRC -iRC +rvR +ppH +uOP +fKp +eaS +eLg +fKp +vMm bSh bSh +mpo +mpo fzG bSh iRC @@ -203962,14 +204439,14 @@ iRC iRC iRC iRC -iRC -iRC -eKr -iRC -iRC -bNV -bNV -iRC +aJI +jUm +mLu +uWc +fKp +imc +cKK +fKp iRC iRC iRC @@ -204987,7 +205464,7 @@ aWP vht vht vht -iyc +aWP aWP bCi bCi