diff --git a/html/changelogs/Huntime - CommandOverhaul.yml b/html/changelogs/Huntime - CommandOverhaul.yml new file mode 100644 index 00000000000..9ac126ec313 --- /dev/null +++ b/html/changelogs/Huntime - CommandOverhaul.yml @@ -0,0 +1,41 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Huntime + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - maptweak: "Deck 3 Command-map overhaul" diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index 77afb54b04e..1c752030872 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -87,20 +87,7 @@ name = "Security - Investigations Office" }) "ak" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/wood, +/turf/simulated/floor/marble/dark, /area/bridge/minibar) "al" = ( /obj/structure/cable/green{ @@ -116,11 +103,32 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/table/reinforced, +/obj/item/flag/scc/l{ + pixel_y = 15 + }, +/obj/item/flag/scc/l{ + pixel_y = 10 + }, +/obj/item/flag/scc/l{ + pixel_y = 4 + }, /turf/simulated/floor, /area/bridge/aibunker) "am" = ( -/obj/machinery/photocopier, -/turf/simulated/floor/carpet/rubber, +/obj/structure/table/reinforced, +/obj/machinery/photocopier/faxmachine{ + anchored = 0; + department = "SCCV Horizon Bridge"; + pixel_y = 4 + }, +/obj/effect/floor_decal/corner/blue{ + dir = 5 + }, +/turf/simulated/floor/tiled, /area/bridge) "ao" = ( /obj/effect/floor_decal/spline/fancy/wood, @@ -210,11 +218,9 @@ /turf/simulated/floor/tiled/dark, /area/storage/shields) "aw" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/blue/diagonal, +/obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/white, /area/bridge) "ax" = ( @@ -283,8 +289,17 @@ /turf/simulated/wall, /area/engineering/break_room) "aF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue{ + dir = 9 + }, +/obj/machinery/camera/network/command{ + c_tag = "AI Core - Third Deck Chamber Aft"; + dir = 1 + }, +/turf/simulated/floor/tiled, /area/bridge) "aH" = ( /obj/machinery/door/airlock/glass_command{ @@ -326,8 +341,7 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/maintenance/engineering_ladder) "aL" = ( -/obj/machinery/door/window/westleft, -/obj/machinery/light{ +/obj/structure/railing/mapped{ dir = 1 }, /obj/effect/floor_decal/corner/blue/full{ @@ -491,14 +505,19 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) "ba" = ( -/obj/structure/window/reinforced{ - dir = 4 +/obj/structure/railing/mapped{ + dir = 8 }, -/obj/structure/window/reinforced, -/obj/item/device/paicard, /obj/structure/table/reinforced, -/obj/effect/floor_decal/corner/blue/full{ - dir = 4 +/obj/effect/floor_decal/corner/blue{ + dir = 9 + }, +/obj/item/paper_bin, +/obj/item/folder/blue, +/obj/item/pen, +/obj/item/pen/blue{ + pixel_x = 4; + pixel_y = 4 }, /turf/simulated/floor/tiled/dark, /area/bridge) @@ -701,12 +720,11 @@ /turf/simulated/floor/plating, /area/maintenance/engineering_ladder) "bA" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/machinery/light{ +/obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, -/obj/item/modular_computer/console/preset/command/account, -/turf/simulated/floor/carpet, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "bB" = ( /obj/structure/table/wood, @@ -847,19 +865,13 @@ /turf/simulated/floor, /area/maintenance/engineering_ladder) "bO" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/railing/mapped, +/obj/structure/railing/mapped{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/corner/blue/full{ - dir = 1 - }, -/obj/structure/flora/pottedplant/random, +/obj/structure/table/reinforced, +/obj/effect/floor_decal/corner/blue/full, +/obj/item/device/taperecorder, /turf/simulated/floor/tiled/dark, /area/bridge) "bQ" = ( @@ -880,12 +892,11 @@ /turf/simulated/floor/carpet/rubber, /area/lawoffice/representative) "bT" = ( -/obj/structure/table/standard, -/obj/item/aicard, -/obj/effect/floor_decal/corner/blue/full{ - dir = 8 +/obj/effect/floor_decal/corner/blue{ + dir = 5 }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/papershredder, +/turf/simulated/floor/tiled, /area/bridge) "bU" = ( /obj/effect/floor_decal/industrial/warning/corner{ @@ -1094,10 +1105,12 @@ /turf/simulated/floor, /area/maintenance/bridge) "cr" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/carpet, +/obj/structure/bookcase, +/obj/item/book/manual/robotics_cyborgs, +/obj/item/book/manual/medical_diagnostics_manual, +/obj/item/book/manual/chef_recipes, +/obj/item/book/manual/anomaly_spectroscopy, +/turf/simulated/floor/carpet/rubber, /area/crew_quarters/captain) "cs" = ( /obj/structure/window/shuttle/scc_space_ship, @@ -1198,10 +1211,11 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "cF" = ( -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/structure/table/reinforced/wood, +/obj/effect/floor_decal/spline/plain{ dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/marble/dark, /area/bridge/minibar) "cG" = ( /obj/structure/table/rack, @@ -1444,11 +1458,14 @@ /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) "di" = ( -/obj/structure/window/reinforced{ +/obj/structure/railing/mapped{ dir = 8 }, /obj/structure/table/reinforced, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/spline/fancy{ + dir = 8 + }, +/turf/simulated/floor/carpet/rubber, /area/bridge) "dj" = ( /obj/effect/floor_decal/corner/green/diagonal{ @@ -1579,6 +1596,9 @@ /obj/effect/floor_decal/corner/blue{ dir = 6 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/bridge/bridge_crew) "dy" = ( @@ -1998,6 +2018,19 @@ }, /turf/simulated/floor/tiled, /area/hallway/crew_area) +"ee" = ( +/obj/effect/map_effect/wingrille_spawn/reinforced/polarized{ + id = "cap" + }, +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor, +/area/crew_quarters/captain) "ef" = ( /obj/machinery/light{ dir = 8 @@ -2125,13 +2158,11 @@ /turf/simulated/floor/wood, /area/crew_quarters/lounge) "ew" = ( -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/corner/blue{ dir = 4 }, -/obj/structure/table/reinforced, -/obj/machinery/recharger, -/obj/effect/floor_decal/corner/blue/full{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/bridge) @@ -2250,15 +2281,10 @@ /turf/simulated/floor, /area/maintenance/bridge) "eL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/camera/network/command{ - c_tag = "Bridge - Helm 2"; - dir = 8 +/obj/structure/cable/green{ + icon_state = "1-8" }, -/obj/effect/floor_decal/corner/blue{ - dir = 6 - }, -/turf/simulated/floor/tiled, +/turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/bridge) "eM" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -2363,10 +2389,10 @@ /turf/simulated/wall/r_wall, /area/tcommsat/chamber) "fd" = ( -/obj/effect/floor_decal/corner/blue{ - dir = 10 +/obj/structure/bed/stool/chair/padded/beige{ + dir = 1 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/bridge/minibar) "fg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -2411,11 +2437,8 @@ /turf/simulated/open, /area/hallway/crew_area) "fl" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/closet/secure_closet/captains, -/turf/simulated/floor/carpet, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "fm" = ( /obj/structure/ladder{ @@ -2430,16 +2453,12 @@ /turf/simulated/floor/tiled/dark, /area/bridge/meeting_room) "fo" = ( -/obj/machinery/light{ +/obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, -/obj/machinery/vending/boozeomat{ - req_access = null - }, -/obj/effect/floor_decal/corner/blue{ - dir = 6 - }, -/turf/simulated/floor/tiled, +/obj/structure/table/reinforced/wood, +/obj/item/reagent_containers/food/drinks/teapot, +/turf/simulated/floor/wood, /area/bridge/minibar) "fp" = ( /obj/structure/cable{ @@ -2673,11 +2692,17 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/cafeteria) "fW" = ( -/obj/structure/window/reinforced, +/obj/structure/railing/mapped, +/obj/effect/floor_decal/corner/blue{ + dir = 10 + }, /obj/item/modular_computer/console/preset/command{ dir = 1 }, -/turf/simulated/floor/carpet/rubber, +/obj/effect/floor_decal/corner/paleblue{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/bridge) "fX" = ( /obj/effect/floor_decal/spline/plain{ @@ -2719,11 +2744,11 @@ /turf/simulated/floor/tiled, /area/security/investigations_storage) "gb" = ( -/obj/structure/bed/stool/chair/office/bridge{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 10 +/obj/structure/bed/stool/chair/office/bridge, +/obj/item/device/radio/intercom{ + dir = 4; + name = "Station Intercom (General)"; + pixel_x = -25 }, /turf/simulated/floor/carpet/rubber, /area/bridge) @@ -2784,12 +2809,10 @@ /turf/simulated/floor, /area/hallway/crew_area) "gk" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/anti_bluespace, /turf/simulated/floor/wood, /area/crew_quarters/captain) "gl" = ( @@ -2831,14 +2854,23 @@ /turf/simulated/floor/tiled/dark, /area/security/investigations) "gs" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/blue/diagonal, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/status_display{ + pixel_y = -32 + }, /turf/simulated/floor/tiled/white, /area/bridge) "gu" = ( @@ -2880,6 +2912,10 @@ name = "Bridge Blast Doors"; opacity = 0 }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/structure/cable/green, /turf/simulated/floor, /area/crew_quarters/captain) "gy" = ( @@ -2902,15 +2938,13 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "gA" = ( -/obj/structure/window/reinforced, +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/structure/railing/mapped, /obj/structure/table/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/turf/simulated/floor/carpet/rubber, +/obj/effect/floor_decal/corner/blue/full, +/turf/simulated/floor/tiled/dark, /area/bridge) "gB" = ( /obj/effect/floor_decal/corner/blue{ @@ -2967,35 +3001,20 @@ /turf/simulated/floor/tiled, /area/hallway/crew_area) "gI" = ( -/obj/structure/table/standard, -/obj/machinery/atmospherics/unary/vent_pump/on{ +/turf/simulated/wall, +/area/bridge/bridge_crew) +"gL" = ( +/obj/effect/floor_decal/spline/plain{ dir = 4 }, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/machinery/recharger/wallcharger{ - pixel_x = -26 - }, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/crowbar/red, -/obj/item/crowbar/red, -/obj/item/crowbar/red, /obj/effect/floor_decal/corner/blue{ dir = 9 }, -/turf/simulated/floor/tiled, -/area/bridge/bridge_crew) -"gL" = ( -/obj/structure/table/reinforced, -/obj/machinery/photocopier/faxmachine{ - anchored = 0; - department = "SCCV Horizon Bridge"; - pixel_y = 4 +/obj/structure/disposalpipe/trunk{ + dir = 1 }, -/turf/simulated/floor/carpet/rubber, +/obj/machinery/disposal/small/east, +/turf/simulated/floor/tiled, /area/bridge) "gM" = ( /obj/structure/closet/athletic_mixed, @@ -3053,19 +3072,15 @@ /turf/simulated/floor/tiled/dark, /area/engineering/break_room) "gS" = ( -/obj/machinery/light{ +/obj/structure/window/shuttle/scc_space_ship, +/obj/structure/grille/diagonal{ dir = 1 }, -/obj/structure/table/wood, -/obj/machinery/photocopier/faxmachine{ - department = "Captain's Office" +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 }, -/obj/machinery/requests_console{ - announcementConsole = 1; - department = "Captain's Desk"; - departmentType = 5; - name = "Captain RC"; - pixel_y = 30 +/obj/structure/cable/green{ + icon_state = "2-8" }, /turf/simulated/floor/wood, /area/crew_quarters/captain) @@ -3079,16 +3094,25 @@ /turf/simulated/floor/tiled/dark, /area/engineering/break_room) "gV" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/spline/plain, +/obj/effect/floor_decal/corner/blue{ + dir = 5 }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/corner/blue/diagonal, -/turf/simulated/floor/tiled/white, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 24 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/bridge) "gW" = ( /obj/structure/window/shuttle/scc_space_ship, @@ -3212,10 +3236,10 @@ /turf/simulated/floor/tiled/dark, /area/engineering/break_room) "hm" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "hn" = ( /obj/item/folder/yellow, @@ -3256,16 +3280,10 @@ /turf/simulated/floor/tiled, /area/bridge/bridge_crew) "hr" = ( -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/structure/bed/stool/chair/padded/brown{ - dir = 1 - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, -/turf/simulated/floor/wood, +/obj/structure/table/reinforced/wood, +/obj/item/stamp/captain, +/obj/item/paper/monitorkey, +/turf/simulated/floor/carpet, /area/crew_quarters/captain) "hs" = ( /obj/effect/floor_decal/corner/blue/full{ @@ -3293,13 +3311,10 @@ /turf/simulated/floor, /area/security/investigations) "hu" = ( -/obj/machinery/light, -/obj/machinery/status_display{ - pixel_y = -32 - }, -/turf/simulated/floor/tiled/ramp/bottom{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "1-4" }, +/turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/bridge) "hv" = ( /obj/structure/table/steel, @@ -3389,9 +3404,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/airlock/command{ - name = "Captain's Quarters"; - req_access = list(20) +/obj/machinery/door/airlock/hatch{ + desc = "It opens and closes. It has a small sign engraved: Bunker capacity: 6. Only facility's Command Staff is permitted."; + name = "Rear Bunker Access"; + req_access = list(20); + secured_wires = 1 }, /turf/simulated/floor/tiled, /area/crew_quarters/captain) @@ -3748,9 +3765,6 @@ "ip" = ( /obj/structure/window/shuttle/scc_space_ship, /obj/structure/grille, -/obj/structure/cable/green{ - icon_state = "12-0" - }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -3759,6 +3773,12 @@ opacity = 0 }, /obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, /turf/simulated/floor, /area/crew_quarters/captain) "iq" = ( @@ -3852,7 +3872,17 @@ /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) "iA" = ( -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/blue/full{ + dir = 4 + }, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/structure/railing/mapped, +/obj/item/modular_computer/console/preset/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/bridge) "iB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -3867,13 +3897,20 @@ /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) "iC" = ( -/obj/structure/window/reinforced{ - dir = 8 +/obj/structure/railing/mapped{ + dir = 4 }, -/obj/structure/window/reinforced, -/obj/item/book/manual/wiki/security_space_law, /obj/structure/table/reinforced, -/obj/effect/floor_decal/corner/blue/full, +/obj/effect/floor_decal/corner/blue{ + dir = 6 + }, +/obj/item/paper_bin, +/obj/item/folder/blue, +/obj/item/pen, +/obj/item/pen/blue{ + pixel_x = 4; + pixel_y = 4 + }, /turf/simulated/floor/tiled/dark, /area/bridge) "iD" = ( @@ -3907,15 +3944,15 @@ /turf/simulated/floor, /area/tcommsat/entrance) "iI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, +/obj/effect/floor_decal/spline/plain, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 + dir = 4 + }, +/obj/structure/disposalpipe/junction{ + dir = 4 }, -/obj/effect/floor_decal/corner/blue/diagonal, /turf/simulated/floor/tiled, -/area/bridge/bridge_crew) +/area/bridge) "iJ" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 10 @@ -4004,6 +4041,24 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop/xo) +"iV" = ( +/obj/effect/floor_decal/spline/plain/corner{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/bridge) "iW" = ( /obj/structure/table/wood, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -4047,13 +4102,12 @@ /turf/template_noop, /area/template_noop) "jf" = ( -/obj/machinery/light, -/obj/machinery/status_display{ - pixel_y = -32 - }, -/turf/simulated/floor/tiled/ramp/bottom{ - dir = 8 +/obj/effect/floor_decal/spline/fancy, +/obj/effect/floor_decal/spline/fancy{ + dir = 1 }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/carpet/rubber, /area/bridge) "jg" = ( /obj/effect/floor_decal/corner/grey/diagonal{ @@ -4090,16 +4144,21 @@ /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) "jj" = ( +/obj/structure/bed/stool/chair/office/bridge, +/obj/machinery/button/switch/windowtint{ + id = "cap"; + pixel_x = -25; + pixel_y = -26 + }, +/obj/machinery/computer/security/telescreen{ + name = "Access Monitor"; + network = list("Capt_Office"); + pixel_y = -35 + }, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/table/wood, -/obj/item/folder/blue, -/obj/item/stamp/captain, -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet, /area/crew_quarters/captain) "jk" = ( /turf/simulated/floor/tiled/white, @@ -4255,20 +4314,15 @@ /turf/simulated/floor, /area/maintenance/bridge) "jD" = ( -/obj/structure/window/reinforced, -/obj/machinery/button/remote/blast_door{ - id = "bridge blast"; - name = "Bridge Lockdown"; - req_access = list(19) +/obj/structure/railing/mapped{ + dir = 4 }, +/obj/structure/railing/mapped, /obj/structure/table/reinforced, -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/corner/blue/full{ dir = 4 }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/turf/simulated/floor/carpet/rubber, +/turf/simulated/floor/tiled/dark, /area/bridge) "jE" = ( /obj/structure/cable/green{ @@ -4386,7 +4440,13 @@ /turf/simulated/floor/tiled/dark, /area/security/investigations) "jR" = ( -/obj/effect/floor_decal/corner/blue/diagonal, +/obj/machinery/recharger/wallcharger{ + pixel_y = 28; + pixel_x = 5 + }, +/obj/effect/floor_decal/corner/blue{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/bridge/bridge_crew) "jS" = ( @@ -4638,16 +4698,12 @@ /turf/simulated/floor/tiled/white, /area/security/forensics_morgue) "kv" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/table/reinforced/wood, +/obj/item/modular_computer/laptop/preset/command/captain, +/obj/effect/floor_decal/spline/fancy{ + dir = 4 }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/rubber, /area/crew_quarters/captain) "kw" = ( /obj/structure/lattice/catwalk/indoor/grate, @@ -4655,9 +4711,13 @@ /turf/simulated/floor, /area/bridge/aibunker) "kx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/carpet, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "ky" = ( /obj/machinery/power/apc{ @@ -4679,24 +4739,32 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/fitness/pool) "kB" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/table/wood, -/obj/item/storage/slide_projector, -/obj/item/paper/monitorkey, /turf/simulated/floor/wood, /area/crew_quarters/captain) "kC" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 1 }, -/obj/effect/floor_decal/corner/blue/full{ - dir = 4 - }, -/obj/structure/closet/emcloset, -/turf/simulated/floor/tiled, -/area/bridge) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/wood, +/area/crew_quarters/captain) "kD" = ( /obj/effect/floor_decal/corner_wide/blue{ dir = 10 @@ -4807,12 +4875,12 @@ /turf/simulated/floor/tiled/white, /area/medical/ward/isolation) "kP" = ( -/obj/structure/bed/stool/chair{ - dir = 1 - }, /obj/effect/floor_decal/corner/blue{ dir = 10 }, +/obj/structure/table/standard, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/tubes, /turf/simulated/floor/tiled, /area/bridge/bridge_crew) "kQ" = ( @@ -4863,6 +4931,12 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) +"kY" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/wall/shuttle/scc_space_ship/cardinal, +/area/crew_quarters/captain) "la" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -4964,19 +5038,15 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "lp" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/railing/mapped, +/obj/structure/railing/mapped{ dir = 4 }, +/obj/structure/table/reinforced, /obj/effect/floor_decal/corner/blue/full{ - dir = 8 + dir = 4 }, -/obj/structure/flora/pottedplant/random, +/obj/item/paper_scanner, /turf/simulated/floor/tiled/dark, /area/bridge) "lq" = ( @@ -5245,13 +5315,33 @@ /turf/simulated/floor, /area/maintenance/engineering_ladder) "lW" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/effect/floor_decal/spline/plain{ - dir = 5 +/obj/effect/floor_decal/corner/paleblue{ + dir = 8 }, -/turf/simulated/floor/carpet/rubber, +/obj/machinery/button/remote/blast_door{ + id = "hangarlockdown"; + name = "Hangar Lockdoor"; + pixel_y = -33; + pixel_x = -5 + }, +/obj/machinery/button/remote/blast_door{ + id = "bridge blast"; + name = "Bridge Lockdown"; + req_access = list(19); + pixel_y = -24; + pixel_x = -5 + }, +/obj/machinery/button/remote/blast_door{ + id = "crew_armory"; + name = "Crew Armory"; + req_access = list(60); + pixel_x = 6; + pixel_y = -33 + }, +/turf/simulated/floor/tiled/dark, /area/bridge) "lX" = ( /obj/structure/cable/green{ @@ -5425,13 +5515,12 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/newscaster/security_unit{ - pixel_x = 32 +/obj/structure/closet/secure_closet/captains, +/obj/machinery/keycard_auth{ + pixel_y = 24 }, -/obj/item/modular_computer/console/preset/command/captain{ - dir = 8 - }, -/turf/simulated/floor/wood, +/obj/item/device/megaphone/command, +/turf/simulated/floor/carpet, /area/crew_quarters/captain) "mu" = ( /obj/structure/lattice, @@ -5441,24 +5530,23 @@ /turf/simulated/open, /area/hallway/primary/starboard) "mv" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 5 +/obj/machinery/light{ + dir = 1 }, -/obj/machinery/requests_console{ - department = "Bridge"; - pixel_y = 32 +/obj/effect/floor_decal/corner/blue/full{ + dir = 1 }, -/obj/item/device/radio/intercom/department{ - dir = 8; - pixel_x = 24 - }, -/turf/simulated/floor/carpet/rubber, +/obj/machinery/photocopier, +/turf/simulated/floor/tiled, /area/bridge) "mw" = ( /obj/structure/railing/mapped{ dir = 1 }, /obj/machinery/light/small/red, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/ramp/bottom{ dir = 4 }, @@ -5530,12 +5618,24 @@ name = "Security - Investigations Office" }) "mE" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/hatch{ + desc = "It opens and closes. It has a small sign engraved: Bunker capacity: 6. Only facility's Command Staff is permitted."; + id_tag = "bunker2"; + name = "Command Bunker"; + req_access = list(19); + secured_wires = 1 }, -/obj/effect/floor_decal/corner/blue/diagonal, -/turf/simulated/floor/tiled/white, -/area/bridge) +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "bridge blast"; + name = "Bridge Blast Doors"; + opacity = 0 + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/aibunker) "mG" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 9 @@ -5553,10 +5653,22 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "mI" = ( -/obj/machinery/door/firedoor, /obj/effect/floor_decal/corner/blue{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled, /area/bridge) "mJ" = ( @@ -5570,10 +5682,15 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "mK" = ( -/obj/machinery/case_button/shuttle{ - pixel_y = 32 +/obj/structure/flora/pottedplant/random, +/obj/effect/floor_decal/spline/fancy/wood/cee{ + dir = 1 }, -/turf/simulated/floor/carpet, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -28 + }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "mL" = ( /obj/effect/floor_decal/corner_wide/paleblue{ @@ -5585,12 +5702,8 @@ /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) "mM" = ( -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/effect/floor_decal/corner/blue/diagonal, -/turf/simulated/floor/tiled/white, -/area/bridge) +/turf/simulated/wall/r_wall, +/area/lawoffice/representative) "mN" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -5611,12 +5724,22 @@ /turf/simulated/floor/tiled, /area/security/investigations) "mO" = ( -/obj/machinery/newscaster/security_unit{ - pixel_y = -32 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 }, -/obj/structure/table/wood, -/obj/item/card/id/captains_spare, -/turf/simulated/floor/carpet, +/obj/effect/floor_decal/spline/fancy/wood/corner{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "mQ" = ( /obj/effect/floor_decal/corner/paleblue{ @@ -5629,14 +5752,8 @@ /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) "mR" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock{ - id_tag = "captain_washroom"; - name = "Private Restroom" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/freezer, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "mS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -5950,14 +6067,22 @@ /turf/simulated/floor/tiled/white, /area/security/forensics_morgue) "nz" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/table/reinforced/wood, +/obj/structure/railing/mapped{ + dir = 4 }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/mob/living/simple_animal/corgi/fox/Chauncey, -/turf/simulated/floor/carpet, +/obj/effect/floor_decal/spline/fancy{ + dir = 4 + }, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Captain's Desk"; + departmentType = 5; + name = "Captain RC"; + pixel_y = 30 + }, +/obj/item/storage/secure/briefcase, +/turf/simulated/floor/carpet/rubber, /area/crew_quarters/captain) "nA" = ( /obj/structure/bed/stool/chair/plastic{ @@ -6002,6 +6127,9 @@ opacity = 0 }, /obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "0-8" + }, /turf/simulated/floor, /area/crew_quarters/captain) "nG" = ( @@ -6095,9 +6223,6 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "nU" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/structure/cable/green{ icon_state = "2-8" }, @@ -6158,17 +6283,10 @@ /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) "ob" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/structure/flora/pottedplant/random, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, -/turf/simulated/floor/wood, +/obj/structure/table/reinforced/wood, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/device/taperecorder, +/turf/simulated/floor/carpet, /area/crew_quarters/captain) "oc" = ( /obj/machinery/light{ @@ -6177,13 +6295,15 @@ /turf/simulated/floor/wood, /area/crew_quarters/lounge/secondary) "od" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/railing/mapped, +/obj/structure/railing/mapped{ + dir = 8 }, -/obj/effect/floor_decal/corner/blue{ - dir = 9 +/obj/effect/floor_decal/corner/blue/full, +/obj/machinery/computer/station_alert/all{ + dir = 1 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/bridge) "oe" = ( /obj/structure/cable/green{ @@ -6258,11 +6378,19 @@ /obj/machinery/case_button/shuttle{ pixel_y = -32 }, -/obj/effect/floor_decal/spline/plain{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/item/device/radio/beacon, -/turf/simulated/floor/carpet/rubber, +/obj/effect/floor_decal/corner/paleblue{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal/small/north{ + pixel_y = -18 + }, +/turf/simulated/floor/tiled/dark, /area/bridge) "ok" = ( /obj/machinery/telecomms/server/presets/unused, @@ -6271,12 +6399,31 @@ temperature = 278 }, /area/tcommsat/chamber) -"on" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +"ol" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/glass_command{ + id_tag = ""; + name = "Bridge"; + req_one_access = list(19,38) }, -/obj/effect/floor_decal/corner/blue/diagonal, /turf/simulated/floor/tiled, +/area/bridge) +"on" = ( +/obj/machinery/door/airlock{ + name = "Restroom" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, /area/bridge/bridge_crew) "oo" = ( /obj/effect/floor_decal/corner_wide/blue{ @@ -6331,9 +6478,22 @@ /turf/simulated/floor, /area/security/vacantoffice) "ot" = ( -/obj/structure/table/reinforced/wood, -/turf/simulated/floor/tiled, -/area/bridge/minibar) +/obj/structure/window/shuttle/scc_space_ship, +/obj/structure/grille, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "bridge blast"; + name = "Bridge Blast Doors"; + opacity = 0 + }, +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/structure/cable/green, +/turf/simulated/floor, +/area/crew_quarters/captain) "ou" = ( /obj/structure/bed/stool/chair{ dir = 1 @@ -6487,12 +6647,17 @@ /turf/simulated/floor/tiled/dark, /area/bridge/aibunker) "oL" = ( -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal/small/west, -/obj/effect/floor_decal/corner/blue/full{ - dir = 4 +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/machinery/camera/network/command{ + c_tag = "AI Core - Third Deck Chamber Port"; + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/ramp/bottom{ + dir = 1 }, -/turf/simulated/floor/tiled/dark, /area/bridge) "oN" = ( /obj/structure/disposalpipe/segment{ @@ -6511,8 +6676,8 @@ /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) "oO" = ( -/obj/structure/bed/stool/chair/office/bridge{ - dir = 8 +/obj/effect/floor_decal/spline/fancy{ + dir = 9 }, /turf/simulated/floor/carpet/rubber, /area/bridge) @@ -6525,6 +6690,11 @@ /obj/item/pen, /turf/simulated/floor/tiled/dark, /area/bridge/aibunker) +"oQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/corner/blue/diagonal, +/turf/simulated/floor/tiled/white, +/area/bridge) "oS" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -6532,33 +6702,36 @@ /turf/simulated/floor/tiled/dark, /area/bridge/selfdestruct) "oT" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/structure/window/reinforced, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/ywflowers, -/turf/simulated/floor/grass/alt, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal/small/east, +/obj/item/device/radio/intercom{ + dir = 4; + name = "Station Intercom (General)"; + pixel_x = -25 + }, +/turf/simulated/floor/marble/dark, /area/bridge/minibar) "oU" = ( /obj/effect/shuttle_landmark/skipjack_ship/third_deck, /turf/template_noop, /area/template_noop) "oV" = ( -/obj/machinery/light{ +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 1 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/obj/structure/toilet{ - dir = 8; - pixel_y = 4 - }, -/turf/simulated/floor/tiled/freezer, +/obj/effect/floor_decal/spline/fancy/wood/corner, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "oX" = ( /obj/effect/floor_decal/spline/fancy/wood, @@ -6579,9 +6752,13 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "pc" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 }, +/obj/machinery/case_button/shuttle{ + pixel_x = 30 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/wood, /area/crew_quarters/captain) "pd" = ( @@ -6848,18 +7025,25 @@ /turf/simulated/floor, /area/template_noop) "pF" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/structure/filingcabinet{ + pixel_x = -8 }, -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 +/obj/structure/filingcabinet/chestdrawer{ + pixel_x = 8 }, -/obj/structure/mirror{ - pixel_x = -28 +/obj/machinery/light, +/obj/effect/floor_decal/spline/fancy/wood, +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled/freezer, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "pG" = ( /obj/machinery/body_scanconsole{ @@ -6884,23 +7068,15 @@ /turf/simulated/floor/tiled, /area/security/investigations_storage) "pI" = ( -/obj/structure/window/shuttle/scc_space_ship, -/obj/structure/grille, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "bridge blast"; - name = "Bridge Blast Doors"; - opacity = 0 +/obj/machinery/door/airlock/command{ + name = "Captain's Quarters"; + req_access = list(20) }, /obj/machinery/door/firedoor, -/turf/simulated/floor, +/obj/effect/floor_decal/spline/fancy/wood/cee{ + dir = 4 + }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "pJ" = ( /obj/structure/cable/green{ @@ -7000,10 +7176,12 @@ /turf/simulated/floor/tiled/dark, /area/security/vacantoffice2) "pS" = ( -/obj/structure/bed/stool/chair/office/bridge, -/obj/effect/floor_decal/spline/plain{ - dir = 8 +/obj/effect/floor_decal/spline/fancy, +/obj/effect/floor_decal/spline/fancy{ + dir = 1 }, +/obj/machinery/light, +/obj/machinery/firealarm/south, /turf/simulated/floor/carpet/rubber, /area/bridge) "pT" = ( @@ -7050,9 +7228,11 @@ /turf/simulated/floor/bluegrid, /area/turret_protected/ai) "pX" = ( -/obj/machinery/hologram/holopad/long_range, -/turf/simulated/floor/wood, -/area/crew_quarters/captain) +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/bridge) "pY" = ( /obj/machinery/bodyscanner{ dir = 8 @@ -7068,9 +7248,7 @@ /turf/simulated/floor/tiled, /area/hallway/crew_area) "qa" = ( -/obj/effect/floor_decal/corner/blue{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/tiled/dark, /area/bridge) "qb" = ( @@ -7135,15 +7313,17 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor, /area/crew_quarters/sleep/cryo) +"qg" = ( +/obj/structure/table/reinforced/wood, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/item/reagent_containers/food/drinks/shaker, +/turf/simulated/floor/marble/dark, +/area/bridge/minibar) "qh" = ( /obj/structure/window/shuttle/scc_space_ship, /obj/structure/grille, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -7152,15 +7332,24 @@ opacity = 0 }, /obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, /turf/simulated/floor, /area/crew_quarters/captain) "qi" = ( -/obj/structure/table/reinforced/wood, -/obj/machinery/chemical_dispenser/bar_alc/full, -/obj/effect/floor_decal/corner/blue{ - dir = 6 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 }, -/turf/simulated/floor/tiled, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/bed/stool/chair/padded/beige, +/turf/simulated/floor/wood, /area/bridge/minibar) "qj" = ( /obj/effect/floor_decal/industrial/warning, @@ -7335,10 +7524,18 @@ /turf/simulated/floor/tiled/white, /area/security/forensics_office) "qG" = ( -/obj/effect/floor_decal/corner/blue{ - dir = 6 +/obj/machinery/status_display{ + pixel_y = -32 }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/light, +/obj/structure/banner/scc, +/obj/effect/floor_decal/corner/blue{ + dir = 10 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 10 + }, +/turf/simulated/floor/reinforced, /area/bridge) "qI" = ( /obj/machinery/door/airlock/external{ @@ -7394,15 +7591,8 @@ /turf/simulated/floor/tiled/white, /area/medical/washroom) "qR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -28 - }, -/turf/simulated/floor/tiled/freezer, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "qS" = ( /obj/item/device/camera_film{ @@ -7525,41 +7715,40 @@ /turf/simulated/floor, /area/bridge/aibunker) "re" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/structure/table/wood, -/obj/machinery/camera/network/command{ - c_tag = "Bridge - Captain's Office West"; +/obj/item/modular_computer/console/preset/command/captain{ dir = 8 }, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/item/pen, -/obj/item/paper_scanner{ - pixel_x = 6; - pixel_y = -2 - }, -/obj/item/storage/slide_projector, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet, /area/crew_quarters/captain) "rf" = ( /obj/structure/bed/stool/chair/padded/black, /turf/simulated/floor/tiled/dark, /area/security/vacantoffice) "rg" = ( -/obj/effect/floor_decal/corner/blue{ - dir = 10 +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue/diagonal, +/obj/structure/railing/mapped{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "2-8" }, /turf/simulated/floor/tiled, -/area/bridge) +/area/bridge/aibunker) "rh" = ( /obj/item/storage/box/fancy/csi_markers{ pixel_x = -9 @@ -7673,9 +7862,6 @@ /turf/simulated/floor, /area/maintenance/engineering_ladder) "ru" = ( -/obj/structure/cable/green{ - icon_state = "1-4" - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -7692,6 +7878,16 @@ /obj/structure/window/reinforced{ dir = 4 }, +/obj/structure/table/reinforced, +/obj/item/flag/scc{ + pixel_y = 15 + }, +/obj/item/flag/scc{ + pixel_y = 10 + }, +/obj/item/flag/scc{ + pixel_y = 4 + }, /turf/simulated/floor, /area/bridge/aibunker) "rv" = ( @@ -7735,23 +7931,18 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "rC" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/railing/mapped{ + dir = 1 }, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/corner/blue{ - dir = 5 +/turf/simulated/floor/tiled/ramp/bottom{ + dir = 4 }, -/turf/simulated/floor/tiled, /area/bridge) "rD" = ( /obj/effect/floor_decal/corner/paleblue{ @@ -7854,14 +8045,11 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "rN" = ( -/obj/structure/window/reinforced, +/obj/effect/floor_decal/spline/fancy, /obj/machinery/computer/ship/engines{ dir = 1 }, -/obj/effect/floor_decal/corner/blue{ - dir = 10 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/carpet/rubber, /area/bridge) "rQ" = ( /obj/machinery/bluespacerelay, @@ -8003,11 +8191,14 @@ /turf/simulated/floor/bluegrid, /area/turret_protected/ai) "sg" = ( -/obj/effect/floor_decal/corner/blue{ - dir = 5 +/obj/structure/toilet{ + dir = 8 }, -/obj/machinery/firealarm/north, -/turf/simulated/floor/tiled, +/obj/structure/window/reinforced/tinted/frosted, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled/white, /area/bridge/bridge_crew) "sh" = ( /obj/effect/floor_decal/corner/red/diagonal, @@ -8090,12 +8281,21 @@ /turf/simulated/floor/carpet, /area/crew_quarters/lounge) "sq" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/bed/stool/bar/padded/blue, +/obj/effect/floor_decal/spline/fancy/wood, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/cable/green{ + icon_state = "1-8" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/bridge/minibar) "sr" = ( @@ -8168,22 +8368,12 @@ }, /area/tcommsat/chamber) "sy" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/structure/table/reinforced/wood, +/obj/machinery/chemical_dispenser/bar_alc/full, +/obj/effect/floor_decal/spline/plain{ dir = 8 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/marble/dark, /area/bridge/minibar) "sz" = ( /obj/structure/table/wood, @@ -8230,12 +8420,11 @@ /turf/simulated/open, /area/hallway/primary/starboard) "sG" = ( -/obj/machinery/firealarm/south, -/obj/machinery/disposal/small/north, -/obj/structure/disposalpipe/trunk{ +/obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, -/turf/simulated/floor/carpet, +/obj/machinery/hologram/holopad, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "sH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -8622,12 +8811,11 @@ /turf/simulated/floor/tiled/dark, /area/bridge/meeting_room) "tB" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/table/reinforced, /obj/effect/floor_decal/corner/blue{ - dir = 9 + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/bridge) @@ -8650,13 +8838,12 @@ /turf/simulated/floor/plating, /area/hallway/crew_area) "tE" = ( -/obj/structure/bed/stool/chair/office/bridge{ - dir = 4 +/obj/machinery/door/airlock/glass_command{ + id_tag = ""; + name = "Bridge"; + req_one_access = list(19,38) }, -/obj/effect/floor_decal/spline/plain{ - dir = 6 - }, -/turf/simulated/floor/carpet/rubber, +/turf/simulated/floor/tiled, /area/bridge) "tF" = ( /obj/machinery/door/airlock/maintenance{ @@ -8681,17 +8868,18 @@ /obj/structure/grille/diagonal{ dir = 1 }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, /turf/simulated/floor/wood, /area/crew_quarters/captain) "tI" = ( -/obj/structure/bed/padded, -/obj/item/bedsheet/captain, -/obj/machinery/atm{ - pixel_x = 32; - pixel_y = -3 +/obj/effect/map_effect/wingrille_spawn/reinforced/firedoor, +/obj/structure/cable/green{ + icon_state = "0-4" }, -/turf/simulated/floor/carpet, -/area/crew_quarters/captain) +/turf/simulated/floor, +/area/bridge) "tJ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -8759,15 +8947,20 @@ /turf/simulated/floor/wood, /area/crew_quarters/lounge/secondary) "tP" = ( -/obj/machinery/firealarm/north, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/spline/plain{ + dir = 6 + }, +/obj/machinery/light, +/obj/effect/floor_decal/corner/blue{ + dir = 1 + }, +/turf/simulated/floor/tiled, /area/bridge) "tQ" = ( -/obj/effect/floor_decal/corner/blue/full{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "2-4" }, -/obj/structure/banner/scc, -/turf/simulated/floor/tiled/dark, +/turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/bridge) "tR" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -8846,8 +9039,11 @@ /turf/simulated/floor, /area/bridge/selfdestruct) "uf" = ( -/obj/effect/floor_decal/corner/blue{ - dir = 5 +/obj/effect/floor_decal/corner/blue/full{ + dir = 8 + }, +/obj/machinery/light{ + dir = 8 }, /turf/simulated/floor/tiled, /area/bridge/bridge_crew) @@ -8907,6 +9103,19 @@ }, /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) +"um" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue{ + dir = 9 + }, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -28 + }, +/turf/simulated/floor/tiled, +/area/bridge) "un" = ( /obj/structure/table/wood, /obj/item/clothing/suit/storage/hazardvest/white{ @@ -8933,10 +9142,16 @@ /turf/simulated/floor/tiled, /area/bridge/bridge_crew) "uq" = ( -/obj/machinery/alarm{ - pixel_y = 28 +/obj/effect/floor_decal/spline/plain/corner, +/obj/effect/floor_decal/corner/blue/full{ + dir = 8 }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/camera/network/command{ + c_tag = "Bridge - Corridor Camera 2"; + dir = 4; + network = list("Command","Capt_Office") + }, +/turf/simulated/floor/tiled, /area/bridge) "ur" = ( /obj/machinery/hologram/holopad, @@ -9012,19 +9227,22 @@ /area/maintenance/substation/command) "uD" = ( /obj/machinery/light, -/obj/structure/table/wood, /obj/machinery/status_display{ pixel_y = -32 }, -/turf/simulated/floor/carpet, +/obj/item/modular_computer/console/preset/command/account, +/obj/effect/floor_decal/spline/fancy/wood, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "uE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/effect/floor_decal/corner/blue{ + dir = 5 }, -/obj/effect/floor_decal/corner/blue/diagonal, -/turf/simulated/floor/tiled, -/area/bridge/bridge_crew) +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark, +/area/bridge/aibunker) "uH" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -9106,14 +9324,26 @@ /turf/simulated/floor/tiled/white, /area/medical/washroom) "uT" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/effect/floor_decal/spline/fancy{ + dir = 4 }, -/obj/effect/floor_decal/corner/blue{ - dir = 9 +/obj/structure/cable/green{ + icon_state = "1-4" }, -/turf/simulated/floor/tiled, -/area/bridge) +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 4 + }, +/turf/simulated/floor/carpet/rubber, +/area/crew_quarters/captain) "uV" = ( /obj/machinery/alarm{ pixel_y = 28 @@ -9158,8 +9388,14 @@ /obj/machinery/light{ dir = 4 }, -/obj/effect/floor_decal/corner/blue{ - dir = 9 +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "bridge blast"; + name = "Bridge Blast Doors"; + opacity = 0 }, /turf/simulated/floor/tiled, /area/bridge) @@ -9167,24 +9403,18 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hop/xo) "va" = ( -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/effect/floor_decal/corner/blue{ + dir = 5 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/flora/pottedplant/random, /obj/machinery/camera/network/command{ - c_tag = "Bridge - Corridor Camera 3"; - dir = 1; - network = list("Command","Capt_Office") + c_tag = "Bridge - Executive Officer's Quarters" }, -/obj/effect/floor_decal/corner/blue/diagonal, -/turf/simulated/floor/tiled/white, +/obj/machinery/status_display{ + layer = 4; + pixel_y = 32 + }, +/turf/simulated/floor/tiled, /area/bridge) "vb" = ( /obj/effect/floor_decal/corner/paleblue{ @@ -9226,10 +9456,14 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "vg" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 8 +/obj/effect/floor_decal/spline/plain, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/carpet/rubber, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/bridge) "vh" = ( /obj/machinery/door/firedoor, @@ -9315,18 +9549,11 @@ /turf/simulated/floor/plating, /area/hallway/crew_area) "vw" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 +/obj/effect/floor_decal/spline/fancy, +/obj/item/modular_computer/console/preset/medical{ + dir = 1 }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/effect/floor_decal/corner/blue{ - dir = 6 - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/carpet/rubber, /area/bridge) "vx" = ( /turf/simulated/wall/r_wall, @@ -9348,6 +9575,23 @@ /obj/structure/closet/walllocker/emerglocker/south, /turf/simulated/floor/tiled, /area/hallway/crew_area) +"vz" = ( +/obj/structure/window/shuttle/scc_space_ship, +/obj/structure/grille, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "bridge blast"; + name = "Bridge Blast Doors"; + opacity = 0 + }, +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/cable/green, +/turf/simulated/floor, +/area/crew_quarters/captain) "vA" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -9545,8 +9789,18 @@ /turf/simulated/floor/beach/water/pool, /area/crew_quarters/fitness/pool) "wi" = ( -/obj/effect/map_effect/wingrille_spawn/reinforced/firedoor, -/turf/simulated/floor, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/structure/table/reinforced, +/obj/effect/floor_decal/spline/fancy{ + dir = 6 + }, +/obj/item/device/radio/off, +/obj/item/device/radio/off, +/obj/item/device/flashlight, +/obj/item/device/flashlight, +/turf/simulated/floor/carpet/rubber, /area/bridge) "wj" = ( /obj/effect/floor_decal/corner/paleblue{ @@ -9571,16 +9825,18 @@ /turf/simulated/open/airless, /area/template_noop) "wm" = ( -/obj/structure/window/reinforced, -/obj/structure/table/reinforced, -/obj/structure/window/reinforced{ - dir = 8 +/obj/machinery/status_display{ + pixel_y = -32 }, -/obj/effect/floor_decal/spline/plain{ +/obj/machinery/light, +/obj/structure/banner/scc, +/obj/effect/floor_decal/corner/blue{ dir = 10 }, -/obj/item/device/taperecorder, -/turf/simulated/floor/carpet/rubber, +/obj/effect/floor_decal/spline/plain{ + dir = 6 + }, +/turf/simulated/floor/reinforced, /area/bridge) "wn" = ( /obj/machinery/light, @@ -9863,14 +10119,11 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/aux_atmospherics/deck_3) "wY" = ( -/obj/machinery/door/airlock/command{ - id_tag = "captaindoor"; - name = "Captain's Office"; - req_access = list(20) +/obj/structure/railing/mapped, +/turf/simulated/floor/tiled/ramp/bottom{ + dir = 4 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/wood, -/area/crew_quarters/captain) +/area/bridge) "wZ" = ( /obj/effect/floor_decal/corner/grey/diagonal{ dir = 8 @@ -9909,7 +10162,7 @@ /obj/structure/grille/diagonal{ dir = 8 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/bridge/minibar) "xd" = ( /obj/structure/cable/green{ @@ -9945,12 +10198,17 @@ /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) "xg" = ( -/obj/machinery/light{ - dir = 1 +/obj/structure/bookcase, +/obj/item/book/manual/gravitygenerator, +/obj/item/book/manual/wiki/station_procedure, +/obj/item/book/manual/wiki/security_space_law, +/turf/simulated/floor/wood, +/area/crew_quarters/captain) +"xh" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 8 }, -/obj/structure/table/wood, -/obj/item/storage/secure/briefcase, -/turf/simulated/floor/carpet, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "xi" = ( /obj/effect/floor_decal/corner/paleblue{ @@ -10226,16 +10484,28 @@ /turf/simulated/floor/tiled/white, /area/medical/ward/isolation) "xU" = ( -/obj/item/device/radio/intercom{ - pixel_y = -27 +/obj/structure/banner/scc, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 }, -/obj/structure/curtain/open/shower, -/obj/random/soap, -/obj/item/bikehorn/rubberducky, -/obj/machinery/shower{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "1-4" }, -/turf/simulated/floor/tiled/freezer, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/firealarm/south, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "xV" = ( /obj/machinery/light{ @@ -10338,28 +10608,43 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "yi" = ( -/obj/machinery/light_switch{ - pixel_y = -24 +/obj/machinery/button/switch/windowtint{ + id = "cap"; + pixel_x = -25; + pixel_y = -26 }, -/obj/structure/flora/pottedplant/random, -/turf/simulated/floor/carpet, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/carpet/rubber, /area/crew_quarters/captain) "yk" = ( /obj/effect/map_effect/wingrille_spawn/reinforced/firedoor, /turf/simulated/floor, /area/maintenance/bridge) "ym" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 9 +/obj/effect/floor_decal/corner/blue{ + dir = 5 }, -/turf/simulated/floor/carpet/rubber, +/turf/simulated/floor/tiled, /area/bridge) "yn" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_command{ - id_tag = ""; - name = "Helm"; - req_one_access = list(19,38) +/obj/effect/floor_decal/corner/blue{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/cable/green{ + icon_state = "2-8" }, /turf/simulated/floor/tiled, /area/bridge) @@ -10423,12 +10708,9 @@ /turf/simulated/floor/tiled/dark, /area/crew_armory) "yu" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -28 - }, -/obj/machinery/anti_bluespace, -/turf/simulated/floor/carpet, +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal/small/east, +/turf/simulated/floor/carpet/rubber, /area/crew_quarters/captain) "yv" = ( /obj/machinery/vending/cigarette, @@ -10459,21 +10741,16 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/locker) "yA" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /obj/effect/floor_decal/corner/blue{ dir = 6 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/camera/network/command{ + c_tag = "AI Core - Third Deck Chamber Aft"; + dir = 1 + }, /turf/simulated/floor/tiled, /area/bridge) "yC" = ( @@ -10551,8 +10828,13 @@ /turf/simulated/open, /area/hallway/primary/starboard) "yL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/blue{ + dir = 10 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 10 + }, +/turf/simulated/floor/reinforced, /area/bridge) "yM" = ( /obj/structure/lattice/catwalk, @@ -10665,7 +10947,7 @@ /turf/simulated/floor/tiled/white, /area/security/forensics_morgue) "za" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall, /area/bridge/third_deck_stairs) "zb" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -10718,22 +11000,13 @@ /turf/simulated/floor/tiled, /area/hallway/crew_area) "zh" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/spline/fancy{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/floor_decal/corner/blue{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/carpet/rubber, /area/bridge) "zi" = ( /obj/effect/floor_decal/corner/paleblue{ @@ -10780,10 +11053,15 @@ /turf/simulated/floor/carpet, /area/crew_quarters/lounge/secondary) "zm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/corner/blue{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/obj/effect/floor_decal/corner/blue/diagonal, /turf/simulated/floor/tiled, /area/bridge/bridge_crew) "zo" = ( @@ -10831,8 +11109,19 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "zx" = ( -/obj/machinery/papershredder, -/turf/simulated/floor/carpet/rubber, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/corner/blue/full{ + dir = 8 + }, +/obj/structure/filingcabinet{ + pixel_x = -8 + }, +/obj/structure/filingcabinet/chestdrawer{ + pixel_x = 8 + }, +/turf/simulated/floor/tiled, /area/bridge) "zz" = ( /obj/structure/railing/mapped{ @@ -10904,13 +11193,17 @@ }, /area/tcommsat/chamber) "zI" = ( -/obj/machinery/alarm{ - pixel_y = 28 +/obj/structure/bed/stool/chair/padded/beige{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 24 }, -/obj/structure/table/wood, -/obj/item/storage/box/fancy/cigarettes/cigar, -/obj/item/modular_computer/laptop/preset/command/captain, -/obj/item/paper/monitorkey, /turf/simulated/floor/carpet, /area/crew_quarters/captain) "zJ" = ( @@ -10919,6 +11212,16 @@ }, /turf/simulated/floor/bluegrid, /area/turret_protected/ai) +"zK" = ( +/obj/effect/floor_decal/corner/blue{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/bridge/bridge_crew) "zL" = ( /obj/effect/map_effect/airlock/long/square/wide/mining, /turf/simulated/wall/shuttle/scc_space_ship/cardinal, @@ -10990,15 +11293,10 @@ }, /area/hallway/primary/starboard) "zV" = ( -/obj/structure/table/reinforced/wood, +/obj/machinery/vending/dinnerware, /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 }, -/obj/item/device/radio/intercom{ - dir = 4; - name = "Station Intercom (General)"; - pixel_x = -25 - }, /turf/simulated/floor/wood, /area/bridge/minibar) "zW" = ( @@ -11023,11 +11321,14 @@ /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) "zX" = ( -/obj/structure/window/reinforced{ +/obj/structure/railing/mapped{ dir = 4 }, /obj/structure/table/reinforced, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/spline/fancy{ + dir = 4 + }, +/turf/simulated/floor/carpet/rubber, /area/bridge) "zY" = ( /obj/machinery/door/firedoor, @@ -11131,12 +11432,10 @@ /turf/simulated/floor/wood, /area/bridge/meeting_room) "Ah" = ( -/obj/structure/bed/stool/chair/padded/black{ +/obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 6 - }, +/obj/structure/flora/pottedplant/random, /turf/simulated/floor/wood, /area/bridge/minibar) "Ai" = ( @@ -11180,26 +11479,22 @@ "Ao" = ( /turf/simulated/floor/tiled/freezer, /area/crew_quarters/toilet) -"As" = ( -/obj/machinery/door/window/southleft, -/obj/effect/floor_decal/corner/blue{ +"Ar" = ( +/obj/effect/floor_decal/spline/plain{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/bed/stool/chair/padded/beige{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/captain) +"As" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/ramp/bottom, /area/bridge) "At" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/junction{ - dir = 4 - }, +/obj/structure/table/reinforced/wood, +/obj/item/storage/slide_projector, /turf/simulated/floor/carpet, /area/crew_quarters/captain) "Au" = ( @@ -11327,10 +11622,14 @@ /turf/simulated/floor/wood, /area/lawoffice/representative) "AJ" = ( -/obj/effect/floor_decal/corner/blue{ - dir = 9 +/obj/effect/floor_decal/spline/plain, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/bridge) "AK" = ( /obj/effect/map_effect/wingrille_spawn/reinforced/polarized{ @@ -11348,6 +11647,22 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) +"AM" = ( +/obj/structure/window/shuttle/scc_space_ship, +/obj/structure/grille, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "bridge blast"; + name = "Bridge Blast Doors"; + opacity = 0 + }, +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor, +/area/crew_quarters/captain) "AN" = ( /obj/structure/table/wood, /obj/item/paper_bin, @@ -11357,12 +11672,17 @@ "AO" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 5 + dir = 1 + }, +/obj/structure/flora/pottedplant/random, +/obj/machinery/camera/network/command{ + c_tag = "Bridge - Corridor Camera 1" }, /turf/simulated/floor/wood, /area/bridge/minibar) "AP" = ( -/turf/simulated/floor/tiled, +/obj/structure/table/reinforced/wood, +/turf/simulated/floor/wood, /area/bridge/minibar) "AQ" = ( /obj/structure/bed/stool/chair/office/bridge, @@ -11468,9 +11788,6 @@ /turf/simulated/floor/tiled/dark, /area/crew_armory) "Bc" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, @@ -11565,22 +11882,10 @@ /turf/simulated/floor/carpet, /area/crew_quarters/lounge) "Bn" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/spline/fancy{ + dir = 5 }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "bridge blast"; - name = "Bridge Blast Doors"; - opacity = 0 - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/carpet/rubber, /area/bridge) "Bp" = ( /obj/machinery/alarm{ @@ -11632,6 +11937,19 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/cafeteria) +"Bw" = ( +/obj/machinery/door/airlock/hatch{ + desc = "It opens and closes. It has a small sign engraved: Bunker capacity: 6. Only facility's Command Staff is permitted."; + icon_state = "door_locked"; + id_tag = "RunCapRun"; + locked = 1; + name = "Maintenance Access"; + req_access = list(20); + secured_wires = 1 + }, +/obj/structure/plasticflaps/airtight, +/turf/simulated/floor, +/area/crew_quarters/captain) "Bx" = ( /obj/machinery/door/firedoor, /obj/machinery/door/window/westright, @@ -11762,28 +12080,23 @@ /turf/simulated/floor/tiled/dark, /area/engineering/break_room) "BN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, -/obj/structure/banner/scc, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/crew_quarters/captain) "BO" = ( -/obj/structure/window/reinforced{ - dir = 4 +/obj/effect/floor_decal/spline/plain{ + dir = 9 }, -/obj/structure/window/reinforced{ - dir = 8 +/obj/structure/disposalpipe/segment, +/obj/structure/sink{ + dir = 8; + pixel_x = -12 }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/flora/ausbushes/sunnybush, -/turf/simulated/floor/grass/alt, +/turf/simulated/floor/marble/dark, /area/bridge/minibar) "BP" = ( /obj/machinery/power/apc/critical{ @@ -11797,15 +12110,16 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/cryo) "BQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/light{ - dir = 8 +/obj/structure/window/shuttle/scc_space_ship, +/obj/structure/grille/diagonal{ + dir = 1 }, -/obj/effect/floor_decal/corner/blue/full{ - dir = 8 +/obj/effect/floor_decal/spline/fancy/wood, +/obj/structure/cable/green{ + icon_state = "2-8" }, -/turf/simulated/floor/tiled, -/area/bridge) +/turf/simulated/floor/wood, +/area/crew_quarters/captain) "BS" = ( /obj/effect/floor_decal/industrial/outline/red, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -11816,6 +12130,18 @@ }, /turf/simulated/floor, /area/maintenance/bridge) +"BT" = ( +/obj/effect/floor_decal/corner/blue{ + dir = 6 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/bridge) "BU" = ( /obj/structure/lattice, /obj/machinery/light/spot/weak, @@ -11873,18 +12199,13 @@ /turf/simulated/floor/tiled, /area/bridge) "Ch" = ( -/obj/structure/table/reinforced/wood, -/obj/machinery/chemical_dispenser/bar_soft/full, -/obj/effect/floor_decal/corner/blue{ - dir = 9 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable/green{ icon_state = "1-8" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/bridge/minibar) "Ci" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -11903,11 +12224,12 @@ /turf/simulated/floor/wood, /area/bridge/meeting_room) "Ck" = ( -/obj/structure/bed/stool/chair/padded/brown{ - dir = 8 - }, /obj/machinery/firealarm/east, -/turf/simulated/floor/carpet, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 + }, +/obj/structure/displaycase/captain_laser, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "Cl" = ( /obj/structure/cable/green{ @@ -11978,14 +12300,11 @@ /turf/simulated/floor, /area/maintenance/security_starboard) "Cs" = ( -/obj/structure/window/reinforced, +/obj/effect/floor_decal/spline/fancy, /obj/machinery/computer/ship/helm{ dir = 1 }, -/obj/effect/floor_decal/corner/blue{ - dir = 10 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/carpet/rubber, /area/bridge) "Cu" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, @@ -12001,19 +12320,10 @@ /turf/simulated/floor/tiled/white, /area/medical/washroom) "Cw" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/railing/mapped, +/turf/simulated/floor/tiled/ramp/bottom{ + dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, /area/bridge) "Cx" = ( /obj/effect/floor_decal/corner/paleblue{ @@ -12257,7 +12567,7 @@ /turf/simulated/floor, /area/maintenance/bridge) "Dg" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall, /area/bridge/meeting_room) "Dh" = ( /obj/structure/cable/green{ @@ -12432,23 +12742,21 @@ /turf/simulated/floor/tiled, /area/bridge/aibunker) "DE" = ( -/obj/structure/window/reinforced, +/obj/effect/floor_decal/spline/fancy, /obj/machinery/computer/ship/sensors{ dir = 1 }, -/obj/effect/floor_decal/corner/blue{ - dir = 10 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/carpet/rubber, /area/bridge) "DF" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/corner/blue{ + dir = 4 }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, +/obj/structure/bed/stool/chair/office/bridge, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, /area/bridge) "DG" = ( /obj/structure/bed/stool/chair/office/bridge, @@ -12486,11 +12794,8 @@ /area/medical/washroom) "DN" = ( /obj/machinery/light, -/obj/structure/bed/stool/chair/padded/black{ - dir = 4 - }, -/obj/effect/floor_decal/spline/fancy/wood, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/marble/dark, /area/bridge/minibar) "DP" = ( /obj/machinery/light/small{ @@ -12749,10 +13054,12 @@ /turf/simulated/floor/tiled/dark, /area/security/vacantoffice) "Es" = ( -/obj/structure/displaycase/captain_laser, /obj/machinery/camera/network/command{ c_tag = "Bridge - Captain's Quarters" }, +/obj/structure/bed/stool/chair/padded/beige{ + dir = 4 + }, /turf/simulated/floor/carpet, /area/crew_quarters/captain) "Et" = ( @@ -12817,6 +13124,9 @@ /obj/machinery/status_display{ pixel_y = -32 }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled/dark, /area/bridge/aibunker) "EB" = ( @@ -12887,6 +13197,23 @@ }, /turf/simulated/floor/tiled, /area/hallway/crew_area) +"EQ" = ( +/obj/structure/window/shuttle/scc_space_ship, +/obj/structure/grille, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "bridge blast"; + name = "Bridge Blast Doors"; + opacity = 0 + }, +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor, +/area/crew_quarters/captain) "EU" = ( /obj/machinery/door/window/northleft, /obj/effect/floor_decal/spline/plain{ @@ -12982,6 +13309,11 @@ /obj/item/stack/wrapping_paper, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop/xo) +"Fd" = ( +/obj/structure/bed/stool/bar/padded/blue, +/obj/effect/floor_decal/spline/fancy/wood, +/turf/simulated/floor/wood, +/area/bridge/minibar) "Fe" = ( /obj/machinery/telecomms/processor/preset_two, /turf/simulated/floor/tiled{ @@ -13043,6 +13375,7 @@ /obj/effect/floor_decal/corner/blue{ dir = 10 }, +/obj/item/storage/firstaid, /turf/simulated/floor/tiled, /area/bridge/aibunker) "Fo" = ( @@ -13215,11 +13548,13 @@ /turf/simulated/floor, /area/maintenance/engineering_ladder) "FF" = ( -/obj/machinery/vending/dinnerware, -/obj/effect/floor_decal/corner/blue/full{ +/obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, -/turf/simulated/floor/tiled, +/obj/structure/bed/stool/chair/padded/beige{ + dir = 1 + }, +/turf/simulated/floor/wood, /area/bridge/minibar) "FG" = ( /obj/machinery/power/breakerbox/activated{ @@ -13231,46 +13566,18 @@ /turf/simulated/wall/r_wall, /area/maintenance/engineering_ladder) "FI" = ( -/obj/structure/bed/stool/chair/office/bridge, -/obj/machinery/computer/security/telescreen{ - name = "Access Monitor"; - network = list("Capt_Office"); - pixel_y = 30 - }, -/obj/machinery/button/remote/airlock{ - desc = "A remote control-switch for the starboard bridge doors."; - id = "sbridgedoor"; - name = "Bridge Door Control"; - pixel_x = -8; - pixel_y = -25; - req_access = list(20) - }, -/obj/machinery/light_switch{ - pixel_x = 25; - pixel_y = 26 - }, -/obj/machinery/button/remote/airlock{ - desc = "A remote control-switch for the office door."; - id = "captaindoor"; - name = "Office Door Control"; - pixel_x = 5; - pixel_y = -25; - req_access = list(20) - }, -/obj/machinery/button/switch/windowtint{ - id = "cap"; - pixel_x = -17; - pixel_y = -26 - }, /obj/machinery/button/remote/blast_door{ desc = "A remote control-switch for engine core."; id = "sat_blast"; name = "Scuttling Device Blast Doors Control"; - pixel_x = 35; - pixel_y = 27; + pixel_x = 32; + pixel_y = 35; req_access = list(20) }, -/turf/simulated/floor/wood, +/obj/item/storage/secure/safe{ + pixel_x = 65 + }, +/turf/simulated/floor/carpet, /area/crew_quarters/captain) "FJ" = ( /obj/structure/cable/green{ @@ -13323,18 +13630,9 @@ }, /area/tcommsat/chamber) "FQ" = ( -/obj/effect/floor_decal/corner/blue{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/tiled/dark, /area/bridge) "FR" = ( @@ -13390,12 +13688,9 @@ /turf/simulated/floor/wood, /area/security/vacantoffice2) "FZ" = ( -/obj/structure/table/wood, -/obj/item/pinpointer, -/obj/item/disk/nuclear, -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 +/obj/structure/table/reinforced/wood, +/obj/machinery/light{ + dir = 1 }, /turf/simulated/floor/carpet, /area/crew_quarters/captain) @@ -13419,17 +13714,17 @@ /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) "Gf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/railing/mapped{ + dir = 1 + }, +/obj/effect/floor_decal/corner/blue{ + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/corner/blue/full{ - dir = 1 + dir = 6 }, /turf/simulated/floor/tiled/dark, /area/bridge) @@ -13471,6 +13766,13 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/selfdestruct) +"Gl" = ( +/obj/structure/table/reinforced/wood, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/marble/dark, +/area/bridge/minibar) "Go" = ( /obj/effect/floor_decal/corner_wide/blue{ dir = 10 @@ -13489,7 +13791,23 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "Gq" = ( -/obj/machinery/hologram/holopad, +/obj/structure/railing/mapped{ + dir = 8 + }, +/obj/structure/table/reinforced, +/obj/effect/floor_decal/spline/fancy{ + dir = 10 + }, +/obj/item/tape_roll, +/obj/item/tape_roll, +/obj/item/tape_roll, +/obj/item/tape_roll, +/obj/item/storage/toolbox/mechanical, +/obj/machinery/camera/network/command{ + c_tag = "AI Core - Third Deck Chamber Starboard"; + dir = 4 + }, +/obj/item/device/multitool, /turf/simulated/floor/carpet/rubber, /area/bridge) "Gr" = ( @@ -13581,22 +13899,33 @@ /turf/simulated/floor/tiled, /area/hallway/crew_area) "GA" = ( -/obj/machinery/door/window{ - icon_state = "right"; - name = "Captain's Desk Access"; - req_access = list(20) +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 }, -/turf/simulated/floor/tiled/ramp/bottom, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "GB" = ( /obj/effect/map_effect/wingrille_spawn/reinforced/firedoor, /turf/simulated/floor/tiled, /area/hallway/crew_area) "GD" = ( +/obj/structure/bed/stool/bar/padded/blue, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 + dir = 8 }, -/obj/structure/bed/stool/bar/padded/red, /turf/simulated/floor/wood, /area/bridge/minibar) "GE" = ( @@ -13671,19 +14000,24 @@ /turf/simulated/floor, /area/maintenance/engineering_ladder) "GL" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, +/obj/effect/floor_decal/spline/fancy/wood/corner, /obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 6 }, -/turf/simulated/floor/carpet, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "GO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -13711,22 +14045,13 @@ /turf/simulated/floor/plating, /area/hallway/crew_area) "GR" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/spline/fancy{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/effect/floor_decal/corner/blue{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/carpet/rubber, /area/bridge) "GT" = ( /obj/structure/cable/green{ @@ -13818,11 +14143,28 @@ }, /turf/simulated/floor/wood, /area/bridge/minibar) +"Hb" = ( +/obj/effect/floor_decal/spline/fancy, +/obj/effect/floor_decal/spline/fancy{ + dir = 1 + }, +/turf/simulated/floor/carpet/rubber, +/area/bridge) "Hc" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/cryo) +"Hd" = ( +/obj/structure/window/shuttle/scc_space_ship, +/obj/structure/grille/diagonal{ + dir = 8 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/bridge/minibar) "He" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/machinery/reagentgrinder{ @@ -13837,12 +14179,16 @@ /turf/simulated/floor, /area/maintenance/engineering_ladder) "Hg" = ( -/obj/structure/window/reinforced, -/obj/structure/table/reinforced, -/obj/item/device/multitool, -/obj/item/wrench, -/obj/effect/floor_decal/spline/plain, -/turf/simulated/floor/carpet/rubber, +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/machinery/camera/network/command{ + c_tag = "AI Core - Third Deck Chamber Starboard"; + dir = 4 + }, +/turf/simulated/floor/tiled/ramp/bottom{ + dir = 1 + }, /area/bridge) "Hh" = ( /turf/simulated/wall, @@ -13862,6 +14208,16 @@ /obj/machinery/door/firedoor, /turf/simulated/floor, /area/crew_quarters/heads/hop/xo) +"Hj" = ( +/mob/living/simple_animal/corgi/fox/Chauncey, +/obj/effect/floor_decal/spline/fancy/wood/full, +/obj/effect/floor_decal/plaque{ + desc = "The Stellar Corporate Conglomerate Logo Engraved in bronze." ; + desc_fluff = "The unbreakable chainklink, the one thing holding the Orion Spur together..."; + name = "Commemorative SCC Plaque" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/captain) "Hk" = ( /obj/effect/floor_decal/corner_wide/blue/full, /obj/structure/closet/emcloset, @@ -13894,11 +14250,16 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "Hp" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/effect/floor_decal/corner/blue{ - dir = 6 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/glass_command{ + id_tag = ""; + name = "Bridge"; + req_one_access = list(19,38) }, /turf/simulated/floor/tiled, /area/bridge) @@ -14034,10 +14395,20 @@ /area/tcommsat/entrance) "HC" = ( /obj/structure/bed/stool/chair/office/bridge, -/obj/effect/floor_decal/spline/plain{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 6 + }, +/obj/effect/floor_decal/corner/yellow, +/obj/effect/floor_decal/corner/yellow{ dir = 1 }, -/turf/simulated/floor/carpet/rubber, +/turf/simulated/floor/tiled/dark, /area/bridge) "HD" = ( /obj/structure/disposalpipe/segment, @@ -14045,17 +14416,11 @@ /turf/simulated/floor, /area/hallway/medical/upper) "HE" = ( +/obj/structure/bed/stool/chair/padded/beige{ + dir = 8 + }, /obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 + icon_state = "1-2" }, /turf/simulated/floor/carpet, /area/crew_quarters/captain) @@ -14067,20 +14432,14 @@ /turf/simulated/floor/tiled/dark, /area/bridge/aibunker) "HG" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/railing/mapped, +/obj/effect/floor_decal/corner/blue{ + dir = 10 }, -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/machinery/computer/security{ + dir = 1 }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/bridge) "HH" = ( /obj/effect/floor_decal/corner/red/diagonal, @@ -14142,11 +14501,15 @@ /turf/simulated/floor/tiled/white, /area/bridge) "HP" = ( -/obj/machinery/photocopier, -/obj/machinery/keycard_auth{ - pixel_y = 24 +/obj/effect/map_effect/wingrille_spawn/reinforced/polarized{ + id = "cap" }, -/turf/simulated/floor/wood, +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/structure/cable/green, +/turf/simulated/floor, /area/crew_quarters/captain) "HR" = ( /obj/machinery/light, @@ -14155,10 +14518,25 @@ /turf/simulated/floor/tiled/dark, /area/crew_armory) "HT" = ( -/obj/machinery/door/window/southright, -/obj/effect/floor_decal/corner/blue, -/turf/simulated/floor/tiled/dark, -/area/bridge) +/obj/structure/window/shuttle/scc_space_ship, +/obj/structure/grille, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "bridge blast"; + name = "Bridge Blast Doors"; + opacity = 0 + }, +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor, +/area/crew_quarters/captain) "HU" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 6 @@ -14181,15 +14559,20 @@ /turf/simulated/floor, /area/maintenance/engineering_ladder) "HW" = ( -/obj/structure/table/reinforced, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ +/obj/structure/railing/mapped{ dir = 8 }, -/obj/effect/floor_decal/spline/plain{ - dir = 10 +/obj/effect/floor_decal/corner/blue/full{ + dir = 8 }, -/turf/simulated/floor/carpet/rubber, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/structure/flora/pottedplant/random, +/turf/simulated/floor/tiled/dark, /area/bridge) "HX" = ( /obj/machinery/firealarm/north, @@ -14226,21 +14609,14 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/fitness/pool) "Id" = ( +/obj/effect/floor_decal/corner/blue/full{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/effect/floor_decal/corner/blue{ - dir = 6 + icon_state = "1-2" }, /turf/simulated/floor/tiled, /area/bridge) @@ -14298,14 +14674,20 @@ /obj/item/book/manual/wiki/security_space_law, /turf/simulated/floor/tiled/dark, /area/bridge/aibunker) -"Im" = ( +"Il" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 5 }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/white, +/area/bridge/bridge_crew) +"Im" = ( +/obj/structure/table/reinforced/wood, +/obj/item/pinpointer, +/obj/item/disk/nuclear, +/turf/simulated/floor/carpet, /area/crew_quarters/captain) "Ip" = ( /obj/structure/lattice/catwalk/indoor/grate, @@ -14432,12 +14814,17 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "IB" = ( -/obj/structure/table/reinforced/wood, -/obj/item/reagent_containers/glass/rag, -/obj/item/reagent_containers/food/drinks/shaker, -/obj/effect/floor_decal/corner/blue/full, -/turf/simulated/floor/tiled, -/area/bridge/minibar) +/obj/effect/floor_decal/spline/plain/corner{ + dir = 8 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/captain) "ID" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/table/wood, @@ -14641,8 +15028,12 @@ /turf/simulated/floor, /area/maintenance/security_starboard) "IU" = ( -/obj/effect/floor_decal/corner/blue{ - dir = 9 +/obj/machinery/recharger/wallcharger{ + pixel_y = 28; + pixel_x = 5 + }, +/obj/effect/floor_decal/corner/blue/full{ + dir = 8 }, /turf/simulated/floor/tiled, /area/bridge/bridge_crew) @@ -14731,12 +15122,31 @@ /turf/simulated/open, /area/hallway/crew_area) "Je" = ( -/obj/machinery/door/firedoor, -/obj/effect/floor_decal/corner/blue{ - dir = 9 +/obj/effect/floor_decal/spline/plain{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/bridge) +/obj/machinery/camera/network/command{ + c_tag = "AI Core - Third Deck Chamber Aft"; + dir = 1 + }, +/obj/effect/floor_decal/spline/fancy/wood, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/newscaster/security_unit{ + pixel_y = -32 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/captain) "Jf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -14762,17 +15172,13 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "Jl" = ( -/obj/effect/floor_decal/corner/blue{ - dir = 9 +/obj/machinery/light{ + dir = 8 }, -/obj/structure/table/standard, -/obj/item/folder/blue, -/obj/item/folder/blue, -/obj/item/folder/blue, -/obj/machinery/recharger/wallcharger{ - pixel_x = -26 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/white, /area/bridge/bridge_crew) "Jm" = ( /obj/machinery/power/apc/low{ @@ -15020,8 +15426,8 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 +/obj/effect/floor_decal/spline/fancy/wood/corner{ + dir = 8 }, /turf/simulated/floor/wood, /area/bridge/minibar) @@ -15139,15 +15545,20 @@ /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) "Ka" = ( -/obj/structure/cable/green{ - icon_state = "1-4" +/obj/effect/floor_decal/spline/fancy/wood/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/map_effect/wingrille_spawn/reinforced/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, /obj/structure/cable/green{ - icon_state = "0-4" + icon_state = "4-8" }, /turf/simulated/floor/wood, /area/crew_quarters/captain) @@ -15202,16 +15613,18 @@ /turf/simulated/floor/tiled/white, /area/medical/washroom) "Kf" = ( -/obj/effect/overmap/visitable/ship/sccv_horizon, /obj/effect/floor_decal/corner/blue{ dir = 5 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/light{ + dir = 1 }, +/obj/effect/overmap/visitable/ship/sccv_horizon, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/corner/paleblue, +/obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/dark, /area/bridge) "Kg" = ( @@ -15241,12 +15654,14 @@ /turf/simulated/floor/tiled/white, /area/medical/washroom) "Kl" = ( -/obj/structure/table/rack, -/obj/item/clothing/shoes/magboots, -/obj/item/tank/jetpack/oxygen, -/obj/item/clothing/suit/space/void/captain, -/obj/item/clothing/head/helmet/space/void/captain, -/turf/simulated/floor/carpet, +/obj/machinery/button/remote/airlock{ + id = "RunCapRun"; + name = "Maintenance Bolts"; + pixel_x = -26; + req_access = list(20); + specialfunctions = 4 + }, +/turf/simulated/floor, /area/crew_quarters/captain) "Km" = ( /obj/machinery/disposal/small/west{ @@ -15287,17 +15702,18 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "Kq" = ( -/obj/machinery/door/window/eastright, -/turf/simulated/floor/carpet/rubber, +/obj/effect/floor_decal/spline/plain, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/bridge) "Kr" = ( -/obj/structure/cable/green{ - icon_state = "0-8" - }, /obj/effect/map_effect/wingrille_spawn/reinforced/polarized{ id = "cap" }, /obj/machinery/door/firedoor, +/obj/structure/cable/green, /turf/simulated/floor, /area/crew_quarters/captain) "Ks" = ( @@ -15372,6 +15788,21 @@ temperature = 278 }, /area/tcommsat/chamber) +"Kx" = ( +/obj/structure/railing/mapped{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/ramp/bottom, +/area/crew_quarters/captain) "Ky" = ( /obj/structure/window/shuttle/scc_space_ship, /obj/structure/grille, @@ -15621,14 +16052,11 @@ }, /area/tcommsat/chamber) "Ld" = ( -/obj/structure/bed/stool/chair/padded/black{ - dir = 1 - }, /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, -/obj/machinery/status_display{ - pixel_x = -32 +/obj/machinery/light{ + dir = 8 }, /turf/simulated/floor/wood, /area/bridge/minibar) @@ -15758,14 +16186,16 @@ /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) "Lu" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, /obj/machinery/light{ - dir = 8 + dir = 4 }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -25 +/obj/effect/floor_decal/corner/blue{ + dir = 9 }, -/obj/machinery/door/window/southright, -/turf/simulated/floor/tiled/ramp/bottom, +/turf/simulated/floor/tiled, /area/bridge) "Lv" = ( /obj/structure/trash_pile, @@ -15842,20 +16272,11 @@ /turf/simulated/floor/wood, /area/crew_quarters/lounge) "LG" = ( -/obj/structure/sign/nosmoking_2{ - pixel_x = 32 - }, -/obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = 25 - }, -/obj/structure/table/wood, -/obj/item/storage/photo_album, -/obj/item/device/camera, -/obj/item/reagent_containers/food/drinks/flask{ - pixel_x = 8 - }, -/turf/simulated/floor/carpet, +/obj/structure/bookcase, +/obj/item/book/manual/psych, +/obj/item/book/manual/stasis, +/obj/item/book/manual/tcfl_pamphlet, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "LH" = ( /obj/machinery/power/apc/low{ @@ -15866,10 +16287,10 @@ /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/effect/floor_decal/corner/blue/full{ - dir = 8 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/bridge/minibar) "LI" = ( /obj/effect/floor_decal/corner/paleblue{ @@ -15921,11 +16342,13 @@ /turf/simulated/floor/tiled/dark, /area/storage/shields) "LN" = ( -/obj/structure/filingcabinet, -/obj/structure/window/reinforced{ - dir = 4 +/obj/structure/table/reinforced, +/obj/effect/floor_decal/corner/blue{ + dir = 5 }, -/turf/simulated/floor/carpet/rubber, +/obj/item/paper_bin, +/obj/item/pen, +/turf/simulated/floor/tiled, /area/bridge) "LO" = ( /obj/structure/cable/green{ @@ -16195,13 +16618,11 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/cafeteria) "Mw" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/obj/machinery/shipsensors{ + pixel_y = 7 }, -/obj/effect/floor_decal/corner/blue{ - dir = 10 - }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/warning/full, +/turf/simulated/floor/reinforced, /area/bridge) "Mx" = ( /obj/structure/disposalpipe/segment, @@ -16299,25 +16720,31 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/cryo) "MJ" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/spline/plain, +/obj/effect/floor_decal/corner/blue{ + dir = 1 }, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/glass_command{ - id_tag = ""; - name = "Bridge"; - req_one_access = list(19,38) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 1 }, /turf/simulated/floor/tiled, /area/bridge) "ML" = ( -/obj/machinery/button/remote/blast_door{ - id = "hangarlockdown"; - name = "Hangar Lockdoor"; - pixel_x = -32 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, /turf/simulated/floor/tiled/dark, /area/bridge) @@ -16379,8 +16806,10 @@ /turf/simulated/floor/tiled/ramp/bottom, /area/hallway/primary/starboard) "MV" = ( -/obj/structure/bed/stool/chair/office/bridge, -/obj/effect/floor_decal/spline/plain, +/obj/effect/floor_decal/spline/fancy, +/obj/item/modular_computer/console/preset/research{ + dir = 1 + }, /turf/simulated/floor/carpet/rubber, /area/bridge) "MW" = ( @@ -16424,12 +16853,17 @@ /turf/simulated/floor, /area/hallway/primary/starboard) "Na" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/suit_cycler/captain, +/obj/item/clothing/suit/space/void/captain, +/obj/item/tank/jetpack/oxygen, +/obj/item/clothing/head/helmet/space/void/captain, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, +/obj/machinery/camera/network/command{ + c_tag = "Bridge - Corridor Camera 1" + }, +/obj/machinery/firealarm/north, /turf/simulated/floor/wood, /area/crew_quarters/captain) "Nb" = ( @@ -16467,9 +16901,11 @@ /turf/simulated/floor/tiled/dark, /area/crew_armory) "Ng" = ( -/obj/machinery/door/window/eastright, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/railing/mapped{ + dir = 1 + }, +/obj/effect/floor_decal/corner/blue/full{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -16477,12 +16913,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/alarm{ - pixel_y = 28 - }, -/turf/simulated/floor/tiled/ramp/bottom{ - dir = 4 - }, +/turf/simulated/floor/tiled/dark, /area/bridge) "Ni" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -16589,15 +17020,19 @@ /turf/simulated/floor/tiled/dark, /area/storage/shields) "Nu" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/effect/floor_decal/corner/blue{ + dir = 6 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/machinery/camera/network/command{ - c_tag = "Bridge - Helm 3"; - dir = 4 - }, -/obj/effect/floor_decal/corner/blue/full, -/obj/structure/closet/emcloset, +/obj/machinery/disposal/small/west, /turf/simulated/floor/tiled, /area/bridge) "Nv" = ( @@ -16646,10 +17081,17 @@ /obj/machinery/newscaster{ pixel_y = -30 }, -/obj/structure/bed/stool/chair{ - dir = 1 - }, /obj/effect/floor_decal/corner/blue/full, +/obj/structure/table/standard, +/obj/item/device/radio/off, +/obj/item/device/radio/off, +/obj/item/device/radio/off, +/obj/item/device/flashlight, +/obj/item/device/flashlight, +/obj/item/device/flashlight, +/obj/item/crowbar/red, +/obj/item/crowbar/red, +/obj/item/crowbar/red, /turf/simulated/floor/tiled, /area/bridge/bridge_crew) "NB" = ( @@ -16674,11 +17116,13 @@ /turf/simulated/floor/tiled/dark, /area/medical/ward/isolation) "NF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/bed/stool/chair/padded/brown{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/carpet, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "NG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -16759,13 +17203,6 @@ /obj/effect/floor_decal/corner/blue{ dir = 10 }, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "bridge blast"; - name = "Bridge Blast Doors"; - opacity = 0 - }, /turf/simulated/floor/tiled, /area/bridge/aibunker) "NP" = ( @@ -16787,17 +17224,8 @@ /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) "NQ" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 8 +/obj/effect/floor_decal/spline/fancy{ + dir = 1 }, /turf/simulated/floor/carpet/rubber, /area/bridge) @@ -16870,22 +17298,29 @@ /area/security/investigations) "NZ" = ( /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/corner/blue{ - dir = 6 - }, -/obj/effect/floor_decal/corner/blue{ - dir = 8 +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "bridge blast"; + name = "Bridge Blast Doors"; + opacity = 0 }, /turf/simulated/floor/tiled, /area/bridge) @@ -16979,13 +17414,16 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hop/xo) "Ok" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/effect/floor_decal/spline/fancy/wood, +/obj/machinery/camera/network/command{ + c_tag = "AI Core - Third Deck Chamber Aft"; dir = 1 }, -/obj/structure/bed/stool/chair/padded/brown{ - dir = 4 +/obj/structure/table/reinforced/wood, +/obj/machinery/photocopier/faxmachine{ + department = "Captain's Office" }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "Ol" = ( /obj/structure/bed/stool/chair/office/dark{ @@ -17009,17 +17447,23 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/effect/floor_decal/corner/blue{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/corner/blue/diagonal, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/bridge/bridge_crew) "Oo" = ( -/turf/simulated/floor/carpet/rubber, +/obj/effect/floor_decal/spline/plain/corner, +/obj/effect/floor_decal/corner/blue{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, /area/bridge) "Op" = ( /obj/machinery/light{ @@ -17109,10 +17553,30 @@ /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) "OA" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, /obj/effect/floor_decal/corner/blue{ dir = 6 }, -/obj/structure/closet/walllocker/emerglocker/east, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/bridge) "OB" = ( @@ -17132,21 +17596,23 @@ /turf/simulated/floor/tiled/dark, /area/security/investigations) "OD" = ( -/obj/structure/table/standard, -/obj/effect/floor_decal/corner/blue/full{ - dir = 8 +/obj/structure/sink{ + dir = 8; + pixel_x = -12 }, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 +/obj/structure/mirror{ + pixel_x = -28 }, -/obj/item/pen, -/turf/simulated/floor/tiled, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, /area/bridge/bridge_crew) "OG" = ( -/obj/effect/floor_decal/corner/blue/full, -/obj/structure/banner/scc, -/turf/simulated/floor/tiled/dark, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/bridge) "OH" = ( /obj/machinery/power/apc/low{ @@ -17169,17 +17635,22 @@ /turf/simulated/floor/wood, /area/hallway/primary/starboard) "OJ" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/railing/mapped{ + dir = 1 + }, +/obj/effect/floor_decal/corner/blue/full{ + dir = 8 }, /obj/machinery/light{ - dir = 4 + dir = 8 }, -/obj/structure/bed/stool/chair/office/bridge, -/obj/effect/floor_decal/spline/plain{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/turf/simulated/floor/carpet/rubber, +/obj/machinery/keycard_auth{ + pixel_x = -23 + }, +/turf/simulated/floor/tiled/dark, /area/bridge) "OK" = ( /obj/structure/table/wood, @@ -17230,18 +17701,22 @@ }, /area/tcommsat/chamber) "OP" = ( +/obj/structure/railing/mapped, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/command{ - name = "Captain's Quarters"; - req_access = list(20) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/ramp/bottom{ + dir = 4 }, -/turf/simulated/floor/wood, /area/crew_quarters/captain) "OQ" = ( /obj/structure/cable/green{ @@ -17351,17 +17826,14 @@ /turf/simulated/floor/tiled/dark, /area/security/vacantoffice) "Pd" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/structure/window/reinforced, -/obj/effect/floor_decal/spline/plain{ - dir = 6 - }, -/obj/machinery/computer/message_monitor{ +/obj/effect/floor_decal/corner/blue{ dir = 1 }, -/turf/simulated/floor/carpet/rubber, +/obj/structure/bed/stool/chair/office/bridge, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, /area/bridge) "Pe" = ( /obj/structure/sign/electricshock{ @@ -17373,11 +17845,14 @@ /turf/simulated/floor/carpet/rubber, /area/tcommsat/entrance) "Pf" = ( +/obj/structure/railing/mapped{ + dir = 1 + }, /obj/effect/floor_decal/corner/blue{ dir = 5 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/tiled/dark, /area/bridge) @@ -17402,15 +17877,11 @@ /turf/simulated/floor, /area/maintenance/bridge) "Pj" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/spline/plain/corner{ + dir = 8 }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" +/obj/effect/floor_decal/corner/blue{ + dir = 6 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -17418,8 +17889,16 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/corner/blue/diagonal, -/turf/simulated/floor/tiled/white, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/item/device/radio/intercom{ + dir = 8; + pixel_x = 20; + pixel_y = 1 + }, +/turf/simulated/floor/tiled, /area/bridge) "Pk" = ( /obj/effect/floor_decal/corner_wide/blue{ @@ -17476,16 +17955,14 @@ /turf/simulated/floor, /area/maintenance/aux_atmospherics/deck_3) "Pq" = ( -/obj/structure/cable/green{ - icon_state = "1-4" +/obj/structure/railing/mapped, +/obj/effect/floor_decal/corner/blue{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/computer/message_monitor{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/bridge) "Pr" = ( /obj/structure/lattice, @@ -17532,8 +18009,13 @@ /turf/simulated/floor, /area/maintenance/aux_atmospherics/deck_3) "Pw" = ( -/obj/machinery/hologram/holopad, -/turf/simulated/floor/carpet, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/effect/floor_decal/spline/fancy/wood/corner{ + dir = 1 + }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "Px" = ( /obj/structure/lattice, @@ -17610,16 +18092,22 @@ /turf/simulated/floor/reinforced, /area/template_noop) "PG" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/railing/mapped{ + dir = 1 + }, +/obj/effect/floor_decal/corner/blue/full{ + dir = 1 }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ - dir = 8 + dir = 4 }, -/turf/simulated/floor/tiled, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/keycard_auth{ + pixel_x = 24 + }, +/turf/simulated/floor/tiled/dark, /area/bridge) "PH" = ( /obj/structure/table/wood, @@ -17723,7 +18211,24 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/fitness/pool) "PQ" = ( -/turf/simulated/floor/reinforced, +/obj/structure/window/shuttle/scc_space_ship, +/obj/structure/grille, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "bridge blast"; + name = "Bridge Blast Doors"; + opacity = 0 + }, +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor/plating, /area/bridge) "PS" = ( /obj/effect/floor_decal/corner/paleblue{ @@ -17742,20 +18247,35 @@ /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) "PT" = ( -/obj/structure/flora/pottedplant/random, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 + dir = 10 }, -/obj/machinery/camera/network/command{ - c_tag = "Bridge - Break Room"; - dir = 4; - network = list("Command","Bunker") +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" }, /turf/simulated/floor/wood, /area/bridge/minibar) "PU" = ( -/obj/effect/floor_decal/corner/blue/full, -/turf/simulated/floor/tiled/dark, +/obj/structure/table/reinforced, +/obj/effect/floor_decal/spline/fancy{ + dir = 6 + }, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/book/manual/evaguide{ + pixel_x = 2; + pixel_y = 2 + }, +/turf/simulated/floor/carpet/rubber, /area/bridge) "PV" = ( /obj/structure/bed/stool/chair/office/dark{ @@ -17794,25 +18314,20 @@ /turf/simulated/floor/bluegrid, /area/storage/shields) "PZ" = ( +/obj/structure/railing/mapped{ + dir = 1 + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/power/apc{ + is_critical = 1; + name = "south bump"; + pixel_y = -24 + }, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "0-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/airlock/glass_command{ - name = "Break Room"; - req_access = list(19) - }, -/turf/simulated/floor/tiled, -/area/bridge) +/turf/simulated/floor, +/area/bridge/aibunker) "Qa" = ( /obj/structure/bed/stool/chair{ dir = 1 @@ -17838,12 +18353,12 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/fitness/pool) "Qc" = ( -/obj/effect/floor_decal/corner/blue{ - dir = 5 - }, /obj/structure/disposalpipe/trunk, /obj/machinery/disposal/small/south, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/turf/simulated/floor/wood, /area/bridge/minibar) "Qd" = ( /obj/effect/floor_decal/corner/red/diagonal, @@ -17883,12 +18398,11 @@ /turf/simulated/floor/tiled, /area/bridge) "Qh" = ( -/obj/structure/bed/stool/chair/padded/black{ - dir = 8 - }, /obj/machinery/alarm{ pixel_y = 28 }, +/obj/structure/table/reinforced/wood, +/obj/machinery/chemical_dispenser/coffee/full, /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, @@ -17975,24 +18489,32 @@ /turf/simulated/floor, /area/maintenance/security_starboard) "Qo" = ( -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/carpet, -/area/crew_quarters/captain) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/airlock/glass_command{ + name = "Break Room"; + req_access = list(19) + }, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "bridge blast"; + name = "Bridge Blast Doors"; + opacity = 0 + }, +/turf/simulated/floor/tiled, +/area/bridge) "Qp" = ( /obj/effect/floor_decal/corner/red/diagonal, /obj/machinery/light{ @@ -18019,14 +18541,15 @@ /turf/simulated/floor/carpet, /area/journalistoffice) "Qu" = ( -/obj/machinery/light{ - dir = 1 +/obj/effect/map_effect/wingrille_spawn/reinforced/polarized{ + id = "cap" }, -/obj/effect/floor_decal/corner/blue{ - dir = 5 +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "0-8" }, -/turf/simulated/floor/tiled, -/area/bridge/bridge_crew) +/turf/simulated/floor, +/area/bridge) "Qv" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/light{ @@ -18308,13 +18831,12 @@ /turf/simulated/floor/tiled, /area/hallway/crew_area) "Rj" = ( +/obj/structure/table/reinforced/wood, +/obj/item/card/id/captains_spare, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/table/wood, -/obj/item/book/manual/wiki/security_space_law, -/obj/item/device/megaphone/command, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet, /area/crew_quarters/captain) "Rk" = ( /obj/structure/bed/stool/chair/padded/brown{ @@ -18327,14 +18849,8 @@ /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) "Rm" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/effect/floor_decal/spline/fancy{ + dir = 1 }, /obj/machinery/hologram/holopad/long_range, /turf/simulated/floor/carpet/rubber, @@ -18392,8 +18908,11 @@ /area/crew_quarters/fitness/pool) "Rs" = ( /obj/structure/table/reinforced/wood, -/obj/effect/floor_decal/spline/fancy/wood, -/turf/simulated/floor/wood, +/obj/machinery/chemical_dispenser/bar_soft/full, +/obj/effect/floor_decal/spline/plain{ + dir = 6 + }, +/turf/simulated/floor/marble/dark, /area/bridge/minibar) "Rt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -18432,13 +18951,21 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hop/xo) "Rx" = ( -/obj/structure/table/reinforced/wood, -/obj/machinery/chemical_dispenser/coffee/full, -/obj/effect/floor_decal/corner/blue{ - dir = 9 +/obj/structure/railing/mapped{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/bridge/minibar) +/obj/effect/floor_decal/corner/blue/full{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/structure/flora/pottedplant/random, +/turf/simulated/floor/tiled/dark, +/area/bridge) "Rz" = ( /obj/structure/bed/padded, /obj/item/bedsheet/nanotrasen, @@ -18472,7 +18999,8 @@ dir = 8; icon_state = "pipe-c" }, -/turf/simulated/floor/tiled, +/obj/structure/bed/stool/chair/padded/beige, +/turf/simulated/floor/wood, /area/bridge/minibar) "RD" = ( /turf/simulated/floor/carpet, @@ -18558,6 +19086,26 @@ }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) +"RP" = ( +/obj/machinery/light_switch{ + pixel_x = 25; + pixel_y = 26 + }, +/obj/structure/flora/pottedplant/random, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/wood, +/area/crew_quarters/captain) "RR" = ( /obj/machinery/cryopod, /obj/effect/floor_decal/corner/grey/diagonal, @@ -18644,6 +19192,10 @@ opacity = 0 }, /obj/machinery/door/firedoor, +/obj/structure/cable/green, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor, /area/crew_quarters/captain) "RZ" = ( @@ -18672,22 +19224,26 @@ /turf/simulated/floor/reinforced, /area/template_noop) "Sc" = ( -/obj/machinery/light{ - dir = 4 +/obj/effect/floor_decal/spline/plain{ + dir = 8 }, /obj/effect/floor_decal/corner/blue{ dir = 6 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/bridge) "Sd" = ( +/obj/effect/floor_decal/corner/blue{ + dir = 5 + }, +/obj/structure/bed/stool/chair, /obj/structure/fireaxecabinet{ pixel_y = 32 }, -/obj/effect/floor_decal/corner/blue/full{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/bridge) "Sf" = ( /obj/structure/bed/stool/chair/office/dark{ @@ -18744,12 +19300,12 @@ /turf/simulated/floor/tiled/dark, /area/medical/smoking) "Sn" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/shipsensors{ - pixel_y = 7 +/obj/structure/table/reinforced/wood, +/obj/effect/floor_decal/spline/plain{ + dir = 5 }, -/turf/simulated/floor/reinforced, -/area/bridge) +/turf/simulated/floor/marble/dark, +/area/bridge/minibar) "So" = ( /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor, @@ -18796,13 +19352,17 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "St" = ( -/obj/machinery/light{ +/obj/effect/floor_decal/spline/plain, +/obj/effect/floor_decal/corner/blue{ dir = 4 }, -/obj/effect/floor_decal/spline/plain{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/carpet/rubber, +/turf/simulated/floor/tiled, /area/bridge) "Su" = ( /obj/structure/cable{ @@ -18815,9 +19375,10 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "Sw" = ( -/obj/structure/table/wood, -/obj/item/storage/box/fancy/donut, -/turf/simulated/floor/carpet, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "Sx" = ( /obj/effect/floor_decal/corner/paleblue{ @@ -18865,11 +19426,18 @@ /turf/simulated/floor, /area/tcommsat/entrance) "SC" = ( -/obj/machinery/papershredder, -/obj/machinery/alarm{ - pixel_y = 28 +/obj/machinery/door/airlock/command{ + name = "Captain's Quarters"; + req_access = list(20) }, -/turf/simulated/floor/wood, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, +/turf/simulated/floor/carpet/rubber, /area/crew_quarters/captain) "SD" = ( /obj/structure/cable/green{ @@ -18901,11 +19469,13 @@ /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) "SF" = ( -/obj/machinery/newscaster{ - pixel_x = 29 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, -/obj/effect/floor_decal/corner/blue{ - dir = 9 +/obj/machinery/door/airlock/glass_command{ + id_tag = ""; + name = "Bridge"; + req_one_access = list(19,38) }, /turf/simulated/floor/tiled, /area/bridge) @@ -18921,14 +19491,6 @@ /turf/simulated/floor/tiled, /area/bridge/aibunker) "SI" = ( -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/door/window/eastright, /turf/simulated/floor, @@ -18946,19 +19508,12 @@ /turf/simulated/wall/r_wall, /area/lawoffice/consular) "SN" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/table/reinforced, +/obj/effect/floor_decal/spline/fancy{ + dir = 6 }, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/glass_command{ - id_tag = ""; - name = "Helm"; - req_one_access = list(19,38) - }, -/turf/simulated/floor/tiled, +/obj/machinery/recharger, +/turf/simulated/floor/carpet/rubber, /area/bridge) "SQ" = ( /obj/machinery/alarm{ @@ -19038,7 +19593,16 @@ /turf/simulated/floor/tiled/white, /area/medical/ward/isolation) "Ta" = ( -/turf/simulated/floor/tiled/dark, +/obj/machinery/door/airlock/command{ + id_tag = "captaindoor"; + name = "Captain's Office"; + req_access = list(20) + }, +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/spline/fancy/wood/cee{ + dir = 4 + }, +/turf/simulated/floor/wood, /area/bridge) "Tb" = ( /obj/machinery/disposal/small/south, @@ -19231,11 +19795,30 @@ }, /area/tcommsat/chamber) "TA" = ( -/obj/machinery/suit_cycler/captain, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/bed/stool/chair/office/bridge{ + dir = 4 }, -/turf/simulated/floor/carpet, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/button/remote/airlock{ + desc = "A remote control-switch for the office door."; + id = "captaindoor"; + name = "Office Door Control"; + pixel_x = 30; + req_access = list(20); + pixel_y = 10 + }, +/obj/machinery/button/remote/airlock{ + desc = "A remote control-switch for the starboard bridge doors."; + id = "sbridgedoor"; + name = "Bridge Door Control"; + pixel_y = -2; + req_access = list(20); + pixel_x = 30 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/carpet/rubber, /area/crew_quarters/captain) "TC" = ( /obj/effect/floor_decal/industrial/warning/corner{ @@ -19262,18 +19845,9 @@ /turf/simulated/floor, /area/maintenance/security_starboard) "TH" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ +/obj/structure/bed/stool/chair/padded/beige{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /turf/simulated/floor/carpet, /area/crew_quarters/captain) "TI" = ( @@ -19460,11 +20034,13 @@ /turf/simulated/floor, /area/maintenance/substation/command) "Ub" = ( -/obj/structure/flora/pottedplant/random, -/obj/effect/floor_decal/spline/fancy/wood{ +/obj/machinery/vending/boozeomat{ + req_access = null + }, +/obj/effect/floor_decal/spline/plain{ dir = 10 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/marble/dark, /area/bridge/minibar) "Uc" = ( /turf/simulated/wall/r_wall, @@ -19492,16 +20068,13 @@ /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) "Uh" = ( -/obj/machinery/camera/network/command{ - c_tag = "Bridge - Helm 1"; - dir = 8 - }, -/obj/structure/window/reinforced, /obj/structure/table/reinforced, -/obj/item/storage/firstaid/regular, -/obj/effect/floor_decal/spline/plain{ - dir = 6 +/obj/effect/floor_decal/spline/fancy{ + dir = 10 }, +/obj/item/stack/wrapping_paper, +/obj/item/device/hand_labeler, +/obj/item/stack/packageWrap, /turf/simulated/floor/carpet/rubber, /area/bridge) "Uj" = ( @@ -19511,16 +20084,10 @@ /turf/simulated/floor/reinforced, /area/template_noop) "Uk" = ( -/obj/machinery/light, -/obj/structure/window/reinforced{ - dir = 4 +/obj/effect/floor_decal/spline/fancy{ + dir = 1 }, -/obj/structure/table/reinforced, -/obj/item/stack/wrapping_paper, -/obj/item/device/hand_labeler, -/obj/item/stack/packageWrap, -/obj/item/paper_scanner, -/obj/item/pen, +/obj/structure/bed/stool/chair/office/bridge, /turf/simulated/floor/carpet/rubber, /area/bridge) "Um" = ( @@ -19533,13 +20100,14 @@ /turf/simulated/floor/tiled/dark, /area/hallway/primary/starboard) "Uo" = ( -/obj/structure/bed/stool/chair/padded/brown{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/obj/structure/cable/green{ - icon_state = "1-4" +/obj/effect/floor_decal/spline/fancy/wood/corner{ + dir = 1 }, -/turf/simulated/floor/carpet, +/obj/effect/floor_decal/spline/fancy/wood/corner, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "Up" = ( /obj/effect/floor_decal/corner_wide/blue{ @@ -19707,6 +20275,15 @@ }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/toilet) +"UL" = ( +/obj/structure/table/reinforced, +/obj/effect/floor_decal/spline/fancy{ + dir = 10 + }, +/obj/machinery/recharger, +/obj/item/aicard, +/turf/simulated/floor/carpet/rubber, +/area/bridge) "UM" = ( /obj/machinery/access_button{ command = "cycle_interior"; @@ -19762,29 +20339,34 @@ "US" = ( /turf/simulated/wall/r_wall, /area/bridge) +"UU" = ( +/obj/effect/map_effect/wingrille_spawn/reinforced/firedoor, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/structure/cable/green, +/turf/simulated/floor, +/area/bridge) "UV" = ( /turf/simulated/open, /area/hallway/primary/starboard) "UW" = ( -/obj/structure/cable/green{ - icon_state = "0-2" +/obj/structure/railing/mapped{ + dir = 1 }, -/obj/machinery/power/apc/super/critical{ - dir = 1; - pixel_y = 24 +/turf/simulated/floor/tiled/ramp/bottom{ + dir = 8 }, -/turf/simulated/floor/tiled/dark, /area/bridge) "UX" = ( -/obj/structure/bed/stool/chair/office/bridge, -/obj/effect/floor_decal/spline/plain{ - dir = 4 +/obj/effect/floor_decal/spline/fancy{ + dir = 1 }, -/obj/machinery/button/remote/blast_door{ - id = "crew_armory"; - name = "Crew Armory"; - pixel_x = 28; - req_access = list(60) +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/carpet/rubber, /area/bridge) @@ -19845,10 +20427,21 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "Vg" = ( -/obj/effect/floor_decal/corner/blue{ - dir = 1 +/obj/structure/window/shuttle/scc_space_ship, +/obj/structure/grille, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "bridge blast"; + name = "Bridge Blast Doors"; + opacity = 0 }, -/turf/simulated/floor/tiled, +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor/plating, /area/bridge) "Vh" = ( /obj/effect/floor_decal/corner/paleblue{ @@ -19879,20 +20472,8 @@ /turf/simulated/floor/plating, /area/crew_quarters/heads/hop/xo) "Vj" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/turf/simulated/floor/carpet/rubber, -/area/bridge) +/turf/simulated/wall, +/area/crew_quarters/heads/hop/xo) "Vk" = ( /obj/machinery/camera/network/security{ c_tag = "Security - Classroom"; @@ -20003,16 +20584,10 @@ /turf/simulated/floor/wood, /area/crew_quarters/lounge/secondary) "Vx" = ( -/obj/effect/floor_decal/corner/blue{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/bridge) "Vy" = ( @@ -20030,19 +20605,19 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/floor_decal/spline/fancy/wood/cee{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/recharger/wallcharger{ - pixel_y = -26 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/carpet, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/wood, /area/crew_quarters/captain) "VA" = ( /obj/structure/railing/mapped, @@ -20076,9 +20651,15 @@ /turf/simulated/floor, /area/maintenance/engineering_ladder) "VE" = ( -/obj/machinery/firealarm/north, -/obj/effect/floor_decal/corner/blue{ - dir = 5 +/obj/effect/floor_decal/spline/plain{ + dir = 10 + }, +/obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/tiled, /area/bridge) @@ -20090,16 +20671,10 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "VI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/spline/fancy/wood{ dir = 5 }, -/obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 1 - }, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, +/obj/structure/disposalpipe/trunk, /obj/machinery/disposal/small/south, /turf/simulated/floor/wood, /area/crew_quarters/captain) @@ -20158,26 +20733,22 @@ }, /area/tcommsat/chamber) "VS" = ( -/obj/structure/cable/green{ - icon_state = "1-4" +/obj/effect/floor_decal/corner/blue{ + dir = 10 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/bridge) -"VT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/spline/plain{ dir = 6 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/reinforced, +/area/bridge) +"VT" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue{ + dir = 9 + }, +/turf/simulated/floor/tiled, /area/bridge) "VU" = ( /obj/structure/cable{ @@ -20434,21 +21005,12 @@ /turf/simulated/floor, /area/maintenance/aux_atmospherics/deck_3) "WH" = ( -/obj/structure/window/shuttle/scc_space_ship, -/obj/structure/grille, +/obj/effect/map_effect/wingrille_spawn/reinforced/firedoor, /obj/structure/cable/green{ - icon_state = "0-2" + icon_state = "0-8" }, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "bridge blast"; - name = "Bridge Blast Doors"; - opacity = 0 - }, -/obj/machinery/door/firedoor, /turf/simulated/floor, -/area/crew_quarters/captain) +/area/bridge) "WI" = ( /turf/simulated/wall/r_wall, /area/security/forensics_office) @@ -20472,16 +21034,19 @@ /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "WO" = ( -/obj/structure/bed/stool/chair/office/bridge{ - dir = 4 +/obj/effect/floor_decal/corner/blue{ + dir = 6 }, -/obj/structure/window/reinforced{ - dir = 8 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/effect/floor_decal/spline/plain{ - dir = 9 +/obj/machinery/newscaster/security_unit{ + pixel_x = 32 }, -/turf/simulated/floor/carpet/rubber, +/turf/simulated/floor/tiled, /area/bridge) "WP" = ( /obj/effect/floor_decal/industrial/warning{ @@ -20566,6 +21131,25 @@ }, /turf/simulated/floor/tiled/white, /area/medical/ward/isolation) +"Xb" = ( +/obj/structure/table/reinforced/wood, +/obj/effect/floor_decal/spline/fancy/wood, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/item/storage/box/fancy/donut, +/turf/simulated/floor/wood, +/area/crew_quarters/captain) "Xc" = ( /obj/structure/disposalpipe/down, /obj/structure/lattice/catwalk, @@ -20578,14 +21162,34 @@ /turf/simulated/open, /area/maintenance/engineering_ladder) "Xe" = ( -/obj/structure/bed/stool/chair/office/bridge{ - dir = 4 +/obj/effect/floor_decal/corner/blue{ + dir = 5 }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/turf/simulated/floor/carpet/rubber, +/obj/structure/bed/stool/chair, +/turf/simulated/floor/tiled, /area/bridge) +"Xf" = ( +/obj/structure/window/shuttle/scc_space_ship, +/obj/structure/grille, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "bridge blast"; + name = "Bridge Blast Doors"; + opacity = 0 + }, +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor, +/area/crew_quarters/captain) "Xg" = ( /obj/structure/cryofeed, /obj/structure/window/reinforced{ @@ -20656,9 +21260,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 - }, /turf/simulated/floor/wood, /area/bridge/minibar) "Xr" = ( @@ -20811,8 +21412,12 @@ opacity = 0 }, /obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/bridge) +/obj/structure/cable/green, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor, +/area/crew_quarters/captain) "XM" = ( /obj/effect/floor_decal/corner/grey/diagonal{ dir = 8 @@ -20908,6 +21513,24 @@ /obj/effect/map_effect/wingrille_spawn/reinforced/firedoor, /turf/simulated/floor, /area/tcommsat/entrance) +"XV" = ( +/obj/structure/window/shuttle/scc_space_ship, +/obj/structure/grille, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "bridge blast"; + name = "Bridge Blast Doors"; + opacity = 0 + }, +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/structure/cable/green, +/turf/simulated/floor, +/area/crew_quarters/captain) "XW" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -20949,10 +21572,10 @@ /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) "Ya" = ( -/obj/effect/floor_decal/corner/blue/full{ - dir = 1 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/bridge/minibar) "Yb" = ( /obj/structure/cable/green{ @@ -21041,6 +21664,16 @@ }, /turf/simulated/floor/tiled, /area/bridge/bridge_crew) +"Yk" = ( +/obj/effect/map_effect/wingrille_spawn/reinforced/polarized{ + id = "cap" + }, +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor, +/area/crew_quarters/captain) "Yl" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -21127,8 +21760,23 @@ /turf/simulated/floor/wood, /area/crew_quarters/lounge/secondary) "Yy" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/obj/structure/table/reinforced/wood, +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/folder/blue, +/obj/effect/floor_decal/spline/fancy/wood, +/obj/item/paper_scanner, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/wood, /area/crew_quarters/captain) @@ -21231,13 +21879,21 @@ /turf/simulated/floor, /area/maintenance/security_starboard) "YK" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/table/reinforced/wood, +/obj/structure/railing/mapped, +/obj/structure/railing/mapped{ + dir = 4 }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/carpet, +/obj/effect/floor_decal/spline/fancy{ + dir = 6 + }, +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/pen/blue{ + pixel_x = 4; + pixel_y = 4 + }, +/turf/simulated/floor/carpet/rubber, /area/crew_quarters/captain) "YL" = ( /obj/structure/cable{ @@ -21416,19 +22072,14 @@ /turf/simulated/floor/tiled/dark, /area/bridge/aibunker) "Zc" = ( -/obj/structure/grille, -/obj/structure/window/shuttle/scc_space_ship/cardinal, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "bridge blast"; - name = "Bridge Blast Doors"; - opacity = 0 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/bridge) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/captain) "Zd" = ( /obj/effect/floor_decal/corner_wide/paleblue{ dir = 5 @@ -21753,13 +22404,19 @@ /obj/structure/cable/green{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/obj/machinery/recharger/wallcharger{ + pixel_y = 28; + pixel_x = 5 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/effect/floor_decal/corner/blue{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/obj/effect/floor_decal/corner/blue/diagonal, /turf/simulated/floor/tiled, /area/bridge/bridge_crew) "ZL" = ( @@ -39177,17 +39834,17 @@ HB HB HB md -WH -pI md +md +EQ qh ip md +AM +Xf RY -RY -RY -RY -RY +vz +ot Ir at VM @@ -39378,19 +40035,19 @@ jK SB XX iD -JQ +Bw Kl cr yu TA yi -JQ +uT SC -mC +Kx GA -mC -tH -nF +gk +gS +XK Ir at fh @@ -39581,19 +40238,19 @@ XJ Jx iM JQ -bA -Qo +JQ +JQ nz kv YK OP -gk +JQ Na Ka -VI -Yy +mC +mC tH -nF +XV Ir fh Wm @@ -39784,18 +40441,18 @@ Jx iN JQ mK -GL +IB Pw -LS -LS +Ar +xh +Je JQ -gS -mC +VI kB BN -mC -mC -tH +kC +Zc +BQ gx VM Mo @@ -39989,16 +40646,16 @@ Es TH hm fl -tI -JQ +cu +Xb HP -mC +LS Rj Im -cu +bA NF Ok -nF +HT at fh Wm @@ -40190,17 +40847,17 @@ JQ FZ At sG -JQ -JQ -JQ -JQ +Hj +mC +Yy +Yk FI jj hr -pX +sG Sw uD -md +kY at fh Wm @@ -40594,18 +41251,18 @@ JQ xg GL mO -JQ +RP oV xU JQ JQ +ee +Kr JQ -Kr -wY -Kr +pI md md -Zc +at fh Wm Wm @@ -40796,18 +41453,18 @@ JQ LG Vz US -US -US -US +Qu +Ta +Qu US uq Lu -Ta +VT VT aF -BQ -Nu -XK +CK +at +at fh Wm Wm @@ -41001,15 +41658,15 @@ US zx Oo gL -US +um tP -WO +US HW od -Ns +wY Vg -rg -XK +Tr +TC fh Wm Wm @@ -41196,22 +41853,22 @@ wF yD vB qE -Zb +mE vZ xr -wi +tI am -Oo +Kq oO -US +UL UW OJ Pd Pq yL -yL +PQ Mw -XK +HN fh Wm Wm @@ -41397,24 +42054,24 @@ vZ vZ Lz vB -qE +PZ CZ vZ al -wi +UU LN Kq Uk -wi +vw aL tB iC lp -AJ +wm OG hu -CK -Sn +bU +fh Wm Wm Wm @@ -41603,19 +42260,19 @@ mw CZ SI ru -wi +WH bT AJ -AJ +UX PU Pf ML As zh di -wi +Gq PQ -XK +at fh Wm Wm @@ -41799,16 +42456,16 @@ iS vZ vZ vZ -Lz -vB +rg +uE EA CZ Xo wd US Sd -qG -qG +iI +jf oL Vx oj @@ -41817,7 +42474,7 @@ NQ gb rN PQ -XK +at fh Wm Wm @@ -42011,15 +42668,15 @@ WX ym vg pS -wm +US Kf HC fW Rm -MV +AQ Cs PQ -XK +at fh Wm Wm @@ -42211,17 +42868,17 @@ SH Fn US Xe -Gq -AQ +vg +Hb Hg FQ lW jD -Vj -tE +NQ +AQ DE PQ -XK +at fh Wm Wm @@ -42418,12 +43075,12 @@ UX Uh Gf qa -HT +As GR zX wi PQ -XK +at fh Wm Wm @@ -42597,9 +43254,9 @@ VC NB NB NB -VC -VC -VC +mM +mM +mM CZ CZ CZ @@ -42615,17 +43272,17 @@ CZ NO US US -US -US -US +gV +Uk +MV Ng ew ba bO qG tQ -jf -CK +eL +at fh Wm Wm @@ -42803,7 +43460,7 @@ aH ZS aH dB -vw +dB VW Mg dB @@ -42815,7 +43472,7 @@ XA mI Hp NZ -dB +ol Id MJ Bn @@ -42825,9 +43482,9 @@ PG DF HG VS -yL -Mw -XK +PQ +at +at fh Wm Wm @@ -43005,31 +43662,31 @@ US ZS US KB -mM -mE +Qz +Qz Bc -aw +oQ aw nU px Gv px gs -gV -Pj -px -va US ZS US +va +iV +pX +pX VE -iA -iA +US +Rx iA Cw -iA -rg -XK +PQ +at +at fh Wm Wm @@ -43216,22 +43873,22 @@ Qz Qz HO Cg -Je +Ns SF uY -Ns -uT -yn -ZS -yn +tE GW +yn +WO +BT +Pj OA -OA +Nu Sc yA eL -kC -XK +at +at fh Wm Wm @@ -43427,13 +44084,13 @@ fx fx US US +Qo US US US -PZ CK CK -Zc +at fh Wm Wm @@ -43620,13 +44277,13 @@ ZP ZP JP Dg -fx +gI OD Jl gI IU NA -fx +gI zV Ld PT @@ -43822,18 +44479,18 @@ oX DI Ae PL -fx +gI sg -jR -uE +Il +gI jR kP -fx +gI Qh TY sq -sq -sq +Gl +ak ak DN LE @@ -44024,19 +44681,19 @@ eC MM Oq Cj -fx -Qu +gI +gI on -iI +gI ZK wM hq Ha nh -SR -qL -SR -SR +Fd +Sn +cF +qg Rs LE at @@ -44226,19 +44883,19 @@ YH eM vW fu -fx +gI uf zm -jR +zK On pA -fx +gI AO Xq JK GD GD -cF +GD Ah LE at @@ -44416,8 +45073,8 @@ Fc sY TL Dc -vx -vx +Vj +Vj Dg qw Hl @@ -44428,19 +45085,19 @@ gB Wf tA LL -fx +gI up na dw Yj oD -fx +gI LH Ch -Rx -IB -ot -ot +qL +SR +SR +SR xc LE Rh @@ -44641,7 +45298,7 @@ Qc RC AP fd -AP +SR xc LE Ps @@ -44843,7 +45500,7 @@ Ya qi fo FF -xc +Hd LE Ps at @@ -45422,12 +46079,12 @@ Yh wt CB vx -vx -vx -vx +Vj +Vj +Vj lF -vx -vx +Vj +Vj FT at at @@ -46028,9 +46685,9 @@ ZR qd NT vx -vx +Vj yO -vx +Vj KS Dd Cc @@ -46232,7 +46889,7 @@ Sf vx Yf nv -vx +Vj Qj RD RD @@ -46434,7 +47091,7 @@ lt vx sQ EK -vx +Vj kR RD ZL