diff --git a/html/changelogs/hazelmouse-intrepidtweaks.yml b/html/changelogs/hazelmouse-intrepidtweaks.yml new file mode 100644 index 00000000000..23fc59dcae2 --- /dev/null +++ b/html/changelogs/hazelmouse-intrepidtweaks.yml @@ -0,0 +1,61 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: hazelmouse + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Made some minor tweaks in layout to the SCCV Intrepid, introduced new tables to cargo areas, streamlined outer hull." + - rscadd: "Added a bluespace beacon to the SCCV Quark." + - rscadd: "The bluespace beacon's exact location is now visible on the SCCV Quark, Spark, Canary, and Intrepid." + - bugfix: "All Intrepid cameras should now be fully accessible from camera consoles." diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index b8a06e52a0e..bb145f8341e 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -14077,29 +14077,11 @@ /turf/simulated/floor/plating, /area/shuttle/skipjack) "bVo" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 - }, -/obj/structure/table/rack, -/obj/item/stack/material/steel/full, -/obj/item/stack/material/glass/full, -/obj/item/stack/material/glass/reinforced/full, -/obj/item/stack/rods{ - amount = 50 - }, -/obj/item/stack/rods{ - amount = 50 - }, -/obj/machinery/light/small{ - dir = 8 +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 }, -/obj/item/stack/material/graphite/full, -/obj/item/pipewrench, -/obj/item/hoist_kit, -/obj/item/stack/material/steel/full, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/engineering) +/turf/simulated/floor/plating, +/area/hangar/intrepid) "bVs" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -14456,13 +14438,17 @@ /turf/unsimulated/floor, /area/centcom/legion/hangar5) "bYa" = ( +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/machinery/power/apc/east{ + req_access = null; + req_one_access = list(11, 24, 47, 65) + }, +/obj/structure/cable/green{ + icon_state = "0-8" + }, /obj/machinery/sleeper{ dir = 8 }, -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/machinery/light/small{ - dir = 4 - }, /turf/simulated/floor/tiled/white, /area/shuttle/intrepid/medical) "bYb" = ( @@ -18491,20 +18477,16 @@ /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/fitness/showers) "cEf" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/machinery/camera/network/intrepid{ dir = 1; - level = 2 + c_tag = "Intrepid - Infirmary" }, -/obj/structure/bed/handrail{ - dir = 4 - }, -/obj/machinery/power/portgen/basic, -/obj/machinery/light/small/red{ - dir = 8 - }, -/turf/simulated/floor/tiled/full, -/area/shuttle/intrepid/engineering) +/obj/machinery/iv_drip, +/obj/item/clothing/mask/breath/medical, +/obj/item/tank/oxygen, +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/medical) "cEh" = ( /obj/effect/floor_decal/corner/dark_green{ dir = 5 @@ -18720,6 +18702,16 @@ }, /turf/simulated/floor/reinforced/airless, /area/horizon/exterior) +"cFV" = ( +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/bed/handrail{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/medical) "cFW" = ( /obj/machinery/door/airlock/maintenance{ name = "Xenobiology Maintenance"; @@ -23041,15 +23033,17 @@ /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/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/machinery/bluespace_beacon, -/turf/simulated/floor/tiled/dark/full, +/turf/simulated/floor/plating, /area/shuttle/intrepid/main_compartment) "dnS" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ @@ -26395,15 +26389,14 @@ /turf/simulated/floor/tiled, /area/hangar/operations) "dLs" = ( -/obj/effect/floor_decal/corner/brown/full, -/obj/structure/bed/handrail{ - dir = 1 +/obj/machinery/iff_beacon/horizon/shuttle{ + pixel_y = -21 }, -/obj/machinery/camera/network/intrepid{ - dir = 1 +/obj/effect/floor_decal/industrial/warning{ + dir = 10 }, -/turf/simulated/floor/tiled, -/area/shuttle/intrepid/cargo_bay) +/turf/simulated/floor/reinforced, +/area/shuttle/intrepid/cockpit) "dLt" = ( /obj/machinery/ammunition_loader/francisca{ weapon_id = "Francisca Rotary Gun" @@ -33274,7 +33267,9 @@ /turf/simulated/floor/plating, /area/engineering/atmos/air) "eLC" = ( -/turf/simulated/floor/tiled, +/obj/machinery/bluespace_beacon, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, /area/shuttle/quark/cockpit) "eLE" = ( /obj/effect/floor_decal/corner/red/full{ @@ -36551,21 +36546,15 @@ /turf/simulated/floor/tiled/white, /area/medical/ward) "fjA" = ( -/obj/structure/closet/crate/field_kitchen, -/obj/item/tent, -/obj/item/tent, -/obj/item/tent/big/scc, -/obj/machinery/light/small{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, /turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cargo_bay) +/area/shuttle/intrepid/main_compartment) "fjB" = ( /obj/effect/floor_decal/corner/red{ dir = 9 @@ -41940,6 +41929,19 @@ }, /turf/simulated/floor/plating, /area/maintenance/wing/starboard/far) +"fZQ" = ( +/obj/effect/floor_decal/corner/brown{ + dir = 6 + }, +/obj/structure/bed/handrail{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain/corner/purple, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/main_compartment) "fZX" = ( /obj/machinery/camera/network/command{ c_tag = "Bridge - Pilot Room"; @@ -43302,12 +43304,11 @@ /turf/simulated/floor/holofloor/tiled, /area/horizon/holodeck/source_thunderdomecourt) "gkU" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/light/small{ - dir = 8 +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 }, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cargo_bay) +/turf/simulated/floor/plating, +/area/hangar/intrepid) "gkV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -46867,9 +46868,27 @@ /turf/simulated/floor/holofloor/tiled, /area/horizon/holodeck/source_emptycourt) "gKh" = ( -/obj/machinery/door/airlock/glass_medical, -/turf/simulated/floor/tiled/full, -/area/shuttle/intrepid/medical) +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/obj/structure/table/rack, +/obj/item/stack/material/steel/full, +/obj/item/stack/material/glass/full, +/obj/item/stack/material/glass/reinforced/full, +/obj/item/stack/rods{ + amount = 50 + }, +/obj/item/stack/rods{ + amount = 50 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/item/stack/material/graphite/full, +/obj/item/stack/material/steel/full, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/engineering) "gKm" = ( /obj/structure/girder, /obj/effect/decal/cleanable/dirt, @@ -52667,30 +52686,11 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/bridge/meeting_room) "hBV" = ( -/obj/effect/floor_decal/corner/brown{ - dir = 9 - }, -/obj/structure/bed/handrail{ - dir = 4 - }, -/obj/effect/floor_decal/spline/plain/corner/blue{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain/corner/green{ - dir = 4 - }, -/obj/structure/closet/walllocker/emerglocker/west, -/obj/item/clothing/suit/space/emergency, -/obj/item/clothing/suit/space/emergency, -/obj/item/clothing/suit/space/emergency, -/obj/item/clothing/head/helmet/space/emergency, -/obj/item/clothing/head/helmet/space/emergency, -/obj/item/clothing/head/helmet/space/emergency, -/obj/machinery/camera/network/intrepid{ - dir = 4 +/obj/machinery/door/airlock/glass_medical{ + name = "Infirmary" }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/main_compartment) +/turf/simulated/floor/tiled/full, +/area/shuttle/intrepid/medical) "hBW" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -59955,48 +59955,12 @@ /turf/simulated/floor/grass, /area/horizon/cafeteria) "iHi" = ( -/obj/item/bodybag/cryobag{ - pixel_y = -5 - }, -/obj/item/bodybag/cryobag{ - pixel_x = 7; - pixel_y = -8 - }, -/obj/item/clothing/mask/surgical, -/obj/item/clothing/mask/surgical, -/obj/item/clothing/glasses/hud/health{ - pixel_x = 7; - pixel_y = 4 - }, -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/item/reagent_containers/inhaler/pneumalin{ - pixel_x = 7; - pixel_y = -8 - }, -/obj/item/reagent_containers/inhaler/pneumalin{ - pixel_x = -6; - pixel_y = -4 - }, -/obj/effect/floor_decal/industrial/outline/medical, -/obj/structure/table/standard, -/obj/item/storage/firstaid/fire{ - pixel_x = 7; - pixel_y = 17 - }, -/obj/item/storage/firstaid/toxin{ - pixel_x = -8; - pixel_y = 17 - }, -/obj/machinery/firealarm/north, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/item/storage/firstaid/o2{ - pixel_x = -8; - pixel_y = 8 +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/shuttle/intrepid/medical) +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/main_compartment) "iHl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -61360,15 +61324,21 @@ /turf/simulated/floor/tiled, /area/operations/storage) "iQL" = ( -/obj/effect/floor_decal/industrial/outline/security, -/obj/machinery/computer/shuttle_control/explore/terminal/intrepid{ - dir = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1; + level = 2 }, -/obj/machinery/camera/network/intrepid{ +/obj/structure/bed/handrail{ + dir = 4 + }, +/obj/machinery/light/small/red{ dir = 8 }, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/cockpit) +/obj/structure/table/reinforced/steel, +/obj/item/pipewrench, +/obj/item/hoist_kit, +/turf/simulated/floor/tiled/full, +/area/shuttle/intrepid/engineering) "iQM" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 @@ -63307,12 +63277,36 @@ /turf/unsimulated/floor/plating, /area/centcom/distress_prep) "jew" = ( -/obj/machinery/iff_beacon/horizon/shuttle{ - pixel_y = -21 +/obj/machinery/light/small{ + dir = 1 }, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/reinforced, -/area/shuttle/intrepid/cockpit) +/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) "jeD" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -64842,7 +64836,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, /area/shuttle/mining) "jqc" = ( /obj/effect/decal/cleanable/dirt, @@ -75608,16 +75603,16 @@ /turf/simulated/floor/exoplanet/grass, /area/centcom/shared_dream) "kTh" = ( -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/machinery/iv_drip, -/obj/machinery/light/small, -/obj/item/tank/oxygen, -/obj/item/clothing/mask/breath/medical, -/obj/machinery/light/small{ - dir = 8 +/obj/structure/bed/handrail{ + dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/shuttle/intrepid/medical) +/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) "kTi" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 4 @@ -81071,36 +81066,45 @@ /turf/simulated/floor/wood, /area/bridge/meeting_room) "lIM" = ( -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/structure/table/standard, -/obj/item/roller{ - pixel_x = -8 +/obj/item/bodybag/cryobag{ + pixel_y = -3 }, -/obj/item/roller{ - pixel_x = -8 +/obj/item/bodybag/cryobag{ + pixel_x = 7; + pixel_y = -3 }, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -7; - pixel_y = 15 +/obj/item/clothing/mask/surgical, +/obj/item/clothing/mask/surgical, +/obj/item/clothing/glasses/hud/health{ + pixel_x = 7; + pixel_y = 4 }, -/obj/item/reagent_containers/glass/bottle/inaprovaline{ - pixel_x = 4; - pixel_y = 11 +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/item/reagent_containers/inhaler/pneumalin{ + pixel_x = 7; + pixel_y = -1 }, -/obj/machinery/power/apc/east{ - req_access = null; - req_one_access = list(11, 24, 47, 65) +/obj/item/reagent_containers/inhaler/pneumalin{ + pixel_x = -1; + pixel_y = -1 }, -/obj/structure/cable/green{ - icon_state = "0-8" +/obj/effect/floor_decal/industrial/outline/medical, +/obj/structure/table/standard, +/obj/item/storage/firstaid/fire{ + pixel_x = 7; + pixel_y = 17 }, -/obj/item/storage/box/bodybags{ - pixel_x = 5; - pixel_y = 7 +/obj/item/storage/firstaid/toxin{ + pixel_x = -8; + pixel_y = 17 }, -/obj/item/storage/box/gloves{ - pixel_x = 5; - pixel_y = -1 +/obj/machinery/firealarm/north, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/item/storage/firstaid/o2{ + pixel_x = -8; + pixel_y = 8 }, /turf/simulated/floor/tiled/white, /area/shuttle/intrepid/medical) @@ -87210,20 +87214,21 @@ }, /area/centcom/control) "mCJ" = ( +/obj/structure/bed/stool/chair/shuttle{ + dir = 1 + }, /obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 + dir = 4 }, -/obj/structure/bed/handrail{ - dir = 1 +/obj/machinery/light/small{ + dir = 4 }, /obj/machinery/camera/network/intrepid{ - dir = 1 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 + dir = 1; + c_tag = "Intrepid - Engineering Compartment" }, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/port_storage) +/turf/simulated/floor/tiled/full, +/area/shuttle/intrepid/engineering) "mCP" = ( /obj/effect/floor_decal/corner/grey{ dir = 5 @@ -87924,15 +87929,14 @@ /turf/simulated/floor/tiled, /area/operations/office) "mIX" = ( -/obj/effect/floor_decal/corner/lime/diagonal, +/obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/bed/handrail{ - dir = 1 - }, -/obj/machinery/camera/network/intrepid{ - dir = 1 + dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/shuttle/intrepid/medical) +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/obj/machinery/power/portgen/basic, +/turf/simulated/floor/tiled/full, +/area/shuttle/intrepid/engineering) "mJd" = ( /obj/structure/table/wood, /obj/item/flame/candle{ @@ -88119,7 +88123,8 @@ dir = 4 }, /obj/machinery/bluespace_beacon, -/turf/simulated/floor/tiled/dark/full, +/obj/structure/lattice/catwalk/indoor/grate/dark, +/turf/simulated/floor/plating, /area/shuttle/canary) "mLz" = ( /obj/effect/floor_decal/corner/mauve{ @@ -92953,15 +92958,16 @@ /turf/simulated/floor/plating, /area/rnd/eva) "nwy" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/bed/handrail{ - dir = 8 - }, -/obj/machinery/light/small{ +/obj/effect/floor_decal/industrial/outline/security, +/obj/machinery/computer/shuttle_control/explore/terminal/intrepid{ dir = 1 }, -/turf/simulated/floor/tiled/full, -/area/shuttle/intrepid/main_compartment) +/obj/machinery/camera/network/intrepid{ + dir = 8; + c_tag = "Intrepid - Cockpit" + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/cockpit) "nwz" = ( /obj/structure/table/glass{ table_reinf = "glass" @@ -97239,13 +97245,21 @@ /turf/simulated/floor/tiled/dark, /area/engineering/atmos) "oea" = ( -/obj/effect/floor_decal/corner/lime/diagonal, -/obj/structure/bed/roller, -/obj/machinery/alarm/south{ - req_one_access = list(11, 24, 47, 65) +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/shuttle/intrepid/medical) +/obj/structure/bed/handrail{ + dir = 1 + }, +/obj/machinery/camera/network/intrepid{ + dir = 1; + c_tag = "Intrepid - Port Nacelle" + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/port_storage) "oeb" = ( /turf/unsimulated/wall/darkshuttlewall, /area/centcom/bar) @@ -126024,16 +126038,12 @@ /turf/simulated/floor/tiled, /area/hallway/primary/central_one) "spQ" = ( -/obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/shuttle/intrepid/main_compartment) "spU" = ( /obj/structure/cable/green{ @@ -130166,12 +130176,16 @@ /turf/simulated/floor/carpet/rubber, /area/rnd/lab) "sWq" = ( -/obj/machinery/shipsensors/weak/scc_shuttle{ - pixel_y = -21 +/obj/structure/closet/crate/field_kitchen, +/obj/item/tent, +/obj/item/tent, +/obj/item/tent/big/scc, +/obj/machinery/light/small{ + dir = 4 }, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/reinforced, -/area/shuttle/intrepid/cockpit) +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/intrepid/cargo_bay) "sWr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -133579,21 +133593,14 @@ /turf/simulated/floor/tiled/dark, /area/horizon/security/firing_range) "twR" = ( -/obj/effect/floor_decal/corner/brown{ - dir = 6 - }, -/obj/structure/bed/handrail{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain/corner/purple, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 +/obj/machinery/shipsensors/weak/scc_shuttle{ + pixel_y = -21 }, -/obj/machinery/camera/network/intrepid{ - dir = 8 +/obj/effect/floor_decal/industrial/warning{ + dir = 6 }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/intrepid/main_compartment) +/turf/simulated/floor/reinforced, +/area/shuttle/intrepid/cockpit) "twU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -134408,20 +134415,27 @@ /turf/simulated/wall/r_wall, /area/bridge/upperdeck) "tDa" = ( -/obj/structure/bed/stool/chair/shuttle{ +/obj/machinery/light/small{ dir = 1 }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 +/obj/structure/table/reinforced/steel, +/obj/item/roller{ + pixel_x = -6 }, -/obj/machinery/light/small{ - dir = 4 +/obj/item/storage/box/bodybags{ + pixel_x = 7; + pixel_y = 10 }, -/obj/machinery/camera/network/intrepid{ - dir = 1 +/obj/item/storage/box/gloves{ + pixel_x = 7; + pixel_y = 1 + }, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -7; + pixel_y = 15 }, /turf/simulated/floor/tiled/full, -/area/shuttle/intrepid/engineering) +/area/shuttle/intrepid/main_compartment) "tDb" = ( /obj/machinery/iv_drip, /obj/effect/floor_decal/corner_wide/green{ @@ -135305,13 +135319,31 @@ /turf/unsimulated/floor, /area/antag/raider) "tKf" = ( -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/corner/brown{ + dir = 9 + }, /obj/structure/bed/handrail{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/universal, -/turf/simulated/floor/tiled/full, -/area/shuttle/intrepid/engineering) +/obj/effect/floor_decal/spline/plain/corner/blue{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain/corner/green{ + dir = 4 + }, +/obj/structure/closet/walllocker/emerglocker/west, +/obj/item/clothing/suit/space/emergency, +/obj/item/clothing/suit/space/emergency, +/obj/item/clothing/suit/space/emergency, +/obj/item/clothing/head/helmet/space/emergency, +/obj/item/clothing/head/helmet/space/emergency, +/obj/item/clothing/head/helmet/space/emergency, +/obj/machinery/camera/network/intrepid{ + dir = 4; + c_tag = "Intrepid - Main Compartment" + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/intrepid/main_compartment) "tKg" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 @@ -166712,15 +166744,13 @@ /turf/simulated/floor/tiled, /area/engineering/lobby) "yhm" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/bed/handrail{ - dir = 4 - }, -/obj/machinery/light/small{ - dir = 1 +/obj/effect/floor_decal/corner/lime/diagonal, +/obj/machinery/alarm/south{ + req_one_access = list(11, 24, 47, 65) }, -/turf/simulated/floor/tiled/dark/full, -/area/shuttle/intrepid/main_compartment) +/obj/structure/bed/roller, +/turf/simulated/floor/tiled/white, +/area/shuttle/intrepid/medical) "yhn" = ( /obj/structure/grille/diagonal{ dir = 1 @@ -198188,7 +198218,7 @@ aIE cCt toF hYy -iRC +oWu iRC iRC iRC @@ -198445,7 +198475,8 @@ ckZ evm toF cFF -foG +bVo +iRC foG foG pbX @@ -198465,7 +198496,6 @@ wQn wQn aFh wQn -wQn iRC iRC iRC @@ -198702,11 +198732,12 @@ xeJ xeJ ueH oWu +iRC xtM ksN wCW nME -bVo +gKh foG hBb hBb @@ -198721,9 +198752,8 @@ jUm wQn koV czS -gkU wQn -iRC +wQn iRC iRC iRC @@ -198959,28 +198989,28 @@ edp evm gom xAe +iRC uUx rfT luZ ilY lWy hxL -tKf +mIX thu -cEf +iQL sql vab iYp sql -yhm +jew jVL jVL wQn wIU xvk -dLs +kTh wQn -xFW iRC iRC iRC @@ -199216,6 +199246,7 @@ edp evm ofA xAe +iRC xtM rfT sDd @@ -199237,8 +199268,7 @@ vvq con uab wQn -jew -iRC +dLs iRC iRC iRC @@ -199473,6 +199503,7 @@ edp evm xkS cgf +iRC foG jkq bWz @@ -199481,7 +199512,7 @@ lyN xhT tVf pYD -tDa +mCJ sql lgN ucB @@ -199492,7 +199523,7 @@ hwA wQn sRH cJx -fjA +sWq wQn lZI lZI @@ -199500,7 +199531,6 @@ lZI xFW iRC iRC -iRC cLV eSV eSV @@ -199737,6 +199767,7 @@ foG foG foG foG +foG lqO foG sql @@ -199757,7 +199788,6 @@ uSU xFW xFW iRC -iRC cLV eSV eSV @@ -199993,13 +200023,14 @@ kki qyk xjL cqU +iHi eqw eSa mbZ fGD dlv udv -hBV +tKf tuR gPk sGo @@ -200014,7 +200045,6 @@ xnF oKJ kqv iRC -iRC cLV eSV eSV @@ -200250,13 +200280,14 @@ dir pTp wnV nQH +spQ aKh brI hqg rRE xrp -spQ dnR +fjA iJq nBT kCb @@ -200271,7 +200302,6 @@ xnF hMk fNt iRC -iRC xsx eSV eSV @@ -200507,10 +200537,11 @@ yib tvu nxj qJb +iHi onT jIj nGF -twR +fZQ neC wYT blW @@ -200525,10 +200556,9 @@ sql vBb gSU xnF -iQL +nwy kqv iRC -iRC cLV eSV eSV @@ -200764,6 +200794,7 @@ aJI aJI aJI aJI +aJI piD uWc tbm @@ -200785,7 +200816,6 @@ rLd xFW xFW iRC -iRC cLV eSV eSV @@ -201015,6 +201045,7 @@ edp fPt hMm xqY +iRC aJI aJI inf @@ -201034,7 +201065,7 @@ cCb bSh jcV fFx -kTh +cFV bSh lZI lZI @@ -201042,7 +201073,6 @@ lZI xFW iRC iRC -iRC cLV eSV eSV @@ -201272,6 +201302,7 @@ edp lRY tfc xAe +iRC gkk jbR fYr @@ -201288,13 +201319,12 @@ sql fXy reg reg -gKh +hBV hlh jxU -oea +yhm bSh -sWq -iRC +twR iRC iRC iRC @@ -201529,11 +201559,12 @@ edp adH kdo xAe +iRC iSl bbg rqa gMb -mCJ +oea aJI rvR ppH @@ -201542,15 +201573,14 @@ sql rTW wOT sql -nwy +tDa ezr ezr bSh xVW brZ -mIX +cEf bSh -xFW iRC iRC iRC @@ -201786,6 +201816,7 @@ hJG hJG trY oWu +iRC gkk pGP gBD @@ -201803,11 +201834,10 @@ jUm jUm jUm bSh -iHi lIM bYa bSh -iRC +bSh iRC iRC iRC @@ -202043,7 +202073,8 @@ fXM fXM toF uhY -aJI +gkU +iRC aJI aJI mSD @@ -202063,7 +202094,6 @@ bSh bSh fzG bSh -bSh iRC iRC iRC @@ -202300,7 +202330,7 @@ rGK rGK toF hYy -iRC +oWu iRC iRC iRC