diff --git a/html/changelogs/DreamySkrell-intrepid-transport-tweaks.yml b/html/changelogs/DreamySkrell-intrepid-transport-tweaks.yml new file mode 100644 index 00000000000..dc123035c52 --- /dev/null +++ b/html/changelogs/DreamySkrell-intrepid-transport-tweaks.yml @@ -0,0 +1,8 @@ + +author: DreamySkrell + +delete-after: True + +changes: + - rscadd: "Expands Intrepid passenger seating." + - rscadd: "Expands expedition supplies in the Intrepid hangar." diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index 1e92172f859..33d5da3468a 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -594,6 +594,15 @@ /obj/item/device/gps/mining{ pixel_x = 12 }, +/obj/item/device/gps{ + pixel_x = -6 + }, +/obj/item/device/gps/science{ + pixel_x = 3 + }, +/obj/item/device/gps/mining{ + pixel_x = 12 + }, /turf/simulated/floor/plating, /area/hangar/intrepid) "adz" = ( @@ -1233,9 +1242,6 @@ }, /area/shuttle/transport1) "ahI" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; id_tag = "intrepid_dock"; @@ -1243,6 +1249,8 @@ pixel_y = 28; req_one_access = list(74) }, +/obj/effect/floor_decal/industrial/outline/emergency_closet, +/obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/hangar/intrepid) "ahM" = ( @@ -1405,6 +1413,12 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/engineering_ladder) +"ajd" = ( +/obj/structure/shuttle_part/scc/research{ + icon_state = "16,10" + }, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/quarters) "ajg" = ( /obj/machinery/computer/message_monitor, /turf/simulated/floor/carpet/rubber, @@ -1558,6 +1572,13 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor, /area/horizon/hallway/deck_three/primary/port/docks) +"akt" = ( +/obj/structure/lattice/catwalk/indoor, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/hangar/intrepid) "akw" = ( /obj/machinery/atmospherics/binary/pump/high_power{ dir = 8; @@ -2177,6 +2198,23 @@ }, /turf/simulated/floor/tiled/dark/full, /area/engineering/engine_room/rust) +"anN" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/item/device/flashlight/lamp{ + pixel_y = 4 + }, +/obj/item/device/binoculars{ + pixel_x = 19 + }, +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/obj/structure/table/reinforced/steel, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/quarters) "aoh" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 @@ -4316,10 +4354,11 @@ /turf/simulated/floor/tiled, /area/hangar/operations) "aFx" = ( -/obj/structure/bed/stool/chair/shuttle, -/obj/item/device/radio/intercom/expedition/north, -/turf/simulated/floor/lino, -/area/shuttle/intrepid/crew_compartment) +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/turf/simulated/wall/shuttle/unique/scc/research{ + icon_state = "3,10" + }, +/area/shuttle/intrepid/quarters) "aFA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -4757,21 +4796,21 @@ /turf/simulated/floor/tiled, /area/bridge/bridge_crew) "aIP" = ( -/obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_x = 4; - pixel_y = 2 +/obj/structure/shuttle_part/scc/research{ + density = 0; + icon_state = "4,11"; + outside_part = 0 }, -/obj/item/pen{ - pixel_x = 4; - pixel_y = 2 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 }, -/obj/item/flame/candle{ - pixel_x = -7; - pixel_y = 3 +/obj/machinery/computer/ship/navigation{ + dir = 4 }, -/obj/item/device/radio/intercom/expedition/north, -/turf/simulated/floor/lino, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 + }, +/turf/simulated/floor/wood, /area/shuttle/intrepid/quarters) "aIS" = ( /obj/effect/floor_decal/spline/plain{ @@ -8311,15 +8350,12 @@ /turf/simulated/floor, /area/crew_quarters/heads/hop/xo) "bhi" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "3,12"; - outside_part = 0 - }, -/obj/structure/window/shuttle/unique/scc/tall{ - icon_state = "short1_top" +/obj/structure/lattice/catwalk/indoor, +/obj/machinery/light{ + dir = 4 }, /turf/simulated/floor/plating, -/area/shuttle/intrepid/quarters) +/area/hangar/intrepid) "bhq" = ( /obj/structure/shuttle_part/scc_space_ship{ icon_state = "d2-1" @@ -8665,11 +8701,20 @@ /turf/simulated/floor/tiled, /area/hangar/intrepid) "bjm" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "16,11" +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/closet/crate/plastic{ + name = "flags crate" }, +/obj/item/flag/scc, +/obj/item/flag/scc, +/obj/item/flag/scc, +/obj/item/flag/scc, +/obj/item/flag/scc/l, +/obj/item/flag/scc/l, +/obj/item/flag/scc, +/obj/item/flag/scc, /turf/simulated/floor/plating, -/area/shuttle/intrepid/crew_compartment) +/area/hangar/intrepid) "bjy" = ( /obj/structure/cable{ icon_state = "1-2" @@ -11860,17 +11905,17 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "bIt" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 }, -/obj/effect/floor_decal/corner/dark_blue/diagonal, -/obj/item/device/radio/intercom/expedition/hailing/east, -/obj/machinery/camera/network/intrepid{ - c_tag = "Intrepid - Crew Area"; - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" }, +/obj/effect/floor_decal/corner/dark_blue/diagonal, /turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/crew_compartment) +/area/shuttle/intrepid/quarters) "bIA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -14433,6 +14478,12 @@ }, /turf/unsimulated/floor, /area/antag/mercenary) +"cce" = ( +/obj/structure/shuttle_part/scc/research{ + icon_state = "16,11" + }, +/turf/simulated/floor/plating, +/area/shuttle/intrepid/quarters) "ccg" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -15116,6 +15167,19 @@ }, /turf/simulated/floor/holofloor/lino, /area/horizon/holodeck/source_theatre) +"chf" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 6 + }, +/obj/structure/bed/stool/chair/shuttle{ + dir = 8 + }, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/structure/railing/mapped, +/turf/simulated/floor/lino/diamond, +/area/shuttle/intrepid/quarters) "chp" = ( /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning{ @@ -16970,6 +17034,21 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor, /area/antag/mercenary) +"cvM" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/closet/crate{ + name = "tents crate" + }, +/obj/item/tent, +/obj/item/tent, +/obj/item/tent/big/scc, +/obj/item/tent, +/obj/item/tent, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/hangar/intrepid) "cvT" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -17302,6 +17381,27 @@ }, /turf/simulated/floor/tiled, /area/horizon/commissary) +"cyI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/bed/stool/chair/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/structure/railing/mapped{ + dir = 4 + }, +/turf/simulated/floor/lino/diamond, +/area/shuttle/intrepid/quarters) "cyK" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/effect/floor_decal/corner/dark_blue/full{ @@ -17409,12 +17509,57 @@ }, /turf/unsimulated/floor, /area/antag/mercenary) +"czB" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/structure/bed/handrail{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/quarters) "czP" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 5 }, /turf/simulated/floor/tiled/dark, /area/horizon/security/evidence_storage) +"czV" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/closet/crate{ + name = "tents crate" + }, +/obj/item/tent, +/obj/item/tent, +/obj/item/tent/big/scc, +/obj/item/tent, +/obj/item/tent, +/turf/simulated/floor/plating, +/area/hangar/intrepid) +"czX" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/structure/bed/stool/chair/shuttle{ + can_dismantle = 1; + dir = 4; + name = "worn chair" + }, +/obj/structure/railing/mapped{ + dir = 8 + }, +/turf/simulated/floor/lino, +/area/shuttle/intrepid/quarters) "czY" = ( /obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{ id = "psych" @@ -18241,10 +18386,10 @@ /turf/simulated/floor/tiled/white, /area/shuttle/hapt) "cIp" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 +/obj/structure/shuttle_part/scc/research{ + icon_state = "16,9" }, -/turf/simulated/floor/carpet/lightblue, +/turf/simulated/floor/plating, /area/shuttle/intrepid/quarters) "cIu" = ( /obj/effect/floor_decal/corner/dark_blue{ @@ -18912,9 +19057,17 @@ /turf/simulated/wall, /area/maintenance/substation/research) "cND" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "7,10" +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/obj/item/device/radio/intercom/expedition/hailing/east, +/obj/machinery/camera/network/intrepid{ + c_tag = "Intrepid - Crew Area"; + dir = 8 }, +/obj/effect/floor_decal/industrial/outline/grey, +/turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/quarters) "cNI" = ( /obj/machinery/vending/snack, @@ -19114,13 +19267,21 @@ /turf/unsimulated/floor/plating, /area/antag/raider) "cPw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "2-4" }, -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "8,13" +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/area/shuttle/intrepid/crew_compartment) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/bed/handrail{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/quarters) "cPy" = ( /obj/structure/closet/crate/drop{ name = "problemsolver crate" @@ -19407,6 +19568,15 @@ /obj/effect/floor_decal/corner/yellow, /turf/simulated/floor/tiled, /area/engineering/storage_eva) +"cRQ" = ( +/obj/effect/floor_decal/corner/black/full{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/hangar/intrepid) "cRX" = ( /obj/machinery/computer/security/nuclear, /turf/simulated/floor/shuttle/black, @@ -19991,10 +20161,18 @@ /turf/simulated/floor/tiled, /area/operations/office) "cVZ" = ( -/obj/machinery/hologram/holopad/long_range, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /obj/effect/floor_decal/corner/dark_blue/diagonal, /turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/cockpit) +/area/shuttle/intrepid/quarters) "cWa" = ( /obj/structure/window/shuttle/unique/scc/mining, /obj/machinery/door/firedoor, @@ -22180,8 +22358,19 @@ /area/teleporter) "dnl" = ( /obj/effect/floor_decal/industrial/outline/grey, -/obj/structure/closet/crate, -/obj/random/junk, +/obj/structure/closet/crate/plastic{ + name = "outdoor clothing crate" + }, +/obj/item/clothing/accessory/poncho/blue, +/obj/item/clothing/accessory/poncho/blue, +/obj/item/clothing/accessory/poncho/colorable/alt, +/obj/item/clothing/accessory/poncho/blue, +/obj/item/clothing/accessory/poncho/blue, +/obj/item/clothing/suit/storage/hooded/wintercoat/scc, +/obj/item/clothing/suit/storage/hooded/wintercoat/scc, +/obj/item/clothing/suit/storage/hooded/wintercoat/scc/alt, +/obj/item/clothing/suit/storage/hooded/wintercoat/scc, +/obj/item/clothing/suit/storage/hooded/wintercoat/scc, /turf/simulated/floor/plating, /area/hangar/intrepid) "dns" = ( @@ -22234,12 +22423,9 @@ /turf/simulated/floor/tiled/dark, /area/engineering/break_room) "dnX" = ( -/obj/machinery/alarm/north{ - req_one_access = list(24,11,47,65) - }, -/obj/structure/bed/stool/chair/shuttle, -/turf/simulated/floor/lino, -/area/shuttle/intrepid/crew_compartment) +/obj/effect/floor_decal/corner/dark_green, +/turf/simulated/floor/tiled/dark, +/area/hangar/intrepid) "dnZ" = ( /obj/machinery/light/small/emergency, /turf/simulated/open, @@ -23245,7 +23431,17 @@ }, /area/centcom/holding) "duz" = ( -/turf/simulated/wall/shuttle/unique/scc/research, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/obj/machinery/recharger{ + pixel_x = 6; + pixel_y = 3 + }, +/obj/machinery/light/small, +/obj/structure/table/reinforced/steel, +/turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/quarters) "duA" = ( /obj/machinery/alarm/north, @@ -25410,14 +25606,32 @@ /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) "dKn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/closet/cabinet, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/structure/coatrack{ + pixel_x = -14 }, -/obj/structure/cable/green{ - icon_state = "1-4" +/obj/machinery/power/apc/intrepid/north, +/obj/item/storage/box/snack{ + pixel_x = 1; + pixel_y = -3 + }, +/obj/item/clothing/suit/storage/hooded/wintercoat/scc, +/obj/item/tank/emergency_oxygen{ + pixel_x = -3 + }, +/obj/item/tank/emergency_oxygen{ + pixel_x = 5; + pixel_y = -2 + }, +/obj/item/clothing/mask/breath, +/obj/item/tent/big/scc, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 }, /turf/simulated/floor/wood, /area/shuttle/intrepid/quarters) @@ -25518,11 +25732,10 @@ /turf/simulated/floor/reinforced/carbon_dioxide, /area/engineering/atmos) "dLe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, /turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "3,10" + icon_state = "15,13" }, -/area/shuttle/intrepid/crew_compartment) +/area/shuttle/intrepid/quarters) "dLh" = ( /obj/structure/cable{ icon_state = "4-8" @@ -26436,19 +26649,11 @@ /turf/simulated/floor/tiled/white, /area/horizon/security/brig) "dSD" = ( -/obj/structure/shuttle_part/scc/research{ - density = 0; - icon_state = "4,11"; - outside_part = 0 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/machinery/computer/ship/navigation{ - dir = 4 +/obj/effect/floor_decal/corner/black{ + dir = 5 }, -/turf/simulated/floor/lino, -/area/shuttle/intrepid/quarters) +/turf/simulated/floor/tiled/dark, +/area/hangar/intrepid) "dSQ" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -26659,14 +26864,22 @@ /turf/simulated/floor/tiled/white, /area/medical/exam) "dVb" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,73) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/command{ + dir = 1; + name = "Fore Crew Compartment" + }, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner/dark_blue/diagonal, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/crew_compartment) +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/quarters) "dVf" = ( /obj/machinery/icecream_vat, /obj/effect/floor_decal/industrial/outline/grey, @@ -29370,18 +29583,17 @@ /turf/simulated/floor/carpet/rubber, /area/engineering/engine_monitoring/rust) "epr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - 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" + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/effect/floor_decal/corner/dark_blue{ + dir = 5 }, -/obj/effect/floor_decal/corner/dark_blue/diagonal, /turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/crew_compartment) +/area/shuttle/intrepid/quarters) "epB" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 @@ -30108,12 +30320,14 @@ }, /area/antag/mercenary) "euL" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "15,12"; - outside_part = 0 +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/light{ + dir = 8 }, /turf/simulated/floor/plating, -/area/shuttle/intrepid/crew_compartment) +/area/hangar/intrepid) "euR" = ( /obj/item/holomenu/holodeck, /turf/simulated/wall, @@ -30220,18 +30434,22 @@ /turf/simulated/floor/tiled, /area/operations/office_aux) "evr" = ( -/obj/machinery/light/small{ - dir = 8 +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = 4; + pixel_y = 2 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 +/obj/item/pen{ + pixel_x = 4; + pixel_y = 2 }, -/obj/structure/table/wood, -/obj/item/device/flashlight/lamp{ - pixel_y = 4 +/obj/item/flame/candle{ + pixel_x = -7; + pixel_y = 3 }, -/obj/item/device/binoculars{ - pixel_x = 3 +/obj/item/device/radio/intercom/expedition/north, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 }, /turf/simulated/floor/wood, /area/shuttle/intrepid/quarters) @@ -33513,13 +33731,10 @@ /turf/simulated/open/airless, /area/horizon/exterior) "eWJ" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 - }, -/obj/machinery/firealarm/north, -/obj/structure/bed/stool/chair/sofa/right/red, -/turf/simulated/floor/carpet/lightblue, -/area/shuttle/intrepid/quarters) +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/simulated/floor/plating, +/area/hangar/intrepid) "eWN" = ( /obj/structure/cable/green{ icon_state = "0-8" @@ -34217,18 +34432,11 @@ }, /area/antag/raider) "fbB" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +/obj/effect/floor_decal/spline/plain{ + dir = 6 }, -/obj/effect/floor_decal/corner/dark_blue/diagonal, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/crew_compartment) +/turf/simulated/floor/lino, +/area/shuttle/intrepid/quarters) "fbF" = ( /obj/structure/toilet{ dir = 8 @@ -38293,10 +38501,14 @@ /turf/simulated/floor/tiled, /area/hallway/engineering) "fIw" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "13,8" +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 8 }, -/area/shuttle/intrepid/crew_compartment) +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/turf/simulated/floor/lino, +/area/shuttle/intrepid/quarters) "fIy" = ( /obj/machinery/door/window/eastright, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ @@ -44040,21 +44252,11 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "gBq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/corner/dark_blue{ - dir = 6 - }, -/obj/structure/bed/handrail{ - dir = 8 +/obj/effect/floor_decal/industrial/warning{ + dir = 9 }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/cargo_bay) +/turf/simulated/floor/plating, +/area/hangar/intrepid) "gBv" = ( /obj/machinery/atmospherics/binary/pump/high_power{ dir = 4; @@ -44526,11 +44728,8 @@ /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "gED" = ( -/obj/machinery/light{ - dir = 8 - }, /obj/effect/floor_decal/industrial/warning{ - dir = 8 + dir = 1 }, /turf/simulated/floor/plating, /area/hangar/intrepid) @@ -48319,17 +48518,27 @@ /turf/simulated/floor/wood, /area/bridge) "hhb" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "16,13" +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/closet/crate/plastic{ + name = "warning cones crate" }, -/obj/structure/shuttle_part/scc/research{ - density = 0; - icon_state = "17,13"; - outside_part = 0; - pixel_x = 32 +/obj/item/clothing/head/cone, +/obj/item/clothing/head/cone, +/obj/item/clothing/head/cone, +/obj/item/clothing/head/cone, +/obj/item/clothing/head/cone, +/obj/item/clothing/head/cone, +/obj/item/clothing/head/cone, +/obj/item/clothing/head/cone, +/obj/item/clothing/head/cone, +/obj/item/clothing/head/cone, +/obj/item/clothing/head/cone, +/obj/item/clothing/head/cone, +/obj/machinery/light{ + dir = 4 }, /turf/simulated/floor/plating, -/area/shuttle/intrepid/crew_compartment) +/area/hangar/intrepid) "hhh" = ( /obj/effect/map_effect/window_spawner/full/reinforced/indestructible, /turf/simulated/floor, @@ -48381,13 +48590,13 @@ /turf/simulated/floor/carpet/rubber, /area/bridge/controlroom) "hhv" = ( -/obj/effect/floor_decal/corner/dark_green{ - dir = 10 - }, -/obj/effect/floor_decal/industrial/warning, /obj/machinery/light{ dir = 4 }, +/obj/effect/floor_decal/corner/dark_green/full{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/dark, /area/hangar/intrepid) "hhy" = ( @@ -48683,22 +48892,15 @@ /turf/simulated/floor/wood, /area/horizon/bar) "hkM" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/door/firedoor{ - req_one_access = list(24,11,67,73) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/command{ - dir = 1; - name = "Fore Crew Compartment" +/obj/structure/shuttle_part/scc/research{ + density = 0; + icon_state = "14,11"; + outside_part = 0 }, -/obj/structure/cable/green{ - icon_state = "1-2" +/turf/simulated/wall/shuttle/unique/scc/research{ + icon_state = "14,9" }, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/crew_compartment) +/area/shuttle/intrepid/quarters) "hkW" = ( /obj/machinery/door/airlock/external{ dir = 4; @@ -54635,10 +54837,11 @@ /turf/simulated/floor/plating, /area/maintenance/wing/port) "ihP" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "12,8" +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 8 }, -/area/shuttle/intrepid/crew_compartment) +/turf/simulated/floor/lino/diamond, +/area/shuttle/intrepid/quarters) "ihT" = ( /obj/effect/floor_decal/corner_wide/yellow{ dir = 6 @@ -60223,14 +60426,13 @@ /turf/simulated/floor/tiled/dark, /area/hallway/primary/central_one) "iYQ" = ( +/obj/machinery/firealarm/north, +/obj/structure/bed/stool/chair/shuttle, /obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/obj/structure/bed/handrail{ - dir = 1 + dir = 9 }, /turf/simulated/floor/lino, -/area/shuttle/intrepid/crew_compartment) +/area/shuttle/intrepid/quarters) "iYS" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/structure/cable{ @@ -62469,10 +62671,10 @@ /area/shuttle/intrepid/cockpit) "jpo" = ( /obj/structure/shuttle_part/scc/research{ - icon_state = "16,9" + icon_state = "16,12" }, /turf/simulated/floor/plating, -/area/shuttle/intrepid/crew_compartment) +/area/shuttle/intrepid/quarters) "jpq" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -64127,7 +64329,7 @@ /area/lawoffice/representative_two) "jBq" = ( /turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "9,10" + icon_state = "4,20" }, /area/shuttle/intrepid/quarters) "jBs" = ( @@ -64603,20 +64805,15 @@ /turf/simulated/floor/carpet/rubber, /area/tcommsat/entrance) "jEW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/bed/stool/chair/shuttle, +/obj/effect/floor_decal/spline/plain{ + dir = 1 }, -/obj/structure/platform_stairs/full/east_west_cap{ - dir = 8 +/obj/machinery/light/small{ + dir = 1 }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/crew_compartment) +/turf/simulated/floor/lino/diamond, +/area/shuttle/intrepid/quarters) "jEX" = ( /obj/structure/table/standard, /obj/item/paper_bin{ @@ -66556,6 +66753,23 @@ }, /turf/space/dynamic, /area/engineering/atmos/propulsion) +"jVP" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/table/steel, +/obj/item/device/flashlight{ + pixel_x = -4; + pixel_y = 20 + }, +/obj/item/device/flashlight{ + pixel_x = 4; + pixel_y = 12 + }, +/obj/item/device/flashlight{ + pixel_x = -4; + pixel_y = 4 + }, +/turf/simulated/floor/plating, +/area/hangar/intrepid) "jVR" = ( /obj/effect/floor_decal/corner/dark_green{ dir = 9 @@ -66676,17 +66890,11 @@ /turf/template_noop, /area/template_noop) "jWI" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/toilet{ - dir = 8 - }, -/obj/machinery/light/small{ - dir = 4 +/obj/structure/window/shuttle/unique/scc/tall{ + icon_state = "short1_top" }, -/turf/simulated/floor/tiled/freezer, -/area/shuttle/intrepid/crew_compartment) +/turf/simulated/floor/plating, +/area/shuttle/intrepid/quarters) "jWJ" = ( /obj/structure/railing/mapped, /turf/simulated/floor/tiled, @@ -67898,10 +68106,17 @@ }, /area/shuttle/intrepid/cargo_bay) "keA" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "14,10" +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 }, -/area/shuttle/intrepid/crew_compartment) +/obj/structure/bed/stool/chair/office/dark{ + dir = 8 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 7 + }, +/turf/simulated/floor/wood, +/area/shuttle/intrepid/quarters) "keI" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -67936,6 +68151,9 @@ "keZ" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/item/hoist_kit, +/obj/item/ladder_mobile{ + pixel_y = 12 + }, /obj/item/ladder_mobile{ pixel_y = 12 }, @@ -69089,11 +69307,20 @@ /turf/simulated/floor/tiled, /area/hallway/primary/aft) "knw" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "16,12" +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/closet/crate/plastic{ + name = "folding tables crate" }, +/obj/item/material/folding_table, +/obj/item/material/folding_table, +/obj/item/material/folding_table, +/obj/item/material/folding_table, +/obj/item/material/folding_table, +/obj/item/material/folding_table, +/obj/item/material/folding_table, +/obj/item/material/folding_table, /turf/simulated/floor/plating, -/area/shuttle/intrepid/crew_compartment) +/area/hangar/intrepid) "knL" = ( /obj/effect/floor_decal/corner/blue/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -69478,7 +69705,7 @@ /area/hangar/intrepid) "kqZ" = ( /turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "9,11" + icon_state = "13,8" }, /area/shuttle/intrepid/quarters) "krf" = ( @@ -71202,25 +71429,10 @@ /turf/simulated/floor/exoplanet/snow, /area/centcom/shared_dream) "kDt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/corner/dark_blue{ - dir = 5 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = -22; - pixel_y = 30 +/turf/simulated/wall/shuttle/unique/scc/research{ + icon_state = "14,10" }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/crew_compartment) +/area/shuttle/intrepid/quarters) "kDv" = ( /obj/machinery/door/blast/regular{ id = "thunderdomegen"; @@ -71376,17 +71588,11 @@ }, /area/centcom/evac) "kEg" = ( -/obj/machinery/door/airlock{ - dir = 4; - id_tag = "intrepid_washroom"; - name = "Washroom Compartment" - }, -/obj/machinery/door/firedoor{ - req_one_access = list(24,11,67,73); +/obj/effect/floor_decal/industrial/warning/cee{ dir = 4 }, -/turf/simulated/floor/tiled/freezer, -/area/shuttle/intrepid/crew_compartment) +/turf/simulated/floor/plating, +/area/hangar/intrepid) "kEk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -71489,13 +71695,11 @@ /turf/unsimulated/floor/plating, /area/tdome/tdomeobserve) "kES" = ( -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/corner/black/full{ dir = 8 }, -/obj/structure/window/reinforced, -/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/cargo_bay) +/area/hangar/intrepid) "kEW" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -71736,19 +71940,21 @@ /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/washroom/central) "kHa" = ( -/obj/item/tent, -/obj/item/sleeping_bag, -/obj/item/sleeping_bag, -/obj/item/sleeping_bag, -/obj/item/sleeping_bag, -/obj/structure/closet/crate, -/obj/item/material/stool/chair/folding/camping, -/obj/item/material/stool/chair/folding/camping, -/obj/item/material/stool/chair/folding/camping, -/obj/item/material/stool/chair/folding/camping, -/obj/item/material/folding_table, -/turf/simulated/floor/plating, -/area/hangar/intrepid) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/obj/structure/bed/handrail{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/quarters) "kHe" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 5 @@ -73536,10 +73742,11 @@ /turf/simulated/floor/bluegrid, /area/horizon/holodeck/source_trinary) "kVM" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "8,13" - }, -/area/shuttle/intrepid/crew_compartment) +/obj/machinery/hologram/holopad/long_range, +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/obj/effect/overmap/visitable/ship/landable/intrepid, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/cockpit) "kVN" = ( /obj/effect/floor_decal/corner/yellow{ dir = 6 @@ -73797,6 +74004,26 @@ /obj/effect/decal/cleanable/dirt, /turf/unsimulated/floor/plating, /area/centcom/legion) +"kYq" = ( +/obj/structure/closet/secure_closet/guncabinet{ + name = "Emergency Weaponry"; + req_access = list(73) + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/security, +/obj/item/gun/energy/laser/shotgun/research, +/obj/item/gun/energy/laser/shotgun/research, +/obj/item/clothing/accessory/holster/utility/machete, +/obj/item/clothing/accessory/holster/utility/machete, +/obj/item/material/hatchet/machete/steel, +/obj/item/material/hatchet/machete/steel, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/quarters) "kYs" = ( /obj/machinery/door/firedoor, /obj/effect/floor_decal/industrial/hatch/yellow, @@ -75126,10 +75353,15 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) "liI" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "9,12" +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, -/area/shuttle/intrepid/quarters) +/obj/structure/railing/mapped{ + dir = 1; + pixel_y = 8 + }, +/turf/simulated/floor/plating, +/area/hangar/intrepid) "liJ" = ( /obj/effect/floor_decal/corner/dark_green{ dir = 5 @@ -77302,6 +77534,12 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/horizon/hallway/deck_three/primary/port/docks) +"lAb" = ( +/obj/effect/floor_decal/corner/black/full{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/hangar/intrepid) "lAc" = ( /obj/effect/floor_decal/corner_wide/black{ dir = 10 @@ -79378,6 +79616,25 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/horizon/zat) +"lOY" = ( +/obj/structure/shuttle_part/scc/research{ + density = 0; + icon_state = "4,12"; + outside_part = 0 + }, +/obj/structure/table/wood, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/item/folder/blue{ + pixel_x = 8; + pixel_y = 1 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, +/turf/simulated/floor/wood, +/area/shuttle/intrepid/quarters) "lPe" = ( /obj/structure/table/wood, /turf/simulated/floor/holofloor/lino, @@ -79718,28 +79975,9 @@ /turf/simulated/floor/reinforced, /area/shuttle/canary) "lRu" = ( -/obj/structure/closet/secure_closet/guncabinet{ - name = "Emergency Weaponry"; - req_access = list(73) - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/outline/security, -/obj/item/gun/energy/laser/shotgun/research, -/obj/item/gun/energy/laser/shotgun/research, -/obj/item/clothing/accessory/holster/utility/machete, -/obj/item/clothing/accessory/holster/utility/machete, -/obj/item/material/hatchet/machete/steel, -/obj/item/material/hatchet/machete/steel, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/crew_compartment) +/obj/effect/floor_decal/spline/plain/corner, +/turf/simulated/floor/lino/diamond, +/area/shuttle/intrepid/quarters) "lRA" = ( /obj/structure/shuttle_part/scc_space_ship{ icon_state = "d3-1-f" @@ -83077,10 +83315,12 @@ pixel_y = 11 }, /obj/item/storage/box/flares{ - pixel_x = -6 + pixel_x = -6; + pixel_y = 2 }, /obj/item/storage/box/tethers{ - pixel_x = 8 + pixel_x = 8; + pixel_y = 2 }, /turf/simulated/floor/plating, /area/hangar/intrepid) @@ -85931,6 +86171,11 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/horizon/zat) +"mPp" = ( +/turf/simulated/wall/shuttle/unique/scc/research{ + icon_state = "12,8" + }, +/area/shuttle/intrepid/quarters) "mPr" = ( /obj/machinery/door/blast/shutters/open{ dir = 8; @@ -86275,24 +86520,19 @@ /turf/simulated/floor/tiled/dark, /area/storage/eva) "mSf" = ( -/obj/structure/shuttle_part/scc/research{ - density = 0; - icon_state = "4,12"; - outside_part = 0 - }, -/obj/structure/table/wood, -/obj/machinery/recharger{ - pixel_x = -8; - pixel_y = 6 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, -/obj/machinery/light/small{ - dir = 1 +/obj/machinery/alarm/west{ + req_one_access = list(24,11,47,65) }, -/obj/item/folder/blue{ - pixel_x = 8; - pixel_y = 1 +/obj/structure/bed/stool/chair/shuttle{ + can_dismantle = 1; + dir = 4; + name = "worn chair" }, -/turf/simulated/floor/lino, +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/quarters) "mSk" = ( /obj/effect/floor_decal/corner/dark_green{ @@ -87717,20 +87957,19 @@ /turf/unsimulated/floor, /area/antag/mercenary) "ncP" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 +/obj/structure/bed/stool/chair/shuttle{ + can_dismantle = 1; + dir = 4; + name = "worn chair" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/spline/plain{ dir = 10 }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = 20 +/obj/structure/railing/mapped{ + dir = 8 }, -/turf/simulated/floor/wood, +/obj/machinery/light/small, +/turf/simulated/floor/lino, /area/shuttle/intrepid/quarters) "ncQ" = ( /obj/structure/sign/flag/biesel{ @@ -88306,6 +88545,20 @@ /obj/machinery/firealarm/east, /turf/simulated/floor/tiled, /area/hallway/primary/central_two) +"nhr" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/closet/crate/tool, +/obj/random/tool, +/obj/random/tool, +/obj/random/tool, +/obj/random/tool, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tool, +/obj/random/tool, +/obj/item/cell, +/turf/simulated/floor/plating, +/area/hangar/intrepid) "nhw" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 9 @@ -90305,9 +90558,11 @@ /turf/simulated/floor/holofloor/grass, /area/horizon/holodeck/source_battlemonsters) "nyl" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "9,13" +/obj/structure/shuttle_part/scc/research{ + icon_state = "14,8" }, +/obj/item/hullbeacon/red, +/turf/simulated/floor/plating, /area/shuttle/intrepid/quarters) "nyn" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -93356,6 +93611,12 @@ }, /turf/simulated/floor/tiled/dark, /area/turret_protected/ai_upload_foyer) +"nVx" = ( +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/hangar/intrepid) "nVB" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 @@ -94177,14 +94438,18 @@ /turf/simulated/floor/tiled, /area/horizon/crew_quarters/fitness/changing) "ock" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, -/obj/structure/bed/stool/chair/office/dark{ +/obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/turf/simulated/floor/lino, -/area/shuttle/intrepid/quarters) +/obj/structure/railing/mapped{ + dir = 1; + pixel_y = 8 + }, +/turf/simulated/floor/plating, +/area/hangar/intrepid) "ocp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -96481,10 +96746,12 @@ }, /area/shuttle/specops) "ouI" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "7,10" +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/portables_connector/fuel{ + dir = 1 }, -/area/shuttle/intrepid/crew_compartment) +/turf/simulated/floor/reinforced, +/area/shuttle/intrepid/quarters) "ouL" = ( /obj/effect/floor_decal/corner/paleblue/diagonal{ dir = 8 @@ -97425,6 +97692,14 @@ "oCB" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/horizon/grauwolf) +"oCF" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 10 + }, +/obj/structure/railing/mapped, +/obj/item/device/radio/intercom/expedition/south, +/turf/simulated/floor/lino, +/area/shuttle/intrepid/quarters) "oCI" = ( /turf/simulated/wall/shuttle/unique/tcfl{ icon_state = "7,0" @@ -99566,6 +99841,9 @@ /obj/item/clothing/head/cone, /turf/simulated/floor/tiled/dark, /area/horizon/holodeck/source_pool) +"oTG" = ( +/turf/simulated/floor/lino/diamond, +/area/shuttle/intrepid/quarters) "oTK" = ( /obj/effect/floor_decal/corner/white{ dir = 5 @@ -99971,6 +100249,19 @@ /obj/structure/sign/flag/scc, /turf/simulated/floor/tiled, /area/bridge/controlroom) +"oXy" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/closet/crate{ + name = "materials crate" + }, +/obj/item/stack/material/plastic/full, +/obj/item/stack/material/plastic/full, +/obj/item/stack/material/steel/full{ + pixel_x = 4 + }, +/obj/item/stack/rods/full, +/turf/simulated/floor/plating, +/area/hangar/intrepid) "oXC" = ( /obj/effect/floor_decal/spline/plain/corner{ dir = 1 @@ -100864,15 +101155,17 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/legion) "pfa" = ( -/obj/structure/shuttle_part/scc/research{ - density = 0; - icon_state = "14,11"; - outside_part = 0 +/obj/machinery/light/small{ + dir = 4 }, -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "14,9" +/obj/structure/fuel_port/phoron/scc{ + pixel_x = 5; + pixel_y = 23 }, -/area/shuttle/intrepid/crew_compartment) +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/obj/structure/table/steel, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/quarters) "pfb" = ( /obj/vehicle/train/cargo/trolley, /obj/effect/floor_decal/corner/brown{ @@ -104154,10 +104447,16 @@ /area/maintenance/substation/command) "pCx" = ( /obj/structure/shuttle_part/scc/research{ - icon_state = "16,10" + icon_state = "16,13" + }, +/obj/structure/shuttle_part/scc/research{ + density = 0; + icon_state = "17,13"; + outside_part = 0; + pixel_x = 32 }, /turf/simulated/floor/plating, -/area/shuttle/intrepid/crew_compartment) +/area/shuttle/intrepid/quarters) "pCA" = ( /obj/machinery/vending/zora, /obj/machinery/light{ @@ -107756,6 +108055,11 @@ color = "#8f5847" }, /area/centcom/specops) +"qek" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/portable_atmospherics/canister/air, +/turf/simulated/floor/plating, +/area/hangar/intrepid) "qep" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 @@ -108353,6 +108657,19 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/aibunker) +"qiB" = ( +/obj/structure/extinguisher_cabinet/east, +/obj/structure/closet/walllocker/emerglocker/south, +/obj/structure/bed/stool/chair/shuttle{ + can_dismantle = 1; + dir = 8; + name = "worn chair" + }, +/obj/effect/floor_decal/spline/plain{ + dir = 6 + }, +/turf/simulated/floor/lino, +/area/shuttle/intrepid/quarters) "qiE" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -108719,6 +109036,12 @@ }, /turf/unsimulated/floor/plating, /area/shuttle/transport1) +"qlX" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/hangar/intrepid) "qma" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -108757,15 +109080,15 @@ /turf/simulated/floor/tiled, /area/bridge) "qmi" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/sink/kitchen{ +/obj/structure/bed/stool/chair/shuttle{ + can_dismantle = 1; dir = 8; - name = "sink"; - pixel_x = 21 + name = "worn chair" + }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 }, -/turf/simulated/floor/carpet/lightblue, +/turf/simulated/floor/lino, /area/shuttle/intrepid/quarters) "qmm" = ( /obj/item/device/flashlight/flare, @@ -108827,13 +109150,11 @@ /turf/simulated/floor/plating, /area/hangar/auxiliary) "qmJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 10 - }, -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "15,11" +/obj/effect/floor_decal/spline/plain{ + dir = 8 }, -/area/shuttle/intrepid/crew_compartment) +/turf/simulated/floor/lino, +/area/shuttle/intrepid/quarters) "qmN" = ( /turf/simulated/wall, /area/maintenance/substation/wing_starboard) @@ -109733,13 +110054,12 @@ }, /area/centcom/specops) "qtp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 10 }, -/obj/structure/cable/green{ - icon_state = "1-2" +/turf/simulated/wall/shuttle/unique/scc/research{ + icon_state = "15,11" }, -/turf/simulated/floor/lino, /area/shuttle/intrepid/quarters) "qtt" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -109802,6 +110122,21 @@ }, /turf/simulated/floor/tiled/full, /area/engineering/storage_hard) +"qub" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/closet/crate/plastic{ + name = "folding chairs crate" + }, +/obj/item/material/stool/chair/folding/camping, +/obj/item/material/stool/chair/folding/camping, +/obj/item/material/stool/chair/folding/camping, +/obj/item/material/stool/chair/folding/camping, +/obj/item/material/stool/chair/folding/camping, +/obj/item/material/stool/chair/folding/camping, +/obj/item/material/stool/chair/folding/camping, +/obj/item/material/stool/chair/folding/camping, +/turf/simulated/floor/plating, +/area/hangar/intrepid) "que" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -110535,27 +110870,18 @@ /turf/simulated/floor/tiled/dark, /area/horizon/bar/backroom) "qAj" = ( -/obj/machinery/shower{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, -/obj/machinery/button/remote/airlock{ - dir = 1; - id = "intrepid_washroom"; - name = "Door Bolt Control"; - pixel_x = 40; - pixel_y = 25; - specialfunctions = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/obj/structure/curtain/open/shower, -/obj/structure/closet/walllocker{ - pixel_y = 30 +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/obj/structure/cable/green{ + icon_state = "1-4" }, -/obj/random/soap, -/obj/item/storage/box/toothpaste, -/obj/item/towel, -/obj/item/towel, -/turf/simulated/floor/tiled/freezer, -/area/shuttle/intrepid/crew_compartment) +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/quarters) "qAp" = ( /obj/effect/decal/fake_object/light_source/invisible, /obj/structure/lattice/catwalk/indoor/grate, @@ -111178,10 +111504,15 @@ /turf/unsimulated/floor/plating, /area/centcom/bar) "qFc" = ( -/obj/structure/extinguisher_cabinet/east, -/obj/structure/closet/walllocker/emerglocker/south, +/obj/machinery/alarm/north{ + req_one_access = list(24,11,47,65) + }, +/obj/structure/bed/stool/chair/shuttle, +/obj/effect/floor_decal/spline/plain{ + dir = 5 + }, /turf/simulated/floor/lino, -/area/shuttle/intrepid/crew_compartment) +/area/shuttle/intrepid/quarters) "qFj" = ( /obj/item/stack/cable_coil, /obj/machinery/light, @@ -111218,8 +111549,8 @@ /turf/simulated/floor/exoplanet/grass, /area/centcom/shared_dream) "qFy" = ( -/obj/effect/floor_decal/corner/dark_green{ - dir = 6 +/obj/effect/floor_decal/corner/dark_green/full{ + dir = 4 }, /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -115422,12 +115753,17 @@ /turf/simulated/floor/tiled, /area/maintenance/wing/port) "rkl" = ( -/obj/structure/shuttle_part/scc/research{ - icon_state = "14,8" +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 8 }, -/obj/item/hullbeacon/red, -/turf/simulated/floor/plating, -/area/shuttle/intrepid/crew_compartment) +/obj/structure/bed/stool/chair/shuttle{ + can_dismantle = 1; + dir = 8; + name = "worn chair" + }, +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/quarters) "rkA" = ( /obj/effect/floor_decal/corner/red{ dir = 10 @@ -115755,12 +116091,11 @@ /turf/simulated/wall/r_wall, /area/turret_protected/ai) "rnM" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/atmospherics/portables_connector/fuel{ - dir = 1 +/obj/structure/window/shuttle/unique/scc/tall{ + icon_state = "short2_top" }, -/turf/simulated/floor/reinforced, -/area/shuttle/intrepid/crew_compartment) +/turf/simulated/floor/plating, +/area/shuttle/intrepid/quarters) "rnX" = ( /obj/structure/bed/roller, /obj/effect/floor_decal/industrial/outline/medical, @@ -117645,6 +117980,11 @@ }, /turf/simulated/floor/tiled/dark/full, /area/engineering/engine_room/rust) +"rCd" = ( +/obj/structure/window/reinforced, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/cargo_bay) "rCl" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{ dir = 1; @@ -119759,10 +120099,14 @@ /turf/simulated/floor/wood, /area/horizon/library) "rUH" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "11,8" +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 8 }, -/area/shuttle/intrepid/crew_compartment) +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/turf/simulated/floor/lino, +/area/shuttle/intrepid/quarters) "rUN" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 @@ -119849,6 +120193,15 @@ }, /turf/simulated/floor/tiled/dark, /area/storage/eva) +"rVr" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/table/steel, +/obj/item/storage/toolbox/emergency{ + pixel_x = 2; + pixel_y = 4 + }, +/turf/simulated/floor/plating, +/area/hangar/intrepid) "rVt" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -124312,6 +124665,15 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/xenobiology/xenological) +"sEv" = ( +/obj/effect/floor_decal/corner/black/full{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/hangar/intrepid) "sEw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -124669,6 +125031,18 @@ }, /turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_three/primary/starboard) +"sHi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 + }, +/turf/simulated/floor/wood, +/area/shuttle/intrepid/quarters) "sHk" = ( /obj/effect/floor_decal/corner/brown{ dir = 5 @@ -127830,35 +128204,11 @@ /turf/unsimulated/floor/plating, /area/centcom/ferry) "tfR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/closet/cabinet, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/coatrack{ - pixel_x = -14 - }, -/obj/machinery/power/apc/intrepid/north, -/obj/item/storage/box/snack{ - pixel_x = 1; - pixel_y = -3 - }, -/obj/item/clothing/suit/storage/hooded/wintercoat/scc, -/obj/item/tank/emergency_oxygen{ - pixel_x = -3 - }, -/obj/item/tank/emergency_oxygen{ - pixel_x = 5; - pixel_y = -2 +/obj/effect/floor_decal/corner/black{ + dir = 10 }, -/obj/item/clothing/mask/breath, -/obj/item/tent/big/scc, -/turf/simulated/floor/lino, -/area/shuttle/intrepid/quarters) +/turf/simulated/floor/tiled/dark, +/area/hangar/intrepid) "tge" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -131794,10 +132144,14 @@ /turf/simulated/floor/wood, /area/horizon/cafeteria) "tLo" = ( -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "15,13" +/obj/effect/floor_decal/corner/black{ + dir = 5 }, -/area/shuttle/intrepid/crew_compartment) +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/hangar/intrepid) "tLp" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/machinery/atmospherics/portables_connector{ @@ -133210,18 +133564,20 @@ /turf/simulated/floor/shuttle/black, /area/shuttle/distress) "tVv" = ( -/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{ - icon_state = "1-2" +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/closet/crate/plastic{ + name = "folding chairs and tables crate" }, -/obj/structure/closet/walllocker/emerglocker/west, -/obj/effect/floor_decal/corner/dark_blue/diagonal, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/crew_compartment) +/obj/item/material/folding_table, +/obj/item/material/folding_table, +/obj/item/material/folding_table, +/obj/item/material/folding_table, +/obj/item/material/stool/chair/folding/camping, +/obj/item/material/stool/chair/folding/camping, +/obj/item/material/stool/chair/folding/camping, +/obj/item/material/stool/chair/folding/camping, +/turf/simulated/floor/plating, +/area/hangar/intrepid) "tVw" = ( /obj/machinery/light/small/emergency{ dir = 1 @@ -135056,6 +135412,9 @@ /obj/effect/floor_decal/corner/dark_green{ dir = 6 }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/hangar/intrepid) "ujD" = ( @@ -135310,13 +135669,10 @@ /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) "uli" = ( -/obj/machinery/firealarm/north, -/obj/effect/floor_decal/spline/plain{ - dir = 8 +/turf/simulated/wall/shuttle/unique/scc/research{ + icon_state = "6,16" }, -/obj/structure/bed/stool/chair/shuttle, -/turf/simulated/floor/lino, -/area/shuttle/intrepid/crew_compartment) +/area/shuttle/intrepid/quarters) "ull" = ( /obj/structure/table/wood, /obj/effect/floor_decal/corner/white/diagonal, @@ -140121,25 +140477,12 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/legion) "uVF" = ( -/obj/machinery/door/airlock/command{ - dir = 4; - name = "Crew Quarters and Office" - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/door/firedoor{ - req_one_access = list(24,11,67,73); - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/closet/walllocker/emerglocker/north, +/obj/structure/bed/stool/chair/shuttle, +/obj/effect/floor_decal/spline/plain{ + dir = 9 }, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/lino, /area/shuttle/intrepid/quarters) "uVI" = ( /obj/structure/bed/stool{ @@ -142542,6 +142885,14 @@ pixel_x = 6; pixel_y = 5 }, +/obj/item/device/radio{ + pixel_x = -7; + pixel_y = 5 + }, +/obj/item/device/radio{ + pixel_x = 6; + pixel_y = 5 + }, /turf/simulated/floor/plating, /area/hangar/intrepid) "vmM" = ( @@ -143222,10 +143573,16 @@ /turf/simulated/floor/carpet/red, /area/horizon/library) "vrz" = ( -/obj/structure/bed/stool/chair/sofa/left/red, -/obj/item/device/radio/intercom/north, -/turf/simulated/floor/carpet/lightblue, -/area/shuttle/intrepid/quarters) +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning/corner, +/obj/structure/railing/mapped{ + dir = 1; + pixel_y = 8 + }, +/turf/simulated/floor/plating, +/area/hangar/intrepid) "vrH" = ( /obj/structure/curtain/open/shower/security, /obj/effect/floor_decal/spline/fancy/wood{ @@ -143260,26 +143617,17 @@ /turf/simulated/floor/tiled, /area/horizon/security/equipment) "vrO" = ( -/obj/effect/overmap/visitable/ship/landable/intrepid, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/structure/fuel_port/phoron/scc{ - pixel_x = 5; - pixel_y = 23 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -2; + pixel_y = 26 }, -/obj/effect/floor_decal/corner/dark_blue/diagonal, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/bed/stool/chair/shuttle, +/obj/effect/floor_decal/spline/plain{ + dir = 5 }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/crew_compartment) +/turf/simulated/floor/lino, +/area/shuttle/intrepid/quarters) "vrQ" = ( /obj/effect/floor_decal/corner/dark_blue/full{ dir = 4 @@ -148501,6 +148849,21 @@ }, /turf/simulated/floor/shuttle/black, /area/shuttle/mercenary) +"wiA" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/closet/crate/plastic{ + name = "camping crate" + }, +/obj/item/sleeping_bag, +/obj/item/sleeping_bag, +/obj/item/sleeping_bag, +/obj/item/sleeping_bag, +/obj/item/sleeping_bag, +/obj/item/sleeping_bag, +/obj/item/tent, +/obj/item/tent, +/turf/simulated/floor/plating, +/area/hangar/intrepid) "wiE" = ( /obj/structure/railing/mapped{ dir = 4 @@ -148678,27 +149041,25 @@ /turf/unsimulated/floor/plating, /area/centcom/specops) "wjM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ +/obj/effect/floor_decal/spline/plain, +/obj/item/device/radio/intercom/expedition/south, +/turf/simulated/floor/lino/diamond, +/area/shuttle/intrepid/quarters) +"wjU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "4,20" - }, -/area/shuttle/intrepid/crew_compartment) -"wjU" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 +/obj/effect/floor_decal/corner/dark_blue/diagonal, +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/structure/bed/stool/chair/office/dark{ +/obj/structure/bed/handrail{ dir = 4 }, -/obj/machinery/alarm/west{ - req_one_access = list(24,11,47,65) - }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/shuttle/intrepid/quarters) "wjV" = ( /obj/machinery/light/small/red{ @@ -150737,6 +151098,9 @@ }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) +"wxW" = ( +/turf/simulated/floor/tiled/dark/full, +/area/hangar/intrepid) "wxX" = ( /obj/effect/floor_decal/corner/red/full{ dir = 4 @@ -151279,16 +151643,11 @@ /turf/simulated/floor/tiled, /area/operations/lobby) "wBD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/turf/simulated/wall/shuttle/unique/scc/research{ - icon_state = "6,23" +/obj/effect/floor_decal/corner/black{ + dir = 4 }, -/area/shuttle/intrepid/crew_compartment) +/turf/simulated/floor/tiled/dark, +/area/hangar/intrepid) "wBE" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -151655,6 +152014,12 @@ icon_state = "white" }, /area/centcom/holding) +"wDZ" = ( +/obj/effect/floor_decal/corner/black{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/hangar/intrepid) "wEd" = ( /obj/effect/floor_decal/corner/mauve{ dir = 10 @@ -155360,6 +155725,12 @@ /obj/structure/sign/electricshock, /turf/unsimulated/wall/darkshuttlewall, /area/centcom/bar) +"xeb" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/plating, +/area/hangar/intrepid) "xed" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -156355,6 +156726,19 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos) +"xls" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/corner/dark_blue{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/cargo_bay) "xlt" = ( /obj/effect/floor_decal/spline/plain{ dir = 5 @@ -157563,6 +157947,21 @@ /obj/effect/decal/fake_object/light_source/invisible, /turf/simulated/floor/holofloor/tiled/dark, /area/tdome/tdome2) +"xuE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/turf/simulated/floor/lino, +/area/shuttle/intrepid/quarters) "xuJ" = ( /obj/structure/undies_wardrobe, /turf/simulated/floor/wood, @@ -158730,6 +159129,11 @@ color = "#8f5847" }, /area/centcom/evac) +"xDk" = ( +/turf/simulated/wall/shuttle/unique/scc/research{ + icon_state = "11,8" + }, +/area/shuttle/intrepid/quarters) "xDm" = ( /obj/machinery/light{ dir = 1 @@ -159171,14 +159575,11 @@ /turf/simulated/floor/carpet/rubber, /area/tcommsat/chamber) "xHn" = ( -/obj/structure/sink{ - pixel_y = 24 - }, -/obj/structure/mirror{ - pixel_y = 32 +/obj/effect/floor_decal/corner/black{ + dir = 6 }, -/turf/simulated/floor/tiled/freezer, -/area/shuttle/intrepid/crew_compartment) +/turf/simulated/floor/tiled/dark, +/area/hangar/intrepid) "xHs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -160827,12 +161228,13 @@ /turf/simulated/floor/wood/yew, /area/centcom/shared_dream) "xRF" = ( -/obj/machinery/light/small, -/obj/structure/bed/handrail{ +/obj/item/device/radio/intercom/expedition/north, +/obj/structure/bed/stool/chair/shuttle, +/obj/effect/floor_decal/spline/plain{ dir = 1 }, -/turf/simulated/floor/lino, -/area/shuttle/intrepid/crew_compartment) +/turf/simulated/floor/lino/diamond, +/area/shuttle/intrepid/quarters) "xRI" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/industrial/warning, @@ -194150,6 +194552,7 @@ xVU xVU xVU fpp +xVU fEy mNH mNH @@ -194158,7 +194561,6 @@ xVU xVU xVU xVU -xVU eIC ioq mZD @@ -194169,6 +194571,9 @@ bli bli bli bli +bli +bli +bli gwA nDI eSV @@ -194254,9 +194659,6 @@ eSV eSV eSV eSV -eSV -eSV -eSV "} (120,1,1) = {" eSV @@ -194395,10 +194797,13 @@ usP lCX wuD ybD -vBN -evm -iRC +qek iRC +rVr +jVP +dSD +hYy +gED iRC iRC iRC @@ -194413,16 +194818,16 @@ iRC iRC iRC iRC -iRC -iRC -iRC nWZ kEJ kEJ kEJ kEJ +euL kEJ -gED +kEJ +kEJ +euL kEJ kEJ kEJ @@ -194511,9 +194916,6 @@ eSV eSV eSV eSV -eSV -eSV -eSV "} (121,1,1) = {" eSV @@ -194652,10 +195054,13 @@ eEm ifD wuD xCT -evm -evm -iRC +eWJ iRC +bjm +evm +dSD +gBq +qlX iRC iRC iRC @@ -194768,9 +195173,6 @@ eSV eSV eSV eSV -eSV -eSV -eSV "} (122,1,1) = {" eSV @@ -194910,8 +195312,11 @@ fUS aHY iRC iRC -iRC -iRC +kES +wDZ +wDZ +ueH +gED eHK ksN wCW @@ -194926,7 +195331,7 @@ ppS eyW xlX jUm -bhi +jWI eVn lyH koV @@ -195025,9 +195430,6 @@ eSV eSV eSV eSV -eSV -eSV -eSV "} (123,1,1) = {" eSV @@ -195167,8 +195569,11 @@ mKo aHY eQP eQP -iRC -iRC +dSD +tfR +evm +oXy +liI pIR rfT luZ @@ -195183,8 +195588,8 @@ vab fye jyn aLc -mSf -dSD +lOY +aIP kSs wIU xvk @@ -195282,9 +195687,6 @@ eSV eSV eSV eSV -eSV -eSV -eSV "} (124,1,1) = {" eSV @@ -195424,8 +195826,11 @@ mKo aHY nWg nWg -iRC -iRC +dSD +tfR +evm +nhr +liI iSn jbR sDd @@ -195440,10 +195845,10 @@ uJi pdv cpn aEw -aIP -ock -wjU evr +keA +mSf +anN con uab iRC @@ -195539,9 +195944,6 @@ eSV eSV eSV eSV -eSV -eSV -eSV "} (125,1,1) = {" eSV @@ -195681,8 +196083,11 @@ mKo aHY dJm eQJ -iRC -iRC +dSD +tfR +evm +hhb +vrz iMt jkq bWz @@ -195697,10 +196102,10 @@ uUx jcd umg lkH -tfR -qtp -ncP dKn +sHi +qAj +duz cJx fjA oeq @@ -195796,9 +196201,6 @@ eSV eSV eSV eSV -eSV -eSV -eSV "} (126,1,1) = {" eSV @@ -195938,8 +196340,11 @@ uzZ wuD wuD ahI -uRt -uRt +dSD +tfR +aHY +wuD +kEg iAP vvK wzA @@ -195954,10 +196359,10 @@ nJB uSd oxX aEw -eWJ -cIp -cND uVF +qmJ +xuE +oCF hZs epb kHF @@ -196053,9 +196458,6 @@ eSV eSV eSV eSV -eSV -eSV -eSV "} (127,1,1) = {" eSV @@ -196194,8 +196596,11 @@ rLm pjy hUk aaa +cRQ +ueH +hYy pvn -pvn +akt pvn fZQ jXW @@ -196211,11 +196616,11 @@ dlv udv hBV aEw -vrz -qmi -duz jEW lRu +cyI +chf +kYq bPT flh ois @@ -196310,9 +196715,6 @@ eSV eSV eSV eSV -eSV -eSV -eSV "} (128,1,1) = {" eSV @@ -196451,6 +196853,9 @@ mey hYy apf aaa +tLo +wxW +hYy eEc dSQ guq @@ -196467,15 +196872,15 @@ rRE xrp spQ dnR -nyl -liI -kqZ jBq vrO fbB +wjU +cPw +cVZ mFo ocp -cVZ +kVM hcq pTd kyK @@ -196567,9 +196972,6 @@ eSV eSV eSV eSV -eSV -eSV -eSV "} (129,1,1) = {" eSV @@ -196705,11 +197107,14 @@ bYz cSQ xOV kEt -hYy +dnX hhv aaa +sEv +wBD +hYy pvn -pvn +bhi pvn kxk rKh @@ -196724,12 +197129,12 @@ twR neC wYT blW -hkM -kDt -tVv dVb epr bIt +czB +kHa +cND tfA wnQ vBb @@ -196824,9 +197229,6 @@ eSV eSV eSV eSV -eSV -eSV -eSV "} (130,1,1) = {" eSV @@ -196965,9 +197367,12 @@ txa qFy wuD wuD -kEJ -kEJ -kEJ +vBN +dSD +tfR +aHY +wuD +nVx xqv inM iaD @@ -196981,12 +197386,12 @@ eWB pcQ hzv vMd -ouI -kEg -wBD uli iYQ rUH +czX +ncP +xDk xWD vKl fry @@ -197081,9 +197486,6 @@ eSV eSV eSV eSV -eSV -eSV -eSV "} (131,1,1) = {" eSV @@ -197220,11 +197622,14 @@ iJM hdi crb qkk -rPN +hdi adv aUk -iRC -iRC +dSD +tfR +czV +cvM +ock fNt tvK inf @@ -197233,17 +197638,17 @@ otE tEV jHp uWc -gBq +xls pMz lgN cfJ mlL -kVM -xHn -cPw -aFx +aEw xRF ihP +oTG +wjM +mPp kTh poM iKx @@ -197338,9 +197743,6 @@ eSV eSV eSV eSV -eSV -eSV -eSV "} (132,1,1) = {" eSV @@ -197480,8 +197882,11 @@ qPF rPN mrC aUk -iRC -iRC +dSD +tfR +knw +wiA +liI hAl jbR fYr @@ -197490,17 +197895,17 @@ gZL nar jcD eNa -kES +rCd nmW kCU idU nwF -kVM -qAj -cPw -dnX +aEw qFc fIw +qmi +qiB +kqZ oea iRC sWq @@ -197595,9 +198000,6 @@ eSV eSV eSV eSV -eSV -eSV -eSV "} (133,1,1) = {" eSV @@ -197737,8 +198139,11 @@ qeD rPN vmL aUk -iRC -iRC +dSD +tfR +tVv +qub +liI xtM hqn rqa @@ -197752,12 +198157,12 @@ gkN rTW wOT lvI -kVM -jWI -wjM -keA +aEw pfa rkl +kDt +hkM +nyl mIX iRC iRC @@ -197852,9 +198257,6 @@ eSV eSV eSV eSV -eSV -eSV -eSV "} (134,1,1) = {" eSV @@ -197992,10 +198394,13 @@ aEl kLb qeD rPN -kHa -iRC iRC iRC +lAb +xHn +xHn +wBD +gED dhJ pGP gBD @@ -198009,11 +198414,11 @@ jtK brR eaS tZm -tLo -euL -qmJ dLe rnM +qtp +aFx +ouI iRC iRC iRC @@ -198109,9 +198514,6 @@ eSV eSV eSV eSV -eSV -eSV -eSV "} (135,1,1) = {" eSV @@ -198251,9 +198653,12 @@ gTx rPN sol keZ -fXM -iRC iRC +fXM +fXM +dSD +xeb +jgf iRC iRC iRC @@ -198266,11 +198671,11 @@ qnb imc ifw lIM -hhb -knw -bjm pCx jpo +cce +ajd +cIp iRC iRC iRC @@ -198366,9 +198771,6 @@ eSV eSV eSV eSV -eSV -eSV -eSV "} (136,1,1) = {" eSV @@ -198508,9 +198910,12 @@ wif hdi rlc dnl -rGK -iRC iRC +rGK +rGK +dSD +hYy +gED iRC iRC iRC @@ -198518,9 +198923,6 @@ dRx kmo nrz qui -iRC -iRC -iRC eKr iRC iRC @@ -198539,6 +198941,9 @@ iRC iRC iRC iRC +iRC +iRC +iRC cLV eSV eSV @@ -198623,9 +199028,6 @@ eSV eSV eSV eSV -eSV -eSV -eSV "} (137,1,1) = {" eSV @@ -198795,6 +199197,9 @@ xAU uRt uRt uRt +uRt +uRt +uRt eVk nDI eSV @@ -198880,9 +199285,6 @@ eSV eSV eSV eSV -eSV -eSV -eSV "} (138,1,1) = {" eSV @@ -199052,6 +199454,9 @@ bli bli bli bli +bli +bli +bli kMG nDI eSV @@ -199137,9 +199542,6 @@ eSV eSV eSV eSV -eSV -eSV -eSV "} (139,1,1) = {" eSV