diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index fc3c2e5f951..03e55f8ed90 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -13257,17 +13257,19 @@ /turf/simulated/floor/carpet/grimey, /area/station/service/bar) "aYf" = ( -/obj/machinery/computer/card, -/obj/effect/turf_decal/tiles/department/virology/side{ - dir = 10 - }, -/turf/simulated/floor/plasteel, +/obj/machinery/computer/rnd_backup/station, +/obj/effect/turf_decal/tiles/department/science, +/obj/item/disk/rnd_backup_disk, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "aYg" = ( -/obj/effect/turf_decal/tiles/department/virology/corner{ +/obj/effect/turf_decal/tiles/department/science/corner{ dir = 1 }, -/turf/simulated/floor/plasteel, +/obj/structure/chair/office{ + dir = 1 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "aYh" = ( /obj/effect/decal/cleanable/blood, @@ -17842,33 +17844,75 @@ /turf/simulated/floor/carpet/grimey, /area/station/service/bar) "bnR" = ( -/obj/machinery/computer/atmos_alert, -/obj/effect/turf_decal/tiles/department/engineering/side{ - dir = 10 +/obj/structure/table/reinforced, +/obj/machinery/recharger{ + pixel_x = 8; + pixel_y = 4 }, -/turf/simulated/floor/plasteel, +/obj/machinery/cell_charger{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/stock_parts/cell/high{ + pixel_x = -6; + pixel_y = 4 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bnS" = ( /turf/simulated/wall, /area/station/public/storage/tools/auxiliary) "bnW" = ( -/obj/machinery/computer/station_alert, -/obj/effect/turf_decal/tiles/department/engineering/side, -/turf/simulated/floor/plasteel, +/obj/machinery/photocopier, +/obj/effect/turf_decal/tiles/department/virology, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bnY" = ( -/obj/machinery/computer/shuttle/labor, -/obj/effect/turf_decal/tiles/department/medical/side{ - dir = 10 +/obj/structure/table/reinforced, +/obj/machinery/keycard_auth{ + pixel_y = 3 }, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/command, +/obj/item/paper_bin/nanotrasen{ + pixel_x = 13; + pixel_y = 4 + }, +/obj/item/pen/multi/fountain{ + pixel_x = 13; + pixel_y = 6 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "boa" = ( -/obj/machinery/computer/shuttle/mining, -/obj/effect/turf_decal/tiles/department/medical/side{ - dir = 6 +/obj/structure/table/reinforced, +/obj/machinery/door_control{ + id = "bridge blast north"; + name = "North Bridge Blast Door Control"; + pixel_y = 10; + req_access = list(19) }, -/turf/simulated/floor/plasteel, +/obj/machinery/door_control{ + id = "bridge blast west"; + name = "West Bridge Blast Door Control"; + pixel_x = -6; + pixel_y = 2; + req_access = list(19) + }, +/obj/machinery/door_control{ + id = "bridge blast east"; + name = "East Bridge Blast Door Control"; + pixel_x = 6; + pixel_y = 2; + req_access = list(19) + }, +/obj/machinery/door_control{ + id = "bridge blast south"; + name = "South Bridge Blast Door Control"; + pixel_y = -6; + req_access = list(19) + }, +/obj/effect/turf_decal/tiles/department/command, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bob" = ( /obj/structure/extinguisher_cabinet{ @@ -18284,7 +18328,7 @@ /obj/effect/turf_decal/tiles/department/engineering/corner{ dir = 1 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bpp" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -18296,46 +18340,32 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/nw) "bpq" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/tiles/department/engineering/corner{ +/obj/effect/turf_decal/tiles/department/virology/corner{ dir = 4 }, -/turf/simulated/floor/plasteel, -/area/station/command/bridge) -"bpr" = ( -/obj/structure/table/reinforced, -/obj/item/flash{ - pixel_y = -11 - }, -/obj/machinery/phone{ - pixel_y = 3 - }, -/obj/item/flash{ - pixel_y = -11 - }, -/turf/simulated/floor/plasteel, -/area/station/command/bridge) -"bpt" = ( -/obj/structure/chair{ +/obj/structure/chair/office{ dir = 1 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) +"bpr" = ( +/obj/machinery/computer/station_alert{ + dir = 4 + }, +/obj/effect/turf_decal/tiles/department/engineering, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) +"bpt" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bpu" = ( -/obj/structure/table/reinforced, -/obj/item/book/manual/wiki/sop_command, -/obj/machinery/keycard_auth{ - pixel_x = -6; - pixel_y = 8 +/obj/effect/turf_decal/tiles/department/command/corner{ + dir = 1 }, -/obj/item/aicard, -/obj/item/multitool/command, -/obj/effect/turf_decal/tiles/department/medical/side{ - dir = 8 - }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bpv" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -18373,9 +18403,11 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/ne) "bpB" = ( -/obj/structure/table/reinforced, -/obj/item/storage/fancy/donut_box, -/turf/simulated/floor/plasteel, +/obj/machinery/computer/crew{ + dir = 8 + }, +/obj/effect/turf_decal/tiles/department/medical, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bpC" = ( /obj/structure/table/reinforced, @@ -18769,12 +18801,14 @@ /turf/simulated/wall/r_wall, /area/station/hallway/primary/central/nw) "bqR" = ( -/obj/structure/table/reinforced, -/obj/machinery/recharger, -/turf/simulated/floor/plasteel, +/obj/machinery/computer/atmos_alert{ + dir = 4 + }, +/obj/effect/turf_decal/tiles/department/engineering, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bqS" = ( -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bqT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -18786,18 +18820,6 @@ icon_state = "chapel" }, /area/station/service/chapel) -"bqU" = ( -/obj/effect/turf_decal/tiles/department/medical/corner{ - dir = 1 - }, -/turf/simulated/floor/plasteel, -/area/station/command/bridge) -"bqV" = ( -/obj/effect/turf_decal/tiles/department/medical/corner{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/station/command/bridge) "bqW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -18808,22 +18830,27 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/plasteel, +/obj/machinery/hologram/holopad, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bqY" = ( -/obj/structure/filingcabinet/filingcabinet, -/turf/simulated/floor/plasteel, +/obj/machinery/computer/med_data{ + dir = 8 + }, +/obj/effect/turf_decal/tiles/department/medical, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "brb" = ( +/obj/effect/turf_decal/tiles/department/cargo, +/obj/machinery/computer/shuttle/mining, +/obj/item/radio/intercom{ + name = "north bump"; + pixel_y = 28 + }, /obj/machinery/camera{ c_tag = "Bridge East" }, -/obj/machinery/computer/supplycomp, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = 32 - }, -/obj/effect/turf_decal/tiles/department/cargo/side, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "brc" = ( /obj/machinery/ai_status_display, @@ -19044,9 +19071,9 @@ /turf/simulated/floor/plasteel/dark, /area/station/hallway/secondary/exit) "brS" = ( -/obj/machinery/computer/crew, -/obj/effect/turf_decal/tiles/department/virology/side, -/turf/simulated/floor/plasteel, +/obj/machinery/computer/aifixer, +/obj/effect/turf_decal/tiles/department/science, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "brT" = ( /obj/structure/chair/stool{ @@ -19539,7 +19566,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "btF" = ( /obj/structure/table/wood, @@ -19816,7 +19843,7 @@ /area/station/hallway/primary/central/nw) "bup" = ( /obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "buq" = ( /obj/structure/chair/wood/wings{ @@ -20204,8 +20231,8 @@ name = "south bump"; pixel_y = -28 }, -/obj/effect/turf_decal/tiles/department/medical/side, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/command/side, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bvW" = ( /obj/structure/disposalpipe/segment{ @@ -22730,7 +22757,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) "bHD" = ( -/obj/structure/flora/grass/jungle, +/obj/structure/flora/junglebush/large, /turf/simulated/floor/grass/jungle/no_creep, /area/station/command/bridge) "bHG" = ( @@ -24591,8 +24618,7 @@ /obj/structure/disposalpipe/segment/corner{ dir = 2 }, -/obj/effect/turf_decal/tiles/department/medical/side, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bPl" = ( /obj/structure/chair{ @@ -29628,14 +29654,19 @@ /turf/simulated/wall, /area/station/command/office/rd) "clb" = ( -/obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable{ - icon_state = "0-8" + icon_state = "1-2" }, -/obj/structure/cable{ - icon_state = "2-8" +/obj/structure/railing{ + dir = 8 }, -/turf/simulated/floor/plating, +/obj/effect/turf_decal/siding{ + dir = 8 + }, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 10 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "clc" = ( /obj/structure/sign/poster/official/random/directional/north, @@ -39689,6 +39720,12 @@ }, /turf/simulated/floor/plating, /area/station/engineering/secure_storage) +"daL" = ( +/obj/effect/turf_decal/tiles/department/virology/corner{ + dir = 1 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "daM" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple, /turf/simulated/floor/plasteel, @@ -39955,8 +39992,10 @@ name = "west bump"; pixel_x = -27 }, -/obj/effect/turf_decal/tiles/department/medical/side, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 10 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "dbW" = ( /obj/machinery/light/small{ @@ -43906,10 +43945,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/tiles/department/medical/side{ - dir = 4 - }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "dtK" = ( /obj/structure/table/reinforced, @@ -44200,7 +44236,7 @@ /area/station/hallway/secondary/exit) "dCe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "dCg" = ( /obj/structure/sign/service/bar{ @@ -44482,14 +44518,19 @@ /turf/simulated/floor/plasteel/dark, /area/station/medical/surgery/secondary) "dHw" = ( -/obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable{ - icon_state = "0-4" + icon_state = "1-2" }, -/obj/structure/cable{ - icon_state = "2-4" +/obj/structure/railing{ + dir = 4 }, -/turf/simulated/floor/plating, +/obj/effect/turf_decal/siding{ + dir = 4 + }, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 6 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "dHy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -44744,7 +44785,8 @@ id_tag = "bridge blast east"; name = "Bridge Blast Doors" }, -/turf/simulated/floor/plasteel, +/obj/machinery/light, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "dLJ" = ( /obj/machinery/door/poddoor/shutters/preopen{ @@ -45104,10 +45146,10 @@ name = "south bump"; pixel_y = -30 }, -/obj/effect/turf_decal/tiles/department/medical/side{ +/obj/effect/turf_decal/tiles/department/command/side{ dir = 6 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "dSH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/purple{ @@ -45263,10 +45305,10 @@ /area/station/maintenance/asmaint) "dXn" = ( /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tiles/department/medical/side{ +/obj/effect/turf_decal/tiles/department/command/side{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "dXo" = ( /obj/effect/turf_decal/stripes/corner, @@ -45437,10 +45479,10 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/tiles/department/medical/side{ +/obj/effect/turf_decal/tiles/department/command/side{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "eaT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/purple{ @@ -45593,7 +45635,7 @@ /obj/effect/turf_decal/woodsiding{ dir = 8 }, -/obj/structure/flora/tree/jungle/small, +/obj/structure/flora/tree/jungle, /turf/simulated/floor/grass/jungle/no_creep, /area/station/command/bridge) "edf" = ( @@ -45805,6 +45847,12 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) +"ego" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "egq" = ( /obj/structure/closet/secure_closet/brig, /obj/machinery/power/apc/directional/east, @@ -45824,7 +45872,7 @@ /area/station/hallway/secondary/entry/south) "egz" = ( /obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "egI" = ( /obj/structure/table, @@ -47184,6 +47232,13 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/north) +"eMv" = ( +/obj/effect/turf_decal/tiles/department/medical/corner, +/obj/structure/chair/office{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "eMZ" = ( /obj/item/transfer_valve{ pixel_x = 4; @@ -47821,10 +47876,10 @@ /turf/simulated/floor/plasteel/dark, /area/station/maintenance/abandonedservers) "fcC" = ( -/obj/effect/turf_decal/tiles/department/medical/side{ +/obj/effect/turf_decal/tiles/department/command/side{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "fcH" = ( /obj/item/latexballon, @@ -48529,10 +48584,10 @@ id_tag = "bridge blast south"; name = "Bridge Blast Doors" }, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "fqA" = ( /obj/structure/chair/sofa/corp/left, @@ -48742,7 +48797,7 @@ /obj/effect/turf_decal/tiles/department/security/corner{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "fvB" = ( /obj/machinery/light/small, @@ -49161,6 +49216,10 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/north) +"fDv" = ( +/obj/machinery/status_display/supply_display, +/turf/simulated/wall/r_wall, +/area/station/command/bridge) "fDx" = ( /obj/structure/cable{ icon_state = "1-2" @@ -49837,14 +49896,10 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/airlock/command{ - name = "Bridge"; +/obj/machinery/door/airlock/command/glass{ dir = 4 }, -/obj/effect/turf_decal/tiles/department/medical/side{ - dir = 8 - }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "fVg" = ( /obj/structure/cable{ @@ -50057,6 +50112,12 @@ }, /turf/simulated/floor/plasteel/white, /area/station/maintenance/asmaint) +"gaJ" = ( +/obj/effect/turf_decal/tiles/department/science/corner{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "gaZ" = ( /obj/structure/cable/extra_insulated{ icon_state = "4-8" @@ -50670,10 +50731,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tiles/department/medical/corner{ - dir = 8 - }, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/command/side, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "gmU" = ( /obj/effect/decal/cleanable/dirt, @@ -50909,7 +50968,7 @@ /obj/structure/cable{ icon_state = "2-4" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "gsQ" = ( /obj/effect/decal/cleanable/dirt, @@ -51948,8 +52007,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/turf_decal/tiles/department/medical/corner, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "gPM" = ( /obj/structure/chair{ @@ -52165,6 +52223,11 @@ /obj/effect/turf_decal/tiles/neutral, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) +"gUn" = ( +/turf/simulated/floor/plasteel/stairs{ + dir = 1 + }, +/area/station/command/bridge) "gUs" = ( /obj/effect/turf_decal/tiles/department/security/corner{ dir = 1 @@ -52273,10 +52336,10 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/tiles/department/medical/side{ +/obj/effect/turf_decal/tiles/department/command/side{ dir = 8 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "gWZ" = ( /obj/machinery/door/airlock/security/glass{ @@ -52488,11 +52551,12 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "hcv" = ( -/obj/structure/flora/junglebush, -/obj/machinery/light{ - dir = 4 +/obj/structure/cable, +/obj/structure/cable{ + icon_state = "1-8" }, -/turf/simulated/floor/grass/jungle/no_creep, +/obj/effect/spawner/window/reinforced/grilled, +/turf/simulated/floor/plating, /area/station/command/bridge) "hdm" = ( /obj/structure/cable{ @@ -53198,17 +53262,14 @@ /turf/simulated/floor/plating, /area/station/engineering/tech_storage) "hsH" = ( -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 +/obj/effect/turf_decal/tiles/department/command/side, +/obj/item/flag/nt{ + layer = 3.4 }, -/obj/item/pen, -/obj/machinery/light, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tiles/department/medical/side{ - dir = 6 +/obj/structure/closet/fireaxecabinet{ + pixel_y = -30 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "hsO" = ( /obj/structure/chair/stool{ @@ -53528,10 +53589,10 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "hzl" = ( -/obj/effect/turf_decal/tiles/department/virology/corner{ +/obj/effect/turf_decal/tiles/department/medical/corner{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "hzy" = ( /obj/machinery/hologram/holopad, @@ -53916,11 +53977,11 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "hJb" = ( -/obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable{ - icon_state = "1-8" + icon_state = "1-2" }, /obj/structure/cable, +/obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/command/bridge) "hJd" = ( @@ -53946,13 +54007,11 @@ /area/station/command/office/blueshield) "hJj" = ( /obj/machinery/computer/security/mining, -/obj/machinery/ai_status_display{ +/obj/effect/turf_decal/tiles/department/cargo, +/obj/machinery/computer/security/telescreen/entertainment{ pixel_y = 32 }, -/obj/effect/turf_decal/tiles/department/cargo/side{ - dir = 6 - }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "hJm" = ( /obj/machinery/door/firedoor{ @@ -54324,10 +54383,7 @@ /obj/effect/turf_decal/woodsiding{ dir = 8 }, -/obj/structure/flora/junglebush/large, -/obj/structure/closet/fireaxecabinet{ - pixel_y = 32 - }, +/obj/structure/flora/junglebush, /turf/simulated/floor/grass/jungle/no_creep, /area/station/command/bridge) "hTK" = ( @@ -54876,15 +54932,9 @@ /turf/simulated/floor/wood, /area/station/service/library) "iim" = ( -/obj/machinery/computer/shuttle/mining, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 28 - }, -/obj/effect/turf_decal/tiles/department/cargo/side{ - dir = 10 - }, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/cargo, +/obj/machinery/computer/supplycomp, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "iip" = ( /obj/structure/cable{ @@ -54934,7 +54984,7 @@ layer = 4; pixel_y = 32 }, -/obj/structure/flora/junglebush, +/obj/structure/flora/grass/jungle, /turf/simulated/floor/grass/jungle/no_creep, /area/station/command/bridge) "iiP" = ( @@ -55576,6 +55626,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/station/maintenance/aft2) +"ivU" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/grass/jungle/no_creep, +/area/station/command/bridge) "ivY" = ( /obj/machinery/atmospherics/binary/valve/digital{ color = ""; @@ -55955,37 +56011,10 @@ /turf/simulated/floor/plating, /area/station/security/detective) "iFa" = ( -/obj/structure/table/reinforced, -/obj/machinery/door_control{ - id = "bridge blast east"; - name = "East Bridge Blast Door Control"; - pixel_x = 6; - pixel_y = 2; - req_access = list(19) - }, -/obj/machinery/door_control{ - id = "bridge blast west"; - name = "West Bridge Blast Door Control"; - pixel_x = -6; - pixel_y = 2; - req_access = list(19) - }, -/obj/machinery/door_control{ - id = "bridge blast south"; - name = "South Bridge Blast Door Control"; - pixel_y = -6; - req_access = list(19) - }, -/obj/machinery/door_control{ - id = "bridge blast north"; - name = "North Bridge Blast Door Control"; - pixel_y = 10; - req_access = list(19) - }, -/obj/effect/turf_decal/tiles/department/medical/side{ +/obj/effect/turf_decal/tiles/department/command/corner{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "iFu" = ( /obj/effect/turf_decal/stripes/corner{ @@ -56490,10 +56519,6 @@ }, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) -"iRr" = ( -/obj/structure/flora/rock/pile/largejungle, -/turf/simulated/floor/grass/jungle/no_creep, -/area/station/command/bridge) "iRs" = ( /obj/structure/table, /obj/item/reagent_containers/cooking/board, @@ -57230,7 +57255,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "jfQ" = ( /obj/structure/disposalpipe/segment{ @@ -57246,11 +57271,9 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/sw) "jgu" = ( -/obj/machinery/computer/med_data, -/obj/effect/turf_decal/tiles/department/virology/side{ - dir = 6 - }, -/turf/simulated/floor/plasteel, +/obj/structure/table/reinforced, +/obj/item/storage/fancy/donut_box, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "jgx" = ( /obj/structure/cable{ @@ -57343,10 +57366,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "jiW" = ( /obj/effect/turf_decal/tiles/department/cargo/side{ @@ -57372,7 +57393,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "jjz" = ( /obj/structure/railing/pool_lining, @@ -57828,16 +57849,9 @@ /turf/simulated/floor/plasteel/white, /area/station/service/barber) "jvs" = ( -/obj/machinery/computer/monitor{ - name = "Bridge Power Monitoring Computer" - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/effect/turf_decal/tiles/department/engineering/side{ - dir = 6 - }, -/turf/simulated/floor/plasteel, +/obj/machinery/computer/card, +/obj/effect/turf_decal/tiles/department/virology, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "jvE" = ( /obj/structure/fans/tiny, @@ -57971,7 +57985,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "jxu" = ( /obj/effect/decal/cleanable/generic, @@ -58455,8 +58469,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tiles/department/medical/side, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/command/side, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "jJn" = ( /obj/effect/turf_decal/tiles/department/engineering/corner{ @@ -58476,6 +58490,25 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/north) +"jKE" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/railing/cap/normal, +/obj/effect/turf_decal/tiles/department/command/corner{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "jKM" = ( /obj/structure/disposalpipe/sortjunction/reversed{ dir = 4 @@ -58623,18 +58656,14 @@ /turf/simulated/floor/plasteel/dark, /area/station/maintenance/apmaint) "jOD" = ( -/obj/item/radio/intercom{ - name = "west bump"; - pixel_x = -28 - }, -/obj/machinery/power/apc/directional/south, /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/computer/rnd_backup/station{ - dir = 4 +/obj/item/radio/intercom{ + name = "south bump"; + pixel_y = -28 }, -/obj/item/disk/rnd_backup_disk, +/obj/machinery/power/apc/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/command/server) "jOF" = ( @@ -59790,15 +59819,9 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/north) "kmo" = ( -/obj/machinery/computer/secure_data, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 28 - }, -/obj/effect/turf_decal/tiles/department/security/side{ - dir = 6 - }, -/turf/simulated/floor/plasteel, +/obj/machinery/computer/security, +/obj/effect/turf_decal/tiles/department/security, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "kmA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -59964,13 +59987,20 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "kqO" = ( /obj/effect/spawner/random/maintenance, /obj/structure/shelf/security, /turf/simulated/floor/plating, /area/station/maintenance/fore) +"kqS" = ( +/obj/machinery/requests_console/directional/south, +/obj/structure/chair/comfy/blue{ + dir = 1 + }, +/turf/simulated/floor/carpet/black, +/area/station/command/bridge) "krd" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -60343,8 +60373,8 @@ /area/station/medical/cryo) "kAV" = ( /obj/structure/sign/poster/official/random/directional/south, -/obj/effect/turf_decal/tiles/department/medical/side, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/command/side, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "kBk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -60963,13 +60993,11 @@ "kNx" = ( /obj/machinery/computer/prisoner, /obj/machinery/newscaster/security_unit/directional/west, -/obj/machinery/ai_status_display{ +/obj/effect/turf_decal/tiles/department/security, +/obj/machinery/computer/security/telescreen/entertainment{ pixel_y = 32 }, -/obj/effect/turf_decal/tiles/department/security/side{ - dir = 10 - }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "kNH" = ( /obj/machinery/door/firedoor{ @@ -62061,10 +62089,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tiles/department/medical/side{ - dir = 8 - }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "lpr" = ( /obj/machinery/door/airlock/public/glass{ @@ -62460,10 +62485,10 @@ icon_state = "1-2" }, /obj/machinery/firealarm/directional/west, -/obj/effect/turf_decal/tiles/department/medical/side{ +/obj/effect/turf_decal/tiles/department/command/side{ dir = 8 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "lwQ" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ @@ -63181,8 +63206,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "lOQ" = ( -/obj/effect/turf_decal/tiles/department/medical/side, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/command/corner, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "lOY" = ( /obj/machinery/camera{ @@ -63975,10 +64000,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "mgA" = ( -/obj/effect/turf_decal/tiles/department/medical/corner{ - dir = 8 - }, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/command/side, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "mgF" = ( /obj/effect/turf_decal/tiles/jobs/bar/checker, @@ -64064,17 +64087,22 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "miB" = ( -/obj/structure/table/reinforced, -/obj/item/storage/secure/briefcase, -/obj/item/storage/box/pdas{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/storage/box/ids, /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/plasteel, +/obj/structure/table/reinforced, +/obj/item/book/manual/wiki/sop_command{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/item/multitool/command{ + pixel_x = 8; + pixel_y = 4 + }, +/obj/machinery/ai_status_display{ + pixel_x = -32 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "miH" = ( /obj/structure/disposalpipe/segment, @@ -64778,11 +64806,24 @@ /turf/simulated/floor/plasteel/dark, /area/station/medical/surgery/observation) "myO" = ( -/obj/effect/spawner/window/reinforced/grilled, -/obj/structure/cable{ - icon_state = "0-4" +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 6 }, -/turf/simulated/floor/plating, +/obj/structure/shelf/command, +/obj/item/aicard, +/obj/item/storage/secure/briefcase, +/obj/item/storage/box/pdas{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/storage/box/ids, +/obj/item/megaphone{ + pixel_x = 5; + pixel_y = 7 + }, +/obj/machinery/light, +/obj/item/taperecorder, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "myP" = ( /obj/effect/decal/cleanable/dirt, @@ -65042,17 +65083,6 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/command/office/hop) -"mFb" = ( -/obj/item/beacon, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/plasteel, -/area/station/command/bridge) "mFk" = ( /obj/machinery/atmospherics/binary/pump{ name = "Port to Cooling Loop" @@ -66039,6 +66069,12 @@ }, /turf/simulated/floor/plating, /area/station/science/toxins/launch) +"ncF" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "ncT" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -66206,10 +66242,10 @@ /obj/structure/disposalpipe/segment/corner{ dir = 2 }, -/obj/effect/turf_decal/tiles/department/medical/side{ +/obj/effect/turf_decal/tiles/department/command/side{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "ngS" = ( /obj/effect/spawner/window/reinforced/polarized{ @@ -66586,6 +66622,13 @@ }, /turf/simulated/floor/engine, /area/station/engineering/engine/reactor) +"nsp" = ( +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/effect/spawner/window/reinforced/grilled, +/turf/simulated/floor/plating, +/area/station/command/bridge) "nst" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -66768,8 +66811,8 @@ /area/station/medical/cryo) "nvC" = ( /obj/machinery/firealarm/directional/south, -/obj/effect/turf_decal/tiles/department/medical/side, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/command/side, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "nvO" = ( /obj/structure/disposalpipe/segment{ @@ -67365,21 +67408,6 @@ /obj/machinery/status_display, /turf/simulated/wall, /area/station/hallway/secondary/exit) -"nHz" = ( -/obj/machinery/door/airlock/command{ - name = "Bridge"; - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/access/any/command/general, -/obj/machinery/door/firedoor{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/turf_decal/tiles/department/medical/side{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/station/command/bridge) "nHA" = ( /obj/machinery/firealarm/directional/north, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -67477,9 +67505,11 @@ dir = 4 }, /obj/structure/cable{ - icon_state = "1-8" + icon_state = "2-4" }, -/turf/simulated/floor/plasteel, +/obj/structure/railing/cap/reversed, +/obj/effect/turf_decal/tiles/department/command/corner, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "nJD" = ( /obj/item/melee/baton/cattleprod, @@ -67575,12 +67605,15 @@ /turf/simulated/floor/plasteel/white, /area/station/science/toxins/mixing) "nMx" = ( -/obj/machinery/computer/communications, /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/tiles/department/medical/side, -/turf/simulated/floor/plasteel, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tiles/department/command, +/obj/machinery/phone{ + pixel_y = 4 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "nME" = ( /obj/structure/cable/extra_insulated{ @@ -68328,7 +68361,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "ocD" = ( /obj/machinery/door/airlock/atmos{ @@ -68477,7 +68510,7 @@ icon_state = "2-8" }, /obj/machinery/hologram/holopad, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "ogI" = ( /turf/simulated/wall/r_wall, @@ -68604,7 +68637,6 @@ /turf/simulated/floor/plasteel, /area/station/command/office/captain) "ojx" = ( -/obj/machinery/hologram/holopad, /obj/structure/cable{ icon_state = "1-4" }, @@ -68617,11 +68649,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/requests_console/directional/south, /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/siding, +/obj/effect/turf_decal/tiles/department/command/side, +/obj/item/beacon, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "ojz" = ( /obj/structure/sign/poster/contraband/random/directional/west, @@ -69191,10 +69225,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) -"owy" = ( -/obj/effect/turf_decal/tiles/department/medical/corner, -/turf/simulated/floor/plasteel, -/area/station/command/bridge) "owJ" = ( /obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, @@ -69655,8 +69685,10 @@ name = "east bump"; pixel_x = 27 }, -/obj/effect/turf_decal/tiles/department/medical/side, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 6 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "oGw" = ( /obj/machinery/atmospherics/binary/valve{ @@ -70393,6 +70425,19 @@ }, /turf/simulated/floor/plasteel, /area/station/supply/storage) +"oWM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tiles/department/command/corner, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "oWR" = ( /obj/machinery/ai_status_display{ pixel_y = 32 @@ -70952,8 +70997,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tiles/department/medical/side, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/command/side, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "plq" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ @@ -71552,7 +71597,7 @@ /turf/simulated/floor/plasteel, /area/station/security/permabrig) "pAJ" = ( -/obj/structure/flora/tree/jungle, +/obj/structure/flora/tree/jungle/small, /turf/simulated/floor/grass/jungle/no_creep, /area/station/command/bridge) "pAM" = ( @@ -71626,6 +71671,14 @@ /obj/machinery/power/apc/reinforced/directional/west, /turf/simulated/floor/plating, /area/station/medical/coldroom) +"pBS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "pBU" = ( /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/atmospherics/portable/canister/air, @@ -72321,16 +72374,14 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/structure/cable{ icon_state = "2-4" }, /obj/structure/cable{ icon_state = "1-4" }, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "pRg" = ( /obj/effect/turf_decal/tiles/department/medical/side, @@ -72662,7 +72713,7 @@ /area/station/maintenance/apmaint2) "pYW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "pZe" = ( /obj/structure/sign/fire{ @@ -73567,7 +73618,7 @@ /obj/effect/turf_decal/tiles/department/cargo/corner{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "qrJ" = ( /obj/machinery/camera{ @@ -73606,10 +73657,10 @@ /obj/structure/disposalpipe/segment/corner{ dir = 1 }, -/obj/effect/turf_decal/tiles/department/medical/side{ +/obj/effect/turf_decal/tiles/department/command/side{ dir = 10 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "qsB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, @@ -73750,7 +73801,7 @@ /obj/effect/turf_decal/tiles/department/cargo/corner{ dir = 1 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "qws" = ( /obj/structure/marker_beacon/dock_marker, @@ -73780,10 +73831,10 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/tiles/department/medical/side{ +/obj/effect/turf_decal/tiles/department/command/side{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "qxz" = ( /turf/simulated/wall, @@ -74761,10 +74812,10 @@ icon_state = "1-2" }, /obj/structure/sign/poster/official/random/directional/west, -/obj/effect/turf_decal/tiles/department/medical/side{ +/obj/effect/turf_decal/tiles/department/command/side{ dir = 8 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "qQj" = ( /obj/machinery/door/poddoor/preopen{ @@ -74845,14 +74896,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/camera{ - c_tag = "Bridge Central"; - dir = 1 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/siding, +/obj/effect/turf_decal/tiles/department/command/side, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "qRw" = ( /obj/effect/spawner/window/reinforced/plasma/grilled, @@ -75629,11 +75675,17 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "rkO" = ( -/obj/effect/spawner/window/reinforced/grilled, -/obj/structure/cable{ - icon_state = "0-8" +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 10 }, -/turf/simulated/floor/plating, +/obj/structure/shelf/command, +/obj/machinery/light, +/obj/item/storage/firstaid/machine, +/obj/item/storage/firstaid/regular, +/obj/item/storage/toolbox/mechanical, +/obj/item/assembly/signaler, +/obj/item/radio/off, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "rkS" = ( /obj/structure/closet/secure_closet/scientist, @@ -76277,26 +76329,6 @@ }, /turf/simulated/floor/plasteel, /area/station/service/janitor) -"rzb" = ( -/obj/effect/mapping_helpers/airlock/access/any/command/general, -/obj/machinery/door/firedoor{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/command{ - name = "Bridge"; - dir = 4 - }, -/obj/effect/turf_decal/tiles/department/medical/side{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/station/command/bridge) "rzk" = ( /obj/machinery/door/window/classic/reversed{ name = "Glass Door" @@ -76642,10 +76674,10 @@ name = "west bump"; pixel_x = -28 }, -/obj/effect/turf_decal/tiles/department/medical/side{ +/obj/effect/turf_decal/tiles/department/command/side{ dir = 8 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "rGg" = ( /obj/structure/cable{ @@ -76956,7 +76988,7 @@ /area/station/supply/sorting) "rOm" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "rOn" = ( /obj/structure/cable/extra_insulated{ @@ -77600,8 +77632,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "seV" = ( /obj/structure/cable{ @@ -78214,11 +78248,12 @@ /turf/simulated/floor/plasteel/white, /area/station/medical/surgery/secondary) "suM" = ( -/obj/structure/flora/grass/jungle, -/obj/machinery/light{ - dir = 8 +/obj/structure/cable, +/obj/structure/cable{ + icon_state = "1-4" }, -/turf/simulated/floor/grass/jungle/no_creep, +/obj/effect/spawner/window/reinforced/grilled, +/turf/simulated/floor/plating, /area/station/command/bridge) "svp" = ( /obj/effect/decal/cleanable/dirt, @@ -78533,6 +78568,13 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) +"sDF" = ( +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/spawner/window/reinforced/grilled, +/turf/simulated/floor/plating, +/area/station/command/bridge) "sDL" = ( /obj/structure/cable{ icon_state = "4-8" @@ -78723,7 +78765,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "sIS" = ( /obj/structure/disposalpipe/segment, @@ -78917,7 +78959,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "sNJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -79486,7 +79528,10 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/command/corner{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "taM" = ( /mob/living/simple_animal/slime, @@ -79616,8 +79661,10 @@ dir = 4 }, /obj/machinery/economy/vending/snack, -/obj/effect/turf_decal/tiles/department/medical/side, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 6 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "tdz" = ( /obj/effect/decal/cleanable/dirt, @@ -79703,6 +79750,12 @@ /obj/effect/turf_decal/tiles/department/science/side, /turf/simulated/floor/plasteel/white, /area/station/science/xenobiology) +"tfS" = ( +/obj/effect/turf_decal/tiles/department/command/corner{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "tgf" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -79830,15 +79883,17 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft/south) "tiG" = ( +/obj/effect/turf_decal/tiles/department/security, +/obj/machinery/computer/secure_data, +/obj/item/radio/intercom{ + name = "north bump"; + pixel_y = 28 + }, /obj/machinery/camera{ - c_tag = "Bridge West" + c_tag = "Bridge West"; + dir = 6 }, -/obj/machinery/computer/security, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = 32 - }, -/obj/effect/turf_decal/tiles/department/security/side, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "tiI" = ( /obj/structure/disposalpipe/segment, @@ -80080,13 +80135,10 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint2) "toQ" = ( -/obj/structure/chair{ - dir = 1 - }, /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "toR" = ( /obj/structure/disposalpipe/segment{ @@ -80660,6 +80712,14 @@ /obj/machinery/light, /turf/simulated/floor/plasteel, /area/station/security/range) +"tDA" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor/preopen{ + id_tag = "bridge blast west"; + name = "Bridge Blast Doors" + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "tDM" = ( /obj/effect/spawner/window/reinforced/polarized/grilled{ id = "HoS" @@ -80679,7 +80739,7 @@ /obj/effect/turf_decal/tiles/department/security/corner{ dir = 1 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "tEm" = ( /obj/effect/decal/cleanable/dirt, @@ -82803,14 +82863,10 @@ dir = 4 }, /obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/door/airlock/command{ - name = "Bridge"; +/obj/machinery/door/airlock/command/glass{ dir = 4 }, -/obj/effect/turf_decal/tiles/department/medical/side{ - dir = 4 - }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "uAa" = ( /obj/effect/turf_decal/tiles/department/cargo/side{ @@ -84231,23 +84287,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tiles/department/medical/corner, -/turf/simulated/floor/plasteel, -/area/station/command/bridge) -"vmZ" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/command/side, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "vnh" = ( /obj/machinery/door/firedoor{ @@ -84474,7 +84515,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "vro" = ( /obj/effect/decal/cleanable/dirt, @@ -86024,7 +86065,7 @@ /obj/machinery/door/airlock/command/glass{ name = "Bridge" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "wbK" = ( /obj/effect/spawner/window/reinforced/plasma/grilled, @@ -86711,7 +86752,7 @@ /obj/machinery/door/airlock/command/glass{ name = "Bridge" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "wpB" = ( /obj/structure/cable{ @@ -86754,10 +86795,10 @@ /turf/simulated/floor/plasteel/dark, /area/station/command/office/rd) "wqU" = ( -/obj/effect/turf_decal/tiles/department/medical/side{ +/obj/effect/turf_decal/tiles/department/command/side{ dir = 8 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "wrj" = ( /obj/effect/turf_decal/stripes/red/corner{ @@ -87184,16 +87225,14 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/brig) "wyO" = ( -/obj/structure/table/reinforced, -/obj/item/storage/toolbox/emergency, -/obj/item/wrench, -/obj/item/assembly/timer, -/obj/item/assembly/signaler, -/obj/item/assembly/signaler, /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/plasteel, +/obj/structure/filingcabinet/filingcabinet, +/obj/machinery/ai_status_display{ + pixel_x = 32 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "wyT" = ( /obj/structure/marker_beacon/dock_marker/collision, @@ -87313,13 +87352,15 @@ /turf/simulated/floor/plasteel/white, /area/station/science/toxins/mixing) "wCG" = ( -/obj/machinery/light, -/obj/structure/table/reinforced, -/obj/item/storage/firstaid/regular, -/obj/effect/turf_decal/tiles/department/medical/side{ - dir = 10 +/obj/effect/turf_decal/tiles/department/command/side, +/obj/item/flag/nt{ + layer = 3.4 }, -/turf/simulated/floor/plasteel, +/obj/machinery/camera{ + c_tag = "Bridge Central"; + dir = 1 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "wCQ" = ( /obj/machinery/alarm/directional/south, @@ -87573,6 +87614,9 @@ icon_state = "showroomfloor" }, /area/station/medical/surgery) +"wGW" = ( +/turf/simulated/floor/carpet/black, +/area/station/command/bridge) "wHa" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 5 @@ -87803,6 +87847,10 @@ /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/station/maintenance/asmaint) +"wLL" = ( +/obj/machinery/computer/communications, +/turf/simulated/floor/carpet/black, +/area/station/command/bridge) "wLT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/wall, @@ -88525,7 +88573,8 @@ id_tag = "bridge blast west"; name = "Bridge Blast Doors" }, -/turf/simulated/floor/plasteel, +/obj/machinery/light, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "xfI" = ( /turf/simulated/wall/r_wall, @@ -88613,6 +88662,15 @@ /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/aft) +"xia" = ( +/obj/effect/turf_decal/tiles/department/engineering/corner{ + dir = 8 + }, +/obj/structure/chair/office{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "xig" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -88623,10 +88681,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/tiles/department/medical/corner{ - dir = 8 - }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "xim" = ( /obj/structure/disposalpipe/segment, @@ -88666,8 +88721,8 @@ "xjV" = ( /obj/machinery/power/apc/important/directional/south, /obj/structure/cable, -/obj/effect/turf_decal/tiles/department/medical/corner, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/command/side, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "xkh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -88921,14 +88976,6 @@ /obj/effect/turf_decal/tiles/department/medical, /turf/simulated/floor/plasteel, /area/station/maintenance/aft) -"xqv" = ( -/obj/effect/spawner/window/reinforced/grilled, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable, -/turf/simulated/floor/plating, -/area/station/command/bridge) "xqH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -89134,7 +89181,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "xvJ" = ( /obj/machinery/door/firedoor{ @@ -89231,10 +89278,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/turf_decal/tiles/department/medical/side{ +/obj/effect/turf_decal/tiles/department/command/side{ dir = 8 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "xxQ" = ( /obj/effect/decal/cleanable/dirt, @@ -89652,6 +89699,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel/dark, /area/station/security/warden) +"xGN" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor/preopen{ + id_tag = "bridge blast east"; + name = "Bridge Blast Doors" + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "xGP" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -90023,10 +90078,10 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/effect/turf_decal/tiles/department/medical/side{ +/obj/effect/turf_decal/tiles/department/command/side{ dir = 10 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "xOn" = ( /obj/machinery/atmospherics/pipe/simple/visible/green, @@ -90338,7 +90393,7 @@ /obj/structure/table/glass, /obj/item/clothing/mask/cigarette/cigar, /obj/machinery/light/floor, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "xVe" = ( /obj/machinery/atmospherics/unary/vent_pump/on, @@ -90804,10 +90859,10 @@ id_tag = "bridge blast south"; name = "Bridge Blast Doors" }, -/obj/machinery/light/small{ +/obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "ycj" = ( /obj/machinery/atmospherics/unary/thermomachine/freezer, @@ -117637,7 +117692,7 @@ uhY aaa aaa bmc -xfB +tDA sNg xfB bxv @@ -118923,8 +118978,8 @@ miB bpr bqR sIn +ncF bqS -owy uzY qUH fcC @@ -119178,9 +119233,9 @@ bkz uco bnR bpo -bqS +xia sIn -owy +bqS hsH qxz hTD @@ -119434,8 +119489,8 @@ bne bpv vYM bnW -bpt -rOm +daL +bqS seQ lOQ myO @@ -119692,7 +119747,7 @@ bkz uco jvs bpq -bqX +bqS nJv dHw hJb @@ -119949,11 +120004,11 @@ bkz aSv bnY bpu -bqU +bqS qRr -hJb -bHD -lya +gUn +wGW +nsp lya pAJ bHz @@ -120208,10 +120263,10 @@ nMx toQ bqX ojx +wLL +kqS qxz -lya -iRr -lya +ivU imy fdC xUY @@ -120463,11 +120518,11 @@ bkz qCN boa iFa -bqV -vmZ -xqv -bHD -lya +bqS +qRr +gUn +wGW +sDF bHD lya fdC @@ -120721,9 +120776,9 @@ qCN aYf aYg bqS -sIn +jKE clb -xqv +hJb hcv mGH lya @@ -120976,10 +121031,10 @@ bnk bpy lPE brS -bpt -bup -mFb -lOQ +gaJ +bqS +sIn +tfS rkO qxz mWW @@ -121234,9 +121289,9 @@ bkz iSg jgu hzl -bqS +eMv sIn -mgA +bqS wCG qxz pex @@ -121493,9 +121548,9 @@ wyO bpB bqY sIn +ego bqS -mgA -nHz +uzY qlh wqU wqU @@ -121503,7 +121558,7 @@ wqU wqU wqU bqS -jxq +oWM tdr bQo fYs @@ -121747,17 +121802,17 @@ cjb bkE bmc bmc -bmc +fDv iim qwo pQg gPI -rzb +fUY vSs qxm qxm dtH -eay +pBS eay eay dSG @@ -122777,7 +122832,7 @@ lzc aaa aaa bmc -dLF +xGN btD dLF bxm diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index 0038d51c7a3..ddb15685f9a 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -1742,6 +1742,12 @@ /obj/structure/reagent_dispensers/water_cooler, /turf/simulated/floor/wood, /area/station/public/vacant_office) +"amg" = ( +/obj/effect/turf_decal/tiles/department/engineering/corner{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "amk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -1934,10 +1940,11 @@ /area/station/supply/storage) "aop" = ( /obj/machinery/light, -/obj/machinery/computer/brigcells{ +/obj/effect/turf_decal/tiles/department/science, +/obj/machinery/computer/rnd_backup/station{ dir = 1 }, -/obj/effect/turf_decal/tiles/department/security, +/obj/item/disk/rnd_backup_disk, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "aou" = ( @@ -3590,9 +3597,6 @@ pixel_y = 24; req_one_access = list(19,41) }, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/door_control{ id = "bridge_upper"; name = "Upper Bridge Lockdown"; @@ -4129,10 +4133,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/engine, /area/station/hallway/spacebridge/serveng) -"aGk" = ( -/obj/machinery/ai_status_display, -/turf/simulated/wall, -/area/station/command/office/captain) "aGq" = ( /obj/machinery/status_display{ layer = 4 @@ -4239,8 +4239,14 @@ dir = 8 }, /obj/structure/filingcabinet/filingcabinet, +/obj/effect/turf_decal/siding{ + dir = 8 + }, +/obj/machinery/camera{ + c_tag = "Bridge East" + }, /obj/effect/turf_decal/tiles/department/command/side{ - dir = 9 + dir = 8 }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) @@ -4302,14 +4308,8 @@ }, /area/station/medical/cryo) "aIv" = ( -/obj/machinery/door/window/classic/reversed{ - dir = 1 - }, -/obj/effect/mapping_helpers/airlock/windoor/autoname/desk{ - dir = 1 - }, -/obj/effect/mapping_helpers/airlock/windoor/access/any/command/general{ - dir = 1 +/obj/structure/cable{ + icon_state = "1-2" }, /turf/simulated/floor/plasteel/fakestairs, /area/station/command/bridge) @@ -4566,10 +4566,14 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/west) "aLe" = ( -/obj/machinery/computer/prisoner{ +/obj/effect/turf_decal/tiles/department/engineering, +/obj/machinery/computer/station_alert{ dir = 4 }, -/obj/effect/turf_decal/tiles/department/security, +/obj/item/radio/intercom{ + name = "west bump"; + pixel_x = -28 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "aLf" = ( @@ -4680,13 +4684,12 @@ /turf/simulated/floor/plasteel/white, /area/station/science/toxins/mixing) "aMc" = ( -/obj/structure/table/wood, -/obj/machinery/recharger, -/obj/structure/closet/fireaxecabinet{ - pixel_x = -32 +/obj/effect/turf_decal/tiles/department/security, +/obj/machinery/computer/security{ + dir = 4 }, -/obj/effect/turf_decal/tiles/department/command/side{ - dir = 1 +/obj/machinery/status_display{ + pixel_y = 32 }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) @@ -4745,11 +4748,11 @@ /turf/simulated/floor/catwalk, /area/station/maintenance/security/starboard) "aNd" = ( -/obj/structure/table, -/obj/item/paper_bin/nanotrasen, /obj/machinery/light, -/obj/item/pen/blue, -/obj/effect/turf_decal/tiles/department/command/side, +/obj/effect/turf_decal/tiles/department/virology, +/obj/machinery/computer/card{ + dir = 1 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "aNf" = ( @@ -4960,7 +4963,6 @@ "aPc" = ( /obj/structure/shelf/command, /obj/item/reagent_containers/drinks/oilcan/full, -/obj/item/aicard, /turf/simulated/floor/plasteel/dark, /area/station/command/meeting_room) "aPf" = ( @@ -4982,9 +4984,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tiles/department/cargo/side{ - dir = 1 - }, /turf/simulated/floor/plasteel/dark, /area/station/command/meeting_room) "aPn" = ( @@ -5001,17 +5000,22 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/computer/shuttle/mining, -/obj/effect/turf_decal/tiles/department/cargo, +/obj/structure/table/reinforced{ + layer = 2.5 + }, +/obj/machinery/phone{ + pixel_y = 2 + }, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 1 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/meeting_room) "aPq" = ( -/obj/machinery/computer/security/mining, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 28 +/obj/machinery/alarm/directional/north, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 1 }, -/obj/effect/turf_decal/tiles/department/cargo, /turf/simulated/floor/plasteel/dark, /area/station/command/meeting_room) "aPv" = ( @@ -5296,7 +5300,9 @@ "aSf" = ( /obj/machinery/light, /obj/item/kirbyplants/large/plant4, -/obj/effect/turf_decal/tiles/department/command/side, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 10 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/meeting_room) "aSo" = ( @@ -5377,12 +5383,10 @@ /turf/simulated/wall, /area/station/legal/lawoffice) "aSE" = ( -/obj/machinery/camera{ - c_tag = "Bridge East" - }, -/obj/effect/turf_decal/tiles/department/command/side{ - dir = 1 +/obj/effect/turf_decal/tiles/department/cargo/corner{ + dir = 4 }, +/obj/machinery/economy/vending/wallmed/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "aSJ" = ( @@ -5497,10 +5501,6 @@ /obj/effect/turf_decal/delivery/red/hollow, /turf/simulated/floor/noslip, /area/station/science/xenobiology) -"aTH" = ( -/obj/effect/turf_decal/tiles/department/command/side, -/turf/simulated/floor/plasteel/dark, -/area/station/command/bridge) "aTI" = ( /obj/structure/statue/tranquillite/mime, /turf/simulated/floor/mineral/tranquillite, @@ -6912,8 +6912,9 @@ /obj/machinery/light{ dir = 8 }, -/obj/effect/turf_decal/tiles/department/security/corner{ - dir = 8 +/obj/effect/turf_decal/tiles/department/security, +/obj/machinery/computer/secure_data{ + dir = 4 }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) @@ -9046,6 +9047,12 @@ }, /turf/simulated/floor/plasteel/white, /area/station/medical/patients_rooms_secondary) +"bvN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "bvO" = ( /obj/structure/cable, /obj/effect/turf_decal/box, @@ -10019,12 +10026,20 @@ }, /area/station/maintenance/service/fore_port) "bDh" = ( -/obj/machinery/economy/vending/wallmed/directional/north, /obj/structure/railing{ dir = 4 }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/siding{ + dir = 4 + }, +/obj/structure/closet/fireaxecabinet{ + pixel_y = 32 + }, /obj/effect/turf_decal/tiles/department/command/side{ - dir = 5 + dir = 4 }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) @@ -10044,16 +10059,16 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "bDy" = ( -/obj/machinery/keycard_auth{ - pixel_y = 24 +/obj/structure/cable{ + icon_state = "2-4" }, /turf/simulated/floor/carpet/black, /area/station/command/bridge) "bDz" = ( -/obj/structure/railing/corner{ - dir = 8; - pixel_y = -11 +/obj/structure/cable{ + icon_state = "4-8" }, +/obj/structure/railing/cap/normal, /turf/simulated/floor/carpet/black, /area/station/command/bridge) "bDA" = ( @@ -11212,12 +11227,18 @@ /turf/simulated/floor/plating, /area/station/hallway/primary/starboard/south) "bMy" = ( -/obj/structure/table/wood, /obj/structure/railing{ - dir = 8; - pixel_y = -11 + dir = 8 }, -/obj/item/megaphone, +/obj/structure/table/wood, +/obj/item/storage/fancy/matches{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/clothing/mask/cigarette/pipe{ + pixel_y = 4 + }, +/obj/item/clothing/mask/cigarette/cigar, /turf/simulated/floor/carpet/black, /area/station/command/bridge) "bMA" = ( @@ -11743,11 +11764,11 @@ /area/station/service/library) "bQc" = ( /obj/structure/shelf/command, +/obj/item/flag/nt, /obj/item/storage/firstaid/o2{ pixel_x = 3; pixel_y = 3 }, -/obj/item/storage/firstaid/regular, /turf/simulated/floor/plasteel/dark, /area/station/command/meeting_room) "bQg" = ( @@ -11926,6 +11947,15 @@ /obj/effect/turf_decal/tiles/department/command/side{ dir = 5 }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/siding{ + dir = 5 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bRq" = ( @@ -12001,12 +12031,12 @@ /turf/simulated/floor/plasteel/dark, /area/station/engineering/equipmentstorage) "bRN" = ( -/obj/machinery/computer/account_database{ - dir = 4 - }, /obj/structure/railing{ dir = 10 }, +/obj/machinery/computer/account_database{ + dir = 4 + }, /turf/simulated/floor/carpet/black, /area/station/command/bridge) "bRS" = ( @@ -12060,11 +12090,13 @@ /turf/simulated/floor/plasteel/dark, /area/station/command/meeting_room) "bSh" = ( -/obj/machinery/newscaster/security_unit/directional/east, -/obj/machinery/computer/station_alert{ +/obj/effect/turf_decal/tiles/department/cargo, +/obj/machinery/computer/security/mining{ dir = 8 }, -/obj/effect/turf_decal/tiles/department/engineering, +/obj/machinery/status_display/supply_display{ + pixel_x = 32 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bSk" = ( @@ -13127,15 +13159,6 @@ }, /turf/simulated/floor/plasteel, /area/station/maintenance/maintcentral) -"bXM" = ( -/obj/structure/chair/office{ - dir = 8 - }, -/obj/effect/turf_decal/tiles/department/security/side{ - dir = 8 - }, -/turf/simulated/floor/plasteel/dark, -/area/station/command/bridge) "bXQ" = ( /obj/structure/flora/rock/pile/largejungle, /turf/simulated/floor/grass, @@ -13190,6 +13213,9 @@ /obj/effect/turf_decal/tiles/department/command/corner{ dir = 4 }, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bYn" = ( @@ -13200,6 +13226,12 @@ /obj/effect/turf_decal/tiles/department/command/side{ dir = 5 }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/siding{ + dir = 5 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bYq" = ( @@ -13234,11 +13266,8 @@ /turf/simulated/floor/plasteel/dark, /area/station/ai_monitored/storage/eva) "bYR" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) @@ -13246,14 +13275,8 @@ /turf/simulated/floor/plasteel/dark, /area/station/service/chapel) "bYU" = ( -/obj/structure/chair/office{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tiles/department/engineering/side{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) @@ -13264,17 +13287,12 @@ /turf/simulated/floor/catwalk, /area/station/public/storage/emergency/port) "bZb" = ( -/obj/machinery/computer/monitor{ - dir = 8; - name = "Bridge Power Monitoring Computer" - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/effect/turf_decal/tiles/department/engineering, +/obj/structure/shelf/command, +/obj/item/storage/firstaid/machine, +/obj/item/storage/firstaid/regular, +/obj/item/storage/toolbox/mechanical, +/obj/item/assembly/signaler, +/obj/item/radio/off, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bZg" = ( @@ -13603,6 +13621,9 @@ /obj/effect/turf_decal/tiles/department/command/corner{ dir = 4 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "cdg" = ( @@ -14126,10 +14147,6 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/security/brig) -"chM" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel/dark, -/area/station/command/bridge) "chQ" = ( /obj/effect/spawner/random/dirt/maybe, /turf/simulated/floor/plasteel, @@ -14482,15 +14499,17 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/port/south) "ckI" = ( -/obj/structure/closet/walllocker/emerglocker/directional/west, -/obj/effect/turf_decal/tiles/department/command/corner, -/turf/simulated/floor/plasteel/dark, -/area/station/command/bridge) -"ckJ" = ( -/obj/machinery/computer/crew{ - dir = 1 +/obj/structure/table/reinforced{ + layer = 2.5 + }, +/obj/item/book/manual/wiki/sop_command{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/item/multitool/command{ + pixel_x = 8; + pixel_y = 4 }, -/obj/effect/turf_decal/tiles/department/command, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "ckM" = ( @@ -14567,6 +14586,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/turf_decal/tiles/department/command/side, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "clr" = ( @@ -14637,18 +14657,15 @@ /turf/simulated/wall/r_wall, /area/station/science/toxins/mixing) "clV" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/tiles/department/security/corner, +/obj/item/flag/nt, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "clW" = ( -/obj/machinery/computer/security{ +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/tiles/department/science, +/obj/machinery/computer/aifixer{ dir = 1 }, -/obj/machinery/firealarm/directional/south, -/obj/effect/turf_decal/tiles/department/security, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "cmb" = ( @@ -15410,11 +15427,10 @@ /area/station/hallway/primary/fore/north) "csz" = ( /obj/structure/shelf/command, -/obj/item/storage/toolbox/mechanical{ - pixel_x = 3; - pixel_y = 6 +/obj/item/flashlight{ + pixel_x = 1; + pixel_y = 5 }, -/obj/item/storage/toolbox/emergency, /turf/simulated/floor/plasteel/dark, /area/station/command/meeting_room) "csA" = ( @@ -15444,6 +15460,7 @@ /obj/effect/turf_decal/tiles/department/command/side{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel/dark, /area/station/command/meeting_room) "csL" = ( @@ -16280,24 +16297,12 @@ /turf/simulated/floor/plasteel/white, /area/station/science/misc_lab) "czg" = ( -/obj/structure/closet/walllocker/emerglocker/directional/east, -/obj/effect/turf_decal/tiles/department/security/corner{ - dir = 8 +/obj/structure/table/reinforced{ + layer = 2.5 }, +/obj/item/storage/fancy/donut_box, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) -"czk" = ( -/obj/structure/chair/office{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tiles/department/cargo/side{ - dir = 1 - }, -/turf/simulated/floor/plasteel/dark, -/area/station/command/meeting_room) "czl" = ( /obj/effect/turf_decal/caution, /turf/simulated/floor/engine/airless, @@ -16500,18 +16505,15 @@ /turf/simulated/floor/plasteel, /area/station/security/lobby) "cBp" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/table/wood, /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/item/multitool/command, +/obj/structure/disposalpipe/sortjunction, +/obj/structure/table/glass/reinforced, +/obj/effect/mapping_helpers/sortjunc_helper/hop_office, /turf/simulated/floor/plasteel/dark, /area/station/command/meeting_room) "cBs" = ( @@ -16534,12 +16536,12 @@ /turf/simulated/floor/wood, /area/station/maintenance/security/fore_starboard) "cBz" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/effect/turf_decal/tiles/department/command/side{ dir = 9 }, +/obj/effect/turf_decal/siding{ + dir = 9 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "cBD" = ( @@ -16614,11 +16616,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tiles/neutral, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/north) "cBR" = ( @@ -16751,13 +16752,6 @@ "cDp" = ( /turf/simulated/wall, /area/station/maintenance/command/starboard) -"cDF" = ( -/obj/machinery/computer/secure_data{ - dir = 1 - }, -/obj/effect/turf_decal/tiles/department/security, -/turf/simulated/floor/plasteel/dark, -/area/station/command/bridge) "cDN" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -19067,6 +19061,12 @@ }, /turf/simulated/floor/engine/vacuum, /area/station/maintenance/turbine) +"cVx" = ( +/obj/effect/turf_decal/tiles/department/command/corner{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/meeting_room) "cVC" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 @@ -20612,15 +20612,6 @@ /obj/effect/turf_decal/tiles/neutral, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/east) -"djy" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/tiles/department/command/corner{ - dir = 1 - }, -/turf/simulated/floor/plasteel/dark, -/area/station/command/bridge) "djz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 9; @@ -23266,13 +23257,14 @@ /turf/simulated/floor/plasteel, /area/station/security/prison/cell_block/a) "dKK" = ( -/obj/structure/disposalpipe/segment/corner{ - dir = 8 - }, /obj/structure/extinguisher_cabinet{ name = "east bump"; pixel_x = 27 }, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel/dark, /area/station/command/meeting_room) "dKL" = ( @@ -23377,12 +23369,15 @@ /turf/simulated/floor/plasteel, /area/station/security/main) "dLW" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /obj/effect/turf_decal/tiles/department/command/side{ dir = 8 }, +/obj/effect/turf_decal/siding{ + dir = 8 + }, +/obj/structure/railing{ + dir = 8 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "dLZ" = ( @@ -23529,14 +23524,13 @@ /turf/simulated/floor/plasteel/dark, /area/station/engineering/engine_foyer) "dNS" = ( -/obj/machinery/computer/rnd_backup/station{ - dir = 8 - }, -/obj/item/disk/rnd_backup_disk, /obj/machinery/light{ dir = 4 }, -/obj/effect/turf_decal/tiles/department/engineering, +/obj/effect/turf_decal/tiles/department/cargo, +/obj/machinery/computer/shuttle/mining{ + dir = 8 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "dNT" = ( @@ -23600,15 +23594,14 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/lighter/zippo/engraved, -/obj/structure/table, -/obj/machinery/phone{ - pixel_x = -15; - pixel_y = 7 - }, /obj/effect/turf_decal/tiles/department/command/side{ dir = 1 }, +/obj/structure/table/reinforced{ + layer = 2.5 + }, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high, /turf/simulated/floor/plasteel/dark, /area/station/command/meeting_room) "dOx" = ( @@ -27417,6 +27410,21 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood, /area/station/maintenance/asmaint) +"eGb" = ( +/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/turf_decal/tiles/department/command/corner{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/meeting_room) "eGi" = ( /turf/simulated/floor/plating{ icon_state = "asteroidplating" @@ -27987,17 +27995,10 @@ /turf/simulated/floor/wood, /area/station/maintenance/gambling_den) "eMc" = ( -/obj/machinery/computer/atmos_alert{ +/obj/effect/turf_decal/tiles/department/medical, +/obj/machinery/computer/crew{ dir = 8 }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/item/radio/intercom{ - name = "east bump"; - pixel_x = 28 - }, -/obj/effect/turf_decal/tiles/department/engineering, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "eMe" = ( @@ -29127,13 +29128,8 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/checkpoint/secondary) "eYJ" = ( -/obj/structure/railing/corner{ - pixel_y = -11 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/alarm/directional/north, +/obj/structure/railing/cap/reversed, /turf/simulated/floor/carpet/black, /area/station/command/bridge) "eYN" = ( @@ -29371,12 +29367,13 @@ /turf/simulated/floor/wood, /area/station/public/vacant_office) "fcE" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/machinery/alarm/directional/north, /obj/effect/turf_decal/tiles/department/command/side{ dir = 1 }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/command/meeting_room) "fcK" = ( @@ -29699,9 +29696,6 @@ /area/station/hallway/spacebridge/servsci) "fgx" = ( /obj/machinery/requests_console/directional/north, -/obj/structure/cable{ - icon_state = "2-8" - }, /turf/simulated/floor/carpet/black, /area/station/command/bridge) "fgJ" = ( @@ -30177,6 +30171,12 @@ /obj/effect/turf_decal/tiles/department/medical, /turf/simulated/floor/plasteel/white, /area/station/maintenance/starboard) +"flK" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "flL" = ( /obj/item/radio/intercom{ name = "south bump"; @@ -31350,8 +31350,11 @@ /obj/structure/railing{ dir = 6 }, -/obj/machinery/computer/security{ - dir = 1 +/obj/structure/table/reinforced{ + layer = 2.5 + }, +/obj/machinery/phone{ + pixel_y = 2 }, /turf/simulated/floor/carpet/black, /area/station/command/bridge) @@ -32868,7 +32871,6 @@ icon_state = "1-2" }, /obj/structure/sign/poster/official/random/directional/west, -/obj/effect/turf_decal/tiles/department/command/side, /turf/simulated/floor/plasteel/dark, /area/station/command/meeting_room) "fPR" = ( @@ -33282,9 +33284,6 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -34324,6 +34323,15 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/engineering/atmos) +"gjS" = ( +/obj/effect/turf_decal/tiles/department/command/corner{ + dir = 1 + }, +/obj/structure/railing/cap/reversed{ + dir = 1 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "gjW" = ( /obj/structure/window/reinforced{ dir = 4 @@ -34884,13 +34892,16 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/science/port) "gpi" = ( -/obj/structure/chair/comfy/lime{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, /obj/effect/landmark/start/chief_engineer, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/chair/comfy/yellow{ + dir = 8 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/meeting_room) "gpk" = ( @@ -36759,6 +36770,12 @@ "gNQ" = ( /turf/simulated/wall, /area/station/hallway/primary/fore/east) +"gOa" = ( +/obj/effect/turf_decal/tiles/department/security/corner{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "gOf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/chair/sofa/bench/left{ @@ -38928,6 +38945,15 @@ /obj/effect/turf_decal/tiles/department/cargo, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/starboard) +"hmC" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/obj/effect/turf_decal/tiles/department/engineering/corner{ + dir = 1 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "hmD" = ( /obj/machinery/power/smes, /obj/structure/cable/extra_insulated{ @@ -39130,12 +39156,6 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/security/processing) -"hor" = ( -/obj/structure/disposalpipe/segment/corner{ - dir = 4 - }, -/turf/simulated/floor/plasteel/dark, -/area/station/command/bridge) "hov" = ( /obj/effect/spawner/random/fungus/frequent, /turf/simulated/wall/r_wall, @@ -42819,14 +42839,12 @@ /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "iag" = ( -/obj/machinery/computer/med_data{ - dir = 1 - }, /obj/machinery/camera{ c_tag = "Bridge West"; dir = 1 }, -/obj/effect/turf_decal/tiles/department/command, +/obj/effect/turf_decal/tiles/department/virology, +/obj/machinery/photocopier, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "iah" = ( @@ -43944,8 +43962,15 @@ /obj/structure/railing{ dir = 10 }, -/obj/machinery/computer/card{ - dir = 1 +/obj/structure/table/reinforced{ + layer = 2.5 + }, +/obj/machinery/keycard_auth{ + pixel_y = 3 + }, +/obj/item/ashtray/bronze{ + pixel_x = 9; + pixel_y = 10 }, /turf/simulated/floor/carpet/black, /area/station/command/bridge) @@ -45564,6 +45589,10 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft/west) +"iEC" = ( +/obj/effect/turf_decal/tiles/department/command/corner, +/turf/simulated/floor/plasteel/dark, +/area/station/command/meeting_room) "iEF" = ( /obj/machinery/floodlight{ light_power = 1 @@ -46469,9 +46498,7 @@ /obj/structure/railing{ dir = 6 }, -/obj/machinery/computer/supplycomp{ - dir = 8 - }, +/obj/machinery/computer/security/wooden_tv, /turf/simulated/floor/carpet/black, /area/station/command/bridge) "iOf" = ( @@ -48147,6 +48174,10 @@ /obj/structure/window/reinforced, /turf/simulated/floor/grass, /area/station/science/genetics) +"jgh" = ( +/obj/machinery/light, +/turf/simulated/floor/carpet/black, +/area/station/command/office/captain) "jgi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -49364,6 +49395,12 @@ /obj/effect/turf_decal/tiles/department/engineering/corner, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/east) +"jsO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "jsP" = ( /obj/machinery/newscaster/directional/south, /turf/simulated/floor/wood, @@ -52111,6 +52148,14 @@ }, /turf/simulated/floor/plasteel/freezer, /area/station/public/toilet/lockerroom) +"jVh" = ( +/obj/machinery/light, +/obj/item/kirbyplants/large/plant4, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 6 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/meeting_room) "jVj" = ( /obj/structure/cable/extra_insulated{ icon_state = "1-8" @@ -52300,8 +52345,7 @@ /turf/simulated/floor/plasteel, /area/station/security/prisonlockers) "jYR" = ( -/obj/structure/chair/office, -/obj/effect/turf_decal/tiles/department/security/side, +/obj/effect/turf_decal/tiles/department/science/corner, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "jYS" = ( @@ -52968,10 +53012,13 @@ /turf/simulated/floor/plasteel/dark, /area/station/supply/office) "kgP" = ( -/obj/machinery/power/apc/directional/east, -/obj/structure/cable, -/obj/effect/turf_decal/tiles/department/engineering/corner{ - dir = 4 +/obj/item/radio/intercom{ + name = "east bump"; + pixel_x = 28 + }, +/obj/effect/turf_decal/tiles/department/medical, +/obj/machinery/computer/med_data{ + dir = 8 }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) @@ -53048,9 +53095,6 @@ /obj/structure/chair/comfy/corp, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/landmark/start/captain, /obj/structure/cable{ icon_state = "2-4" @@ -53058,6 +53102,10 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/structure/disposalpipe/sortjunction{ + dir = 8 + }, +/obj/effect/mapping_helpers/sortjunc_helper/captains_office, /turf/simulated/floor/plasteel/dark, /area/station/command/meeting_room) "khH" = ( @@ -55735,9 +55783,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/junction{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -55745,6 +55790,9 @@ icon_state = "4-8" }, /obj/effect/turf_decal/tiles/neutral, +/obj/structure/disposalpipe/segment/corner{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/north) "kKL" = ( @@ -56243,24 +56291,6 @@ }, /turf/simulated/floor/engine, /area/station/science/xenobiology) -"kPU" = ( -/obj/machinery/door/airlock/command/glass{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/command/general, -/obj/machinery/door/firedoor{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/poddoor/preopen{ - id_tag = "bridge_upper"; - layer = 2.6; - name = "Emergency Blast Door" - }, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel/dark, -/area/station/command/bridge) "kQc" = ( /obj/machinery/light{ dir = 4 @@ -58415,7 +58445,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ - icon_state = "1-4" + icon_state = "1-8" }, /turf/simulated/floor/carpet/black, /area/station/command/bridge) @@ -61071,8 +61101,19 @@ /turf/simulated/floor/carpet, /area/station/hallway/secondary/entry/south) "lOm" = ( -/obj/machinery/computer/supplycomp, -/obj/effect/turf_decal/tiles/department/cargo, +/obj/item/radio/intercom{ + name = "north bump"; + pixel_y = 28 + }, +/obj/structure/table/reinforced{ + layer = 2.5 + }, +/obj/item/lighter/zippo/engraved{ + pixel_y = 5 + }, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 1 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/meeting_room) "lOz" = ( @@ -63427,7 +63468,6 @@ /turf/simulated/floor/plating, /area/station/maintenance/science/aft) "mps" = ( -/obj/structure/table, /obj/machinery/recharger, /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = 32 @@ -63435,6 +63475,9 @@ /obj/effect/turf_decal/tiles/department/command/side{ dir = 1 }, +/obj/structure/table/reinforced{ + layer = 2.5 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/meeting_room) "mpA" = ( @@ -66481,6 +66524,18 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/north) +"nbk" = ( +/obj/effect/turf_decal/tiles/department/command/corner{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/railing/cap/normal{ + dir = 1 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "nbl" = ( /obj/item/stack/sheet/cardboard, /turf/simulated/floor/plating{ @@ -66884,8 +66939,9 @@ /turf/simulated/floor/plasteel/dark, /area/station/supply/office) "ngA" = ( -/obj/structure/chair/office, -/obj/effect/turf_decal/tiles/department/command/side, +/obj/effect/turf_decal/tiles/department/virology/corner{ + dir = 8 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "ngD" = ( @@ -67832,6 +67888,9 @@ /obj/effect/turf_decal/tiles/department/command/side{ dir = 1 }, +/obj/effect/turf_decal/siding{ + dir = 1 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "nsQ" = ( @@ -68477,7 +68536,10 @@ /turf/simulated/floor/plating, /area/station/supply/storage) "nyj" = ( -/obj/effect/turf_decal/tiles/department/security/side, +/obj/structure/chair/office, +/obj/effect/turf_decal/tiles/department/science/corner{ + dir = 8 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "nyl" = ( @@ -70764,9 +70826,11 @@ }, /area/station/maintenance/disposal/external/southeast) "nZB" = ( -/obj/structure/table/wood, -/obj/item/storage/fancy/donut_box, -/obj/effect/turf_decal/tiles/department/command/side{ +/obj/machinery/power/apc/critical/directional/north, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/tiles/department/security/corner{ dir = 1 }, /turf/simulated/floor/plasteel/dark, @@ -72346,15 +72410,6 @@ }, /turf/simulated/floor/plasteel, /area/station/security/processing) -"oqu" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel/dark, -/area/station/command/meeting_room) "oqz" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -73164,6 +73219,7 @@ layer = 2.6; name = "Emergency Blast Door" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/station/command/bridge) "oxM" = ( @@ -73506,9 +73562,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/item/flag/nt, -/obj/effect/turf_decal/tiles/department/cargo/corner{ - dir = 4 +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 1 }, /turf/simulated/floor/plasteel/dark, /area/station/command/meeting_room) @@ -74093,18 +74148,6 @@ /turf/simulated/floor/grass/jungle/no_creep, /area/station/hallway/primary/port/south) "oJf" = ( -/obj/machinery/door/window/classic/normal{ - dir = 1 - }, -/obj/effect/mapping_helpers/airlock/windoor/autoname/desk{ - dir = 1 - }, -/obj/effect/mapping_helpers/airlock/windoor/access/any/command/general{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/simulated/floor/plasteel/fakestairs, /area/station/command/bridge) "oJg" = ( @@ -74177,9 +74220,10 @@ /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "oKm" = ( -/obj/effect/turf_decal/tiles/department/command/corner{ - dir = 8 +/obj/structure/cable{ + icon_state = "1-2" }, +/obj/item/flag/nt, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "oKw" = ( @@ -76655,10 +76699,10 @@ /turf/simulated/mineral/ancient, /area/station/maintenance/command/starboard) "plu" = ( -/obj/structure/chair/comfy/shuttle, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, +/obj/structure/chair/comfy/blue, /turf/simulated/floor/carpet/black, /area/station/command/bridge) "ply" = ( @@ -76713,6 +76757,18 @@ }, /turf/simulated/floor/catwalk, /area/station/maintenance/disposal/east) +"pmo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/obj/structure/table/glass/reinforced, +/obj/item/paper_bin/nanotrasen, +/obj/item/pen/multi/fountain, +/turf/simulated/floor/plasteel/dark, +/area/station/command/meeting_room) "pmV" = ( /turf/simulated/wall/r_wall, /area/station/hallway/spacebridge/comeng) @@ -80047,7 +80103,12 @@ /area/station/security/armory/secure) "pXK" = ( /obj/structure/sign/poster/official/random/directional/east, -/obj/effect/turf_decal/tiles/department/command/side, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 6 + }, +/obj/structure/disposalpipe/segment/corner{ + dir = 8 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/meeting_room) "pXO" = ( @@ -80145,10 +80206,16 @@ /turf/simulated/floor/plasteel/white, /area/station/hallway/secondary/entry) "pZl" = ( -/obj/structure/railing/corner{ +/obj/effect/turf_decal/tiles/department/command/side{ dir = 4 }, -/obj/effect/turf_decal/tiles/department/command/side{ +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/siding{ + dir = 4 + }, +/obj/structure/railing{ dir = 4 }, /turf/simulated/floor/plasteel/dark, @@ -84059,15 +84126,15 @@ /area/station/hallway/secondary/entry/south) "qSJ" = ( /obj/item/kirbyplants/large/plant4, -/obj/structure/cable{ - icon_state = "2-4" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/effect/turf_decal/tiles/department/command/side{ dir = 9 }, +/obj/effect/turf_decal/siding{ + dir = 9 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "qSK" = ( @@ -84766,15 +84833,6 @@ /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/station/science/storage) -"raS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/sortjunction{ - dir = 8 - }, -/obj/effect/mapping_helpers/sortjunc_helper/captains_office, -/turf/simulated/floor/plasteel/dark, -/area/station/command/bridge) "raV" = ( /turf/simulated/floor/plating/airless, /area/station/maintenance/science/aft) @@ -85558,8 +85616,9 @@ "rlP" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, -/obj/effect/turf_decal/tiles/department/cargo/corner{ - dir = 1 +/obj/structure/closet/walllocker/emerglocker/directional/east, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 5 }, /turf/simulated/floor/plasteel/dark, /area/station/command/meeting_room) @@ -86628,10 +86687,13 @@ /turf/simulated/mineral/ancient/outer, /area/station/maintenance/science/starboard) "rzz" = ( -/obj/effect/turf_decal/tiles/department/command/side, /obj/structure/sign/command/conference{ pixel_x = -32 }, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 10 + }, +/obj/item/flag/nt, /turf/simulated/floor/plasteel/dark, /area/station/command/meeting_room) "rzB" = ( @@ -87823,10 +87885,6 @@ }, /turf/simulated/floor/plasteel, /area/station/security/prisonershuttle) -"rMM" = ( -/obj/structure/disposalpipe/segment/corner, -/turf/simulated/floor/plasteel/dark, -/area/station/command/bridge) "rMO" = ( /obj/machinery/door/airlock/public/glass, /obj/effect/mapping_helpers/airlock/autoname, @@ -90046,10 +90104,6 @@ /turf/simulated/floor/plasteel/dark, /area/station/science/toxins/launch) "slH" = ( -/obj/item/flashlight{ - pixel_x = 1; - pixel_y = 5 - }, /obj/structure/shelf/command, /obj/item/stack/package_wrap, /obj/item/dest_tagger, @@ -90113,8 +90167,9 @@ c_tag = "Bridge Conference Room West"; dir = 6 }, +/obj/structure/closet/walllocker/emerglocker/directional/west, /obj/effect/turf_decal/tiles/department/command/side{ - dir = 1 + dir = 9 }, /turf/simulated/floor/plasteel/dark, /area/station/command/meeting_room) @@ -91091,7 +91146,10 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/permabrig) "swn" = ( -/obj/effect/turf_decal/tiles/department/engineering/side{ +/obj/structure/chair/office{ + dir = 4 + }, +/obj/effect/turf_decal/tiles/department/medical/corner{ dir = 4 }, /turf/simulated/floor/plasteel/dark, @@ -91225,10 +91283,6 @@ /obj/effect/turf_decal/tiles/neutral, /turf/simulated/floor/plasteel, /area/station/maintenance/electrical/fore_starboard) -"sxT" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel/dark, -/area/station/command/meeting_room) "sye" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -94105,13 +94159,6 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/security/brig) -"tdM" = ( -/obj/machinery/light, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/carpet/black, -/area/station/command/office/captain) "tdO" = ( /obj/machinery/atmospherics/refill_station/nitrogen, /turf/simulated/floor/plasteel/white, @@ -95765,19 +95812,6 @@ }, /turf/simulated/floor/plating, /area/station/aisat/atmos) -"txk" = ( -/obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/sortjunction/reversed{ - dir = 1 - }, -/obj/item/paper_bin/nanotrasen, -/obj/item/pen/multi/fountain, -/obj/effect/mapping_helpers/sortjunc_helper/hop_office, -/turf/simulated/floor/plasteel/dark, -/area/station/command/meeting_room) "txD" = ( /obj/machinery/airlock_controller/air_cycler/directional/east, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -97052,6 +97086,10 @@ }, /turf/simulated/floor/plasteel/white, /area/station/medical/storage) +"tMU" = ( +/obj/effect/turf_decal/tiles/department/cargo/corner, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "tNe" = ( /obj/structure/rack, /obj/item/restraints/legcuffs/beartrap, @@ -97816,6 +97854,9 @@ pixel_y = 32; req_access = list(56) }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/carpet/black, /area/station/command/bridge) "tVO" = ( @@ -98523,8 +98564,9 @@ name = "west bump"; pixel_x = -27 }, -/obj/effect/turf_decal/tiles/department/security/corner{ - dir = 1 +/obj/effect/turf_decal/tiles/department/engineering, +/obj/machinery/computer/atmos_alert{ + dir = 4 }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) @@ -99376,7 +99418,9 @@ }, /obj/structure/chair/comfy/blue, /obj/effect/landmark/start/nanotrasen_rep, -/obj/structure/disposalpipe/junction/reversed, +/obj/structure/disposalpipe/segment/corner{ + dir = 4 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/meeting_room) "ulK" = ( @@ -99957,10 +100001,21 @@ /turf/simulated/floor/carpet/black, /area/station/service/chapel/office) "usf" = ( -/obj/machinery/computer/shuttle/labor{ - dir = 4 +/obj/structure/shelf/command, +/obj/item/aicard, +/obj/item/storage/secure/briefcase, +/obj/item/storage/box/ids{ + pixel_x = -2 }, -/obj/effect/turf_decal/tiles/department/security, +/obj/item/storage/box/pdas{ + pixel_x = -2; + pixel_y = 8 + }, +/obj/item/megaphone{ + pixel_x = 5; + pixel_y = 7 + }, +/obj/item/taperecorder, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "usn" = ( @@ -100150,7 +100205,7 @@ /turf/simulated/floor/engine, /area/station/science/toxins/mixing) "utR" = ( -/obj/effect/turf_decal/tiles/department/security/side{ +/obj/structure/chair/office{ dir = 8 }, /turf/simulated/floor/plasteel/dark, @@ -101205,6 +101260,11 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/security/armory/secure) +"uEt" = ( +/obj/effect/turf_decal/tiles/department/virology/corner, +/obj/structure/chair/office, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "uEu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -103215,14 +103275,10 @@ /turf/simulated/floor/plating, /area/station/maintenance/disposal/east) "vbF" = ( -/obj/machinery/power/apc/directional/north, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/photocopier, /obj/effect/turf_decal/tiles/department/command/side{ dir = 1 }, +/obj/machinery/economy/vending/snack, /turf/simulated/floor/plasteel/dark, /area/station/command/meeting_room) "vbI" = ( @@ -105056,12 +105112,9 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/landmark/start/head_of_personnel, /obj/structure/chair/comfy/blue, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment/corner, /turf/simulated/floor/plasteel/dark, /area/station/command/meeting_room) "vwe" = ( @@ -107140,7 +107193,6 @@ /turf/simulated/floor/plating, /area/station/engineering/tech_storage) "vRL" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/command/glass{ dir = 4 }, @@ -109714,15 +109766,9 @@ /turf/simulated/floor/wood, /area/station/service/theatre) "wvw" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/effect/turf_decal/tiles/department/command/corner{ dir = 1 }, @@ -110600,7 +110646,10 @@ /area/station/maintenance/security/fore_starboard) "wEV" = ( /obj/machinery/firealarm/directional/east, -/obj/effect/turf_decal/tiles/department/command/side, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 6 + }, +/obj/item/flag/nt, /turf/simulated/floor/plasteel/dark, /area/station/command/meeting_room) "wEY" = ( @@ -110686,16 +110735,11 @@ /turf/simulated/floor/plating, /area/station/maintenance/service/aft_starboard) "wGl" = ( -/obj/machinery/computer/security{ - dir = 4; - name = "Labor Camp Monitoring"; - network = list("Labor Camp") - }, -/obj/item/radio/intercom{ - name = "west bump"; - pixel_x = -28 - }, /obj/effect/turf_decal/tiles/department/security, +/obj/machinery/computer/prisoner{ + dir = 4 + }, +/obj/machinery/newscaster/security_unit/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "wGo" = ( @@ -110888,7 +110932,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/item/flag/nt, /obj/effect/turf_decal/tiles/department/command/corner{ dir = 1 }, @@ -111180,7 +111223,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/table/wood, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -111191,10 +111233,8 @@ pixel_y = 7; req_one_access = list(19,41) }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/item/ashtray/bronze, +/obj/structure/table/glass/reinforced, /turf/simulated/floor/plasteel/dark, /area/station/command/meeting_room) "wKO" = ( @@ -113966,6 +114006,13 @@ }, /turf/space, /area/station/engineering/solar/fore_port) +"xql" = ( +/obj/effect/turf_decal/tiles/department/command/corner, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/meeting_room) "xqn" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tiles/department/medical/corner, @@ -114763,12 +114810,21 @@ /area/station/science/xenobiology) "xzb" = ( /obj/structure/table/wood, -/obj/structure/railing{ - dir = 4; - pixel_y = -11 +/obj/item/folder/blue{ + pixel_x = 6; + pixel_y = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/item/paper_bin/nanotrasen{ + pixel_x = -6; + pixel_y = 2 + }, +/obj/item/pen/multi/fountain{ + pixel_x = -7; + pixel_y = 4 }, -/obj/item/folder/blue, -/obj/item/pen/multi/fountain, /turf/simulated/floor/carpet/black, /area/station/command/bridge) "xzh" = ( @@ -115024,6 +115080,10 @@ }, /turf/simulated/floor/transparent/glass/reinforced, /area/station/maintenance/electrical/aft_starboard) +"xCm" = ( +/obj/effect/turf_decal/tiles/department/medical/corner, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "xCx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -115927,6 +115987,9 @@ /obj/effect/turf_decal/tiles/department/command/side{ dir = 1 }, +/obj/effect/turf_decal/siding{ + dir = 1 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "xLY" = ( @@ -116851,8 +116914,13 @@ /turf/simulated/floor/engine, /area/station/medical/chemistry) "xVF" = ( -/obj/item/kirbyplants/large, -/obj/effect/turf_decal/tiles/department/engineering/corner, +/obj/effect/turf_decal/tiles/department/cargo, +/obj/machinery/computer/supplycomp{ + dir = 8 + }, +/obj/machinery/ai_status_display{ + pixel_y = 32 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "xVI" = ( @@ -150373,7 +150441,7 @@ uXj uXj uXj aEL -aGk +eTm aMc bfP wGl @@ -150383,7 +150451,7 @@ ubW ckI xYZ vbF -cyR +afo ikk djE djE @@ -150629,19 +150697,19 @@ vUn aVo dPP qEF -uaz +aEU eTm nZB +utR +gOa +aUF +hmC +amg tpA -utR -bXM -utR -aTH -ckJ xYZ fcE -afo -bpg +cyR +eGb aSf djE qHc @@ -150886,12 +150954,12 @@ aNu aVg aEU aEU -tMM +jgh eTm bDh pZl -cdf -aUF +nbk +bvN tpA ngA iag @@ -151143,20 +151211,20 @@ aNw qGL aEU aEU -tdM +uaz eTm bDy aIv bRp bYj tpA -tpA +uEt aNd cpi dOw afo bpg -aUp +cVx rzz jEs brs @@ -151407,9 +151475,9 @@ bMy bRN bYn cdf -tpA +cTc oKm -xPq +uSa wIh cyR kOs @@ -151664,10 +151732,10 @@ bMQ nNY imn xLP -hor -chM +tpA +tpA vRL -sxT +aUp ulw cBp cCR @@ -151921,7 +151989,7 @@ lGj plu cMO nsK -raS +jsO clm oxI csK @@ -152178,12 +152246,12 @@ bMQ bRS fxL xLP -rMM -chM -kPU -sxT +tpA +tpA +vRL +aUp vvZ -txk +pmo lVh cGP lSr @@ -152434,12 +152502,12 @@ eYJ xzb iOd qSJ -djy -cTc +cVq +tpA clV -uSa +xPq oBM -oqu +aQl gpi xOT pHE @@ -152696,9 +152764,9 @@ nyj aop aNY aPo +aUp aPm -aUp -aUp +iEC wEV djE tQD @@ -152943,18 +153011,18 @@ dxS dxS dxS dxS -aGq +dxS aHn dLW -cVq +gjS bYR tpA jYR clW xYZ lOm -czk aUp +aPm cCZ ixI ixI @@ -153202,17 +153270,17 @@ rNK rNK aVS aSE -swn -swn +flK +tMU bYU swn -nyj -cDF +xCm +tpA xYZ aPq -aPm aUp -aSf +xql +jVh ixI bCK cTC diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index 6e4f917eb3b..f39740b35d8 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -17180,11 +17180,11 @@ /turf/simulated/floor/plasteel/dark, /area/station/engineering/secure_storage) "bse" = ( -/obj/machinery/door_control{ - id = "bridge blast north"; - name = "North Bridge Blast Door Control"; - pixel_y = 32; - req_access = list(19) +/obj/effect/turf_decal/tiles/department/science/corner{ + dir = 1 + }, +/obj/structure/chair/office{ + dir = 1 }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) @@ -18164,94 +18164,100 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/nw) "bxm" = ( -/obj/machinery/computer/card, -/obj/effect/turf_decal/tiles/department/command/side{ - dir = 1 - }, +/obj/effect/turf_decal/tiles/department/engineering, +/obj/machinery/computer/atmos_alert, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bxn" = ( -/obj/machinery/computer/crew, -/obj/effect/turf_decal/tiles/department/command/side{ - dir = 1 - }, +/obj/machinery/computer/station_alert, +/obj/effect/turf_decal/tiles/department/engineering, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bxo" = ( -/obj/machinery/computer/med_data, /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/tiles/department/command/side{ - dir = 1 - }, +/obj/machinery/photocopier, +/obj/effect/turf_decal/tiles/department/virology, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bxp" = ( -/obj/structure/table/reinforced, -/obj/item/restraints/handcuffs, -/obj/item/flash, /obj/machinery/ai_status_display{ pixel_y = 32 }, +/obj/machinery/computer/card, +/obj/effect/turf_decal/tiles/department/virology, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bxq" = ( -/obj/machinery/computer/prisoner, -/obj/effect/turf_decal/tiles/department/security/side{ - dir = 1 +/obj/structure/table/reinforced, +/obj/machinery/keycard_auth{ + pixel_y = 3 }, +/obj/effect/turf_decal/tiles/department/command, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bxr" = ( -/obj/machinery/computer/security, /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/tiles/department/security/side{ - dir = 1 +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tiles/department/command, +/obj/machinery/phone{ + pixel_y = 4 }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bxs" = ( -/obj/machinery/computer/secure_data, -/obj/effect/turf_decal/tiles/department/security/side{ - dir = 1 +/obj/structure/table/reinforced, +/obj/machinery/door_control{ + id = "bridge blast north"; + name = "North Bridge Blast Door Control"; + pixel_y = 10; + req_access = list(19) + }, +/obj/effect/turf_decal/tiles/department/command, +/obj/machinery/door_control{ + id = "bridge blast east"; + name = "East Bridge Blast Door Control"; + pixel_x = 6; + pixel_y = 2; + req_access = list(19) + }, +/obj/machinery/door_control{ + id = "bridge blast west"; + name = "West Bridge Blast Door Control"; + pixel_x = -6; + pixel_y = 2; + req_access = list(19) }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bxt" = ( -/obj/structure/table/reinforced, /obj/machinery/status_display{ pixel_y = 32 }, +/obj/machinery/computer/rnd_backup/station, +/obj/item/disk/rnd_backup_disk, +/obj/effect/turf_decal/tiles/department/science, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bxu" = ( -/obj/machinery/computer/station_alert, /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/tiles/department/engineering/side{ - dir = 1 - }, +/obj/effect/turf_decal/tiles/department/science, +/obj/machinery/computer/aifixer, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bxv" = ( -/obj/machinery/computer/atmos_alert, -/obj/effect/turf_decal/tiles/department/engineering/side{ - dir = 1 - }, +/obj/effect/turf_decal/tiles/department/medical, +/obj/machinery/computer/crew, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bxw" = ( -/obj/machinery/computer/monitor, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/effect/turf_decal/tiles/department/engineering/side{ - dir = 1 - }, +/obj/effect/turf_decal/tiles/department/medical, +/obj/machinery/computer/med_data, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bxx" = ( @@ -18592,25 +18598,25 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/west) "byS" = ( -/obj/structure/chair/office/dark{ - dir = 8 +/obj/effect/turf_decal/tiles/department/engineering/corner{ + dir = 4 }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "byT" = ( -/obj/structure/chair/office/dark{ - dir = 1 - }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/turf_decal/tiles/department/virology/corner{ + dir = 1 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "byU" = ( /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "byV" = ( -/obj/structure/chair/office/dark{ +/obj/effect/turf_decal/tiles/department/command/corner{ dir = 1 }, /turf/simulated/floor/plasteel/dark, @@ -18628,31 +18634,17 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/east) "byX" = ( -/obj/structure/chair/office/dark{ - dir = 4 - }, -/obj/machinery/door_control{ - id = "bridge blast east"; - name = "East Bridge Blast Door Control"; - pixel_x = 26; - req_access = list(19) +/obj/effect/turf_decal/tiles/department/medical/corner{ + dir = 1 }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "byY" = ( -/obj/structure/table/reinforced, -/obj/item/radio/intercom{ - name = "east bump"; - pixel_x = 28 +/obj/effect/turf_decal/tiles/department/medical/corner{ + dir = 4 }, -/obj/item/flash, -/obj/item/storage/box/ids, -/obj/item/storage/box/pdas{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/chair/office{ + dir = 1 }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) @@ -19002,41 +18994,45 @@ /turf/simulated/floor/plasteel/dark, /area/station/engineering/hardsuitstorage) "bAr" = ( -/obj/item/kirbyplants/large, /obj/machinery/light/small{ dir = 1 }, /obj/structure/sign/command{ pixel_y = 32 }, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 9 + }, +/obj/item/flag/nt{ + layer = 3.4 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bAt" = ( -/obj/item/kirbyplants/large, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 9 + }, +/obj/machinery/economy/vending/cola, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bAw" = ( -/obj/machinery/computer/security/mining, -/obj/effect/turf_decal/tiles/department/cargo/side{ - dir = 1 - }, +/obj/machinery/computer/prisoner, +/obj/effect/turf_decal/tiles/department/security, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bAx" = ( -/obj/machinery/computer/supplycomp, /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/tiles/department/cargo/side{ - dir = 1 - }, +/obj/machinery/computer/secure_data, +/obj/effect/turf_decal/tiles/department/security, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bAy" = ( -/obj/machinery/hologram/holopad, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/light/floor, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bAz" = ( @@ -19060,25 +19056,23 @@ /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bAC" = ( -/obj/machinery/computer/security/telescreen/rd{ - pixel_y = 2 - }, -/turf/simulated/wall, +/obj/effect/turf_decal/tiles/department/cargo, +/obj/machinery/computer/supplycomp, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bAD" = ( -/obj/machinery/computer/shuttle/mining, /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/tiles/department/cargo/side{ - dir = 1 - }, +/obj/effect/turf_decal/tiles/department/cargo, +/obj/machinery/computer/shuttle/mining, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bAE" = ( -/obj/machinery/computer/aifixer, -/obj/effect/turf_decal/tiles/department/science/side{ - dir = 1 +/obj/effect/turf_decal/tiles/department/cargo, +/obj/machinery/computer/security/mining, +/obj/machinery/light{ + dir = 4 }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) @@ -19484,6 +19478,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/tiles/department/command/corner{ + dir = 4 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bCn" = ( @@ -19510,27 +19507,27 @@ /obj/structure/disposalpipe/segment/corner{ dir = 2 }, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 1 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bCp" = ( -/obj/structure/chair/office/dark{ - dir = 1 - }, /obj/structure/cable{ icon_state = "4-8" }, /obj/structure/cable{ icon_state = "1-8" }, -/obj/structure/cable{ - icon_state = "2-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/chair/office{ + dir = 1 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bCq" = ( @@ -19578,6 +19575,8 @@ }, /obj/structure/railing, /obj/effect/turf_decal/tiles/department/command/side, +/obj/item/beacon, +/obj/effect/turf_decal/siding, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bCu" = ( @@ -19596,25 +19595,7 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) -"bCv" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel/dark, -/area/station/command/bridge) "bCw" = ( -/obj/structure/chair/office/dark{ - dir = 1 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -19627,12 +19608,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/chair/office{ + dir = 1 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bCx" = ( -/obj/structure/chair/office/dark{ - dir = 1 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -19642,6 +19623,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/turf_decal/tiles/department/security/corner{ + dir = 1 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bCy" = ( @@ -19662,6 +19646,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 1 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bCz" = ( @@ -19674,6 +19661,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/effect/turf_decal/tiles/department/command/corner{ + dir = 1 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bCC" = ( @@ -19738,7 +19728,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tiles/department/command/side, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bCP" = ( @@ -20105,18 +20094,19 @@ dir = 8 }, /obj/effect/turf_decal/tiles/department/command/side, +/obj/effect/turf_decal/siding, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bEe" = ( /obj/structure/railing{ dir = 4 }, -/obj/structure/rack, -/obj/item/storage/secure/briefcase, -/obj/item/aicard, /obj/effect/turf_decal/tiles/department/command/side{ dir = 4 }, +/obj/effect/turf_decal/siding{ + dir = 4 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bEf" = ( @@ -20142,19 +20132,16 @@ }, /area/station/command/bridge) "bEi" = ( -/obj/item/storage/toolbox/emergency, -/obj/item/wrench, -/obj/item/storage/toolbox/mechanical{ - pixel_y = -3 - }, -/obj/item/multitool/command, -/obj/structure/shelf/command, /obj/structure/railing{ dir = 8 }, /obj/effect/turf_decal/tiles/department/command/side{ dir = 8 }, +/obj/structure/filingcabinet/filingcabinet, +/obj/effect/turf_decal/siding{ + dir = 8 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bEm" = ( @@ -20581,7 +20568,9 @@ name = "south bump"; pixel_y = -24 }, -/obj/effect/turf_decal/tiles/department/command/side, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 10 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bFy" = ( @@ -20593,6 +20582,7 @@ /obj/structure/sign/command/conference{ pixel_y = -32 }, +/obj/machinery/light, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bFB" = ( @@ -20604,9 +20594,12 @@ /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bFC" = ( -/obj/machinery/power/apc/directional/south, -/obj/structure/cable, /obj/effect/turf_decal/tiles/department/command/side, +/obj/machinery/light_switch{ + dir = 1; + name = "south bump"; + pixel_y = -24 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bFD" = ( @@ -20617,21 +20610,25 @@ /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bFG" = ( -/obj/item/taperecorder, /obj/structure/railing{ dir = 4 }, -/obj/structure/table/reinforced, /obj/effect/turf_decal/tiles/department/command/side{ dir = 4 }, +/obj/structure/table/reinforced, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high, +/obj/effect/turf_decal/siding{ + dir = 4 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bFH" = ( -/obj/structure/chair/comfy/black{ +/obj/effect/landmark/start/captain, +/obj/structure/chair/comfy/blue{ dir = 1 }, -/obj/effect/landmark/start/captain, /turf/simulated/floor/carpet/black, /area/station/command/bridge) "bFI" = ( @@ -20656,17 +20653,21 @@ /obj/structure/railing{ dir = 8 }, -/obj/structure/table/reinforced, -/obj/item/restraints/handcuffs, -/obj/item/flash, /obj/effect/turf_decal/tiles/department/command/side{ dir = 8 }, -/turf/simulated/floor/plasteel/dark, -/area/station/command/bridge) -"bFN" = ( -/obj/machinery/alarm/directional/south, -/obj/effect/turf_decal/tiles/department/command/side, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/siding{ + dir = 8 + }, +/obj/item/multitool/command{ + pixel_x = 8; + pixel_y = 4 + }, +/obj/item/book/manual/wiki/sop_command{ + pixel_x = -3; + pixel_y = 4 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bFO" = ( @@ -20700,6 +20701,9 @@ "bFR" = ( /obj/item/kirbyplants/large, /obj/machinery/light/small, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 10 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bFS" = ( @@ -21095,24 +21099,38 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/ne) "bHn" = ( -/obj/effect/turf_decal/tiles/department/command/side{ - dir = 8 +/obj/structure/shelf/command, +/obj/item/aicard, +/obj/item/storage/secure/briefcase, +/obj/item/storage/box/ids{ + pixel_x = -2 + }, +/obj/item/storage/box/pdas{ + pixel_x = -2; + pixel_y = 8 }, -/obj/structure/table/reinforced, -/obj/machinery/cell_charger, /obj/item/megaphone{ pixel_x = 5; pixel_y = 7 }, +/obj/item/taperecorder, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 10 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bHq" = ( -/obj/item/storage/fancy/donut_box, /obj/structure/railing{ dir = 4 }, /obj/structure/table/reinforced, +/obj/machinery/recharger{ + pixel_y = 5 + }, /obj/effect/turf_decal/tiles/department/command/side{ + dir = 6 + }, +/obj/effect/turf_decal/siding{ dir = 4 }, /turf/simulated/floor/plasteel/dark, @@ -21137,9 +21155,9 @@ pixel_x = 6; pixel_y = 6 }, -/obj/item/pen/multi{ - pixel_x = -6; - pixel_y = 6 +/obj/item/pen/multi/fountain{ + pixel_x = 6; + pixel_y = 7 }, /turf/simulated/floor/carpet/black, /area/station/command/bridge) @@ -21158,9 +21176,6 @@ pixel_y = -26; req_access = list(18) }, -/obj/machinery/keycard_auth{ - pixel_y = -38 - }, /obj/structure/table/wood, /obj/item/flashlight/lamp, /turf/simulated/floor/carpet/black, @@ -21170,10 +21185,13 @@ dir = 8 }, /obj/structure/table/reinforced, -/obj/item/storage/firstaid/regular, /obj/effect/turf_decal/tiles/department/command/side{ + dir = 10 + }, +/obj/effect/turf_decal/siding{ dir = 8 }, +/obj/item/storage/fancy/donut_box, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bHv" = ( @@ -35155,11 +35173,15 @@ name = "south bump"; pixel_y = -30 }, +/obj/structure/shelf/command, +/obj/item/storage/firstaid/machine, +/obj/item/storage/firstaid/regular, +/obj/item/storage/toolbox/mechanical, +/obj/item/assembly/signaler, /obj/effect/turf_decal/tiles/department/command/side{ - dir = 4 + dir = 6 }, -/obj/structure/table/reinforced, -/obj/machinery/recharger, +/obj/item/radio/off, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "cHg" = ( @@ -47930,10 +47952,6 @@ network = list("Research","SS13"); pixel_y = -22 }, -/obj/machinery/computer/rnd_backup/station{ - dir = 4 - }, -/obj/item/disk/rnd_backup_disk, /obj/effect/turf_decal/tiles/department/science/side{ dir = 8 }, @@ -51862,16 +51880,11 @@ /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "foU" = ( -/obj/structure/table/reinforced, -/obj/item/radio/intercom{ - name = "west bump"; - pixel_x = -28 +/obj/effect/turf_decal/tiles/department/engineering/corner{ + dir = 1 }, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/phone{ - pixel_y = 2 +/obj/structure/chair/office{ + dir = 1 }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) @@ -52795,6 +52808,11 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/service/hydroponics) +"fGF" = ( +/obj/machinery/computer/security, +/obj/effect/turf_decal/tiles/department/security, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "fGP" = ( /obj/effect/mapping_helpers/turfs/damage, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -53610,6 +53628,21 @@ /obj/effect/mapping_helpers/airlock/access/all/supply/mail_sorting, /turf/simulated/floor/plasteel, /area/station/supply/warehouse) +"fSR" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/turf_decal/tiles/department/cargo/corner{ + dir = 1 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "fTe" = ( /obj/structure/railing{ dir = 1 @@ -53691,6 +53724,10 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) +"fTU" = ( +/obj/machinery/status_display/supply_display, +/turf/simulated/wall/r_wall, +/area/station/command/bridge) "fTV" = ( /obj/structure/cable{ icon_state = "4-8" @@ -56655,6 +56692,9 @@ /area/station/security/prison/cell_block/a) "hix" = ( /obj/structure/closet/emcloset, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 6 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "hiC" = ( @@ -59476,6 +59516,9 @@ /area/station/medical/morgue) "ipZ" = ( /obj/machinery/economy/vending/cigarette, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 1 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "iqf" = ( @@ -59709,15 +59752,6 @@ /obj/effect/turf_decal/tiles/department/command/corner, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central) -"ivr" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/plasteel/dark, -/area/station/command/bridge) "ivB" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -61766,6 +61800,14 @@ }, /turf/space, /area/space/nearstation) +"jjZ" = ( +/obj/item/kirbyplants/large, +/obj/machinery/light/small, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 6 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "jkb" = ( /obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, @@ -62365,6 +62407,13 @@ "jwZ" = ( /turf/simulated/wall, /area/station/public/storage/emergency/port) +"jxh" = ( +/obj/structure/closet/firecloset, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 9 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "jxZ" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -63955,6 +64004,10 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/station/maintenance/fore) +"khx" = ( +/obj/machinery/hologram/holopad, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "khF" = ( /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance, @@ -65390,11 +65443,6 @@ /obj/effect/turf_decal/tiles/neutral, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/east) -"kLs" = ( -/obj/machinery/light, -/obj/effect/turf_decal/tiles/department/command/side, -/turf/simulated/floor/plasteel/dark, -/area/station/command/bridge) "kLU" = ( /obj/structure/girder, /obj/effect/turf_decal/tiles/neutral/side, @@ -66866,6 +66914,13 @@ /obj/effect/turf_decal/tiles/department/security, /turf/simulated/floor/plasteel, /area/station/security/processing) +"lqs" = ( +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 10 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "lqB" = ( /obj/structure/cable{ icon_state = "4-8" @@ -68523,6 +68578,13 @@ /area/station/maintenance/fore) "mbO" = ( /obj/machinery/economy/vending/coffee, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 9 + }, +/obj/item/radio/intercom{ + name = "west bump"; + pixel_x = -28 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "mbY" = ( @@ -70372,6 +70434,9 @@ dir = 4 }, /obj/structure/flora/grass/jungle, +/obj/item/flag/nt{ + layer = 3.4 + }, /turf/simulated/floor/grass/jungle/no_creep, /area/station/command/bridge) "mPF" = ( @@ -70405,6 +70470,19 @@ /obj/machinery/suit_storage_unit/industrial/engine/secure, /turf/simulated/floor/plasteel/dark, /area/station/engineering/secure_storage) +"mPV" = ( +/obj/item/kirbyplants/large, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/sign/command{ + pixel_y = 32 + }, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 5 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "mQb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/purple{ dir = 6 @@ -78895,8 +78973,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/light{ - dir = 1 +/obj/effect/turf_decal/tiles/department/security/corner{ + dir = 4 }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) @@ -80810,6 +80888,7 @@ }, /obj/structure/railing/corner, /obj/effect/turf_decal/tiles/department/command/side, +/obj/effect/turf_decal/siding, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "qVA" = ( @@ -80860,6 +80939,15 @@ /obj/effect/mapping_helpers/airlock/access/all/supply/cargo_bay, /turf/simulated/floor/plasteel, /area/station/supply/storage) +"qVL" = ( +/obj/effect/turf_decal/tiles/department/virology/corner{ + dir = 4 + }, +/obj/structure/chair/office{ + dir = 1 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "qWd" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -81553,6 +81641,15 @@ /obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plating, /area/station/hallway/secondary/entry/south) +"rhV" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tiles/department/science/corner{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "rhX" = ( /obj/machinery/economy/vending/snack, /obj/effect/turf_decal/delivery/hollow, @@ -81963,6 +82060,13 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/lounge) +"rpk" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/hologram/holopad, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "rpC" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -82051,6 +82155,13 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) +"rrY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/hologram/holopad, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "rrZ" = ( /obj/effect/turf_decal/tiles/white/corner, /turf/simulated/floor/plasteel, @@ -83369,6 +83480,9 @@ /obj/effect/turf_decal/woodsiding{ dir = 8 }, +/obj/item/flag/nt{ + layer = 3.4 + }, /turf/simulated/floor/grass/jungle/no_creep, /area/station/command/bridge) "rRU" = ( @@ -84444,6 +84558,21 @@ /obj/effect/turf_decal/tiles/department/security/checker, /turf/simulated/floor/plasteel, /area/station/medical/break_room) +"slA" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/turf_decal/tiles/department/cargo/corner{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "slI" = ( /obj/machinery/door/airlock/maintenance{ name = "Internal Medbay Maintenance"; @@ -85567,7 +85696,10 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central) "sHI" = ( -/obj/machinery/economy/vending/cola, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 1 + }, +/obj/machinery/economy/vending/snack, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "sHU" = ( @@ -90033,6 +90165,17 @@ }, /turf/simulated/floor/plasteel/white, /area/station/medical/virology) +"ulM" = ( +/obj/machinery/light_switch{ + dir = 1; + name = "south bump"; + pixel_y = -24 + }, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 6 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "uma" = ( /obj/structure/sign/radiation/rad_area, /turf/simulated/wall, @@ -90798,6 +90941,9 @@ /area/station/maintenance/fsmaint) "uCP" = ( /obj/structure/closet/firecloset, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 5 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "uCR" = ( @@ -92796,6 +92942,11 @@ /obj/item/assembly/mousetrap/armed, /turf/simulated/floor/plating, /area/station/maintenance/fore) +"vsb" = ( +/obj/effect/turf_decal/tiles/department/command/side, +/obj/machinery/light, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "vso" = ( /obj/structure/table/wood, /obj/machinery/light/small{ @@ -95573,7 +95724,17 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "wuE" = ( -/obj/machinery/economy/vending/snack, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 5 + }, +/obj/item/radio/intercom{ + name = "east bump"; + pixel_x = 28 + }, +/obj/item/flag/nt{ + layer = 3.4 + }, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "wuF" = ( @@ -96302,10 +96463,6 @@ /obj/effect/turf_decal/tiles/neutral/side, /turf/simulated/floor/plasteel, /area/station/maintenance/fore) -"wGL" = ( -/obj/machinery/newscaster/security_unit/directional/west, -/turf/simulated/floor/plasteel/dark, -/area/station/command/bridge) "wGO" = ( /obj/machinery/door/airlock/maintenance{ dir = 4 @@ -96745,6 +96902,21 @@ /obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel, /area/station/supply/sorting) +"wPM" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "wQh" = ( /obj/machinery/door/firedoor{ dir = 4 @@ -96958,6 +97130,19 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) +"wUw" = ( +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 5 + }, +/obj/item/flag/nt{ + layer = 3.4 + }, +/obj/machinery/power/apc/directional/north, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "wUC" = ( /obj/structure/cable, /obj/structure/cable{ @@ -137153,7 +137338,7 @@ bwf sHI bFP byU -kLs +bFy bHk bJc bKK @@ -138180,7 +138365,7 @@ abj koT bAx bCp -bAB +khx bFC bHk bJg @@ -138435,7 +138620,7 @@ aaa pTv quW bwf -aos +fGF qgd byU bFD @@ -138692,7 +138877,7 @@ aaa mBN bxm foU -wGL +byU bCl byU exz @@ -139462,7 +139647,7 @@ kgl abj bwf bxp -byU +qVL byU bCr bEe @@ -139988,7 +140173,7 @@ gnc rJQ pjv auI -eOI +rrY bFy ure cfK @@ -140233,7 +140418,7 @@ bKt aaa jQN bxs -byV +tZy byU bEb bEh @@ -140747,7 +140932,7 @@ bKt aaa mTy bxu -byT +rhV bAA bCu bHv @@ -141262,8 +141447,8 @@ aaa nWi bxw byY -ivr -bCv +byU +bCl aZe jDi cHe @@ -141518,9 +141703,9 @@ bKt aaa mSV quW -bwf +fTU bAC -bCl +fSR aZe nRs bWX @@ -141778,8 +141963,8 @@ abj vhW bAD bCw -aZe -bFN +rpk +bFy bWX bJj bLc @@ -142034,7 +142219,7 @@ abj aaa jQN bAE -bCx +slA aZe bFO bWX @@ -142293,7 +142478,7 @@ bwf aos bCy aZe -bFy +vsb bWX bJl bLa @@ -142550,7 +142735,7 @@ bwf mbO bCz bEm -kLs +bFy bWX bJm bLb @@ -143061,10 +143246,10 @@ aaa abj aaa bwf -bAt -bCl +wUw +wPM aZe -bFx +ulM bWX bJo bLd @@ -143575,10 +143760,10 @@ aaa abj aaa bwf -uCP +jxh bCl aZe -hix +lqs bHx bJq bLf @@ -143832,10 +144017,10 @@ pcY pcY pcY bwf -bAr +mPV bCl aZe -bFR +jjZ bHx bJr bLg diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm index 9b0c602dc27..15a89264843 100644 --- a/_maps/map_files/stations/emeraldstation.dmm +++ b/_maps/map_files/stations/emeraldstation.dmm @@ -73,11 +73,14 @@ /turf/simulated/floor/plasteel/white, /area/station/science/xenobiology) "abn" = ( -/obj/machinery/alarm/directional/south, -/obj/effect/turf_decal/tiles/department/medical/side{ +/obj/effect/turf_decal/tiles/department/command/side{ dir = 10 }, -/turf/simulated/floor/plasteel, +/obj/machinery/alarm/directional/west, +/obj/structure/closet/fireaxecabinet{ + pixel_y = -32 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "abt" = ( /obj/effect/decal/cleanable/dirt, @@ -608,6 +611,12 @@ }, /turf/simulated/floor/engine, /area/station/science/misc_lab) +"aje" = ( +/obj/effect/turf_decal/siding{ + dir = 1 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "ajf" = ( /obj/structure/cable{ icon_state = "4-8" @@ -1880,7 +1889,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "aua" = ( /obj/effect/spawner/window/reinforced/tinted, @@ -2958,22 +2967,14 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft2) "aGt" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/pen, /obj/structure/cable{ icon_state = "4-8" }, -/obj/item/storage/fancy/donut_box{ - pixel_y = -14 +/obj/machinery/computer/security{ + dir = 4 }, -/obj/effect/turf_decal/tiles/department/medical/side{ - dir = 8 - }, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/security, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "aGu" = ( /obj/machinery/firealarm/directional/west, @@ -4518,19 +4519,12 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "aXr" = ( -/obj/machinery/computer/crew, -/obj/machinery/light{ - dir = 1 - }, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/status_display{ - pixel_y = 32; - layer = 4 - }, -/obj/effect/turf_decal/tiles/department/medical/side, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/science, +/obj/machinery/computer/aifixer, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "aXu" = ( /obj/machinery/button/windowtint{ @@ -5710,18 +5704,11 @@ /turf/simulated/floor/plating, /area/station/service/theatre) "biX" = ( -/obj/structure/table/reinforced, -/obj/machinery/ai_status_display{ - pixel_x = -32; - step_size = 0 +/obj/machinery/computer/secure_data{ + dir = 4 }, -/obj/machinery/phone{ - pixel_y = 2 - }, -/obj/effect/turf_decal/tiles/department/medical/side{ - dir = 8 - }, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/security, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bja" = ( /obj/effect/mapping_helpers/turfs/burn, @@ -6758,16 +6745,16 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, /obj/structure/disposalpipe/segment/corner{ dir = 4 }, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "btn" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -7898,10 +7885,6 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/gravitygenerator) -"bDp" = ( -/obj/structure/window/reinforced, -/turf/simulated/floor/plasteel, -/area/station/command/bridge) "bDq" = ( /obj/effect/spawner/random/blood/maybe, /obj/item/shard/shark_teeth{ @@ -8380,8 +8363,8 @@ name = "south bump"; pixel_y = -28 }, -/obj/effect/turf_decal/tiles/department/medical/side, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/command/side, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bHJ" = ( /obj/effect/decal/cleanable/dirt, @@ -8535,20 +8518,17 @@ /turf/simulated/floor/engine, /area/station/maintenance/incinerator) "bJc" = ( -/obj/machinery/computer/monitor{ - name = "Bridge Power Monitoring Computer" +/obj/machinery/computer/card, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tiles/department/virology, +/obj/machinery/status_display{ + pixel_y = 32; + layer = 4 }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = 30; - layer = 3.5 +/obj/effect/turf_decal/siding{ + dir = 4 }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/effect/turf_decal/tiles/department/engineering/side{ - dir = 6 - }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bJl" = ( /obj/structure/cable{ @@ -9034,8 +9014,7 @@ /area/station/hallway/secondary/exit) "bNT" = ( /obj/item/kirbyplants/large, -/obj/structure/sign/poster/official/random/directional/south, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bOc" = ( /obj/effect/spawner/window/reinforced/grilled, @@ -9546,12 +9525,9 @@ /turf/simulated/floor/plasteel, /area/station/security/prison/cell_block) "bSz" = ( -/obj/structure/closet/fireaxecabinet{ - pixel_y = -32 - }, /obj/machinery/economy/vending/cola, -/obj/effect/turf_decal/tiles/department/medical/side, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/command/side, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bSC" = ( /obj/effect/decal/cleanable/generic, @@ -10913,7 +10889,7 @@ }, /obj/structure/table/reinforced, /obj/item/flashlight/lamp, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "cfZ" = ( /obj/structure/cable{ @@ -11329,10 +11305,10 @@ /obj/structure/chair/sofa/right{ dir = 4 }, -/obj/effect/turf_decal/tiles/department/medical/side{ +/obj/effect/turf_decal/tiles/department/command/side{ dir = 10 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "cln" = ( /obj/effect/spawner/random/fungus/maybe, @@ -12126,10 +12102,10 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/effect/turf_decal/tiles/department/medical/side{ +/obj/effect/turf_decal/tiles/department/command/side{ dir = 6 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "cuv" = ( /obj/machinery/door/airlock/maintenance{ @@ -12880,6 +12856,15 @@ /obj/item/crowbar/engineering, /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) +"cCk" = ( +/obj/effect/turf_decal/tiles/department/command/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "cCl" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 1 @@ -13219,11 +13204,9 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/sw) "cFW" = ( -/obj/machinery/computer/med_data, -/obj/effect/turf_decal/tiles/department/medical/side{ - dir = 6 - }, -/turf/simulated/floor/plasteel, +/obj/structure/table/reinforced, +/obj/item/storage/fancy/donut_box, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "cGc" = ( /obj/structure/chair{ @@ -13623,16 +13606,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable{ icon_state = "1-8" }, /obj/structure/cable{ icon_state = "2-8" }, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "cIH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -15327,15 +15308,17 @@ /turf/simulated/floor/plasteel, /area/station/service/janitor) "dcb" = ( -/obj/machinery/computer/card, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = 30; - layer = 3.5 +/obj/effect/turf_decal/tiles/department/science, +/obj/machinery/computer/rnd_backup/station, +/obj/item/disk/rnd_backup_disk, +/obj/machinery/status_display{ + pixel_y = 32; + layer = 4 }, -/obj/effect/turf_decal/tiles/department/medical/side{ - dir = 10 +/obj/effect/turf_decal/siding{ + dir = 8 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "dcc" = ( /obj/effect/spawner/window/reinforced/grilled, @@ -17867,21 +17850,6 @@ /obj/effect/turf_decal/tiles/department/engineering/corner, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) -"dBW" = ( -/obj/structure/cable{ - 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 - }, -/turf/simulated/floor/plasteel, -/area/station/command/bridge) "dCg" = ( /obj/machinery/door/airlock/command/glass, /obj/machinery/door/poddoor/preopen{ @@ -17891,7 +17859,7 @@ /obj/effect/mapping_helpers/airlock/access/any/command/general, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/autoname, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "dCm" = ( /obj/structure/table/reinforced, @@ -18008,10 +17976,10 @@ /area/station/science/research) "dDk" = ( /obj/structure/table/glass, -/obj/effect/turf_decal/tiles/department/medical/side{ +/obj/effect/turf_decal/tiles/department/command/side{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "dDm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -21851,13 +21819,16 @@ /turf/simulated/wall/r_wall, /area/station/maintenance/abandonedservers) "eto" = ( -/obj/structure/chair/office/dark{ - dir = 1 - }, /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/virology/corner{ + dir = 1 + }, +/obj/structure/chair/office{ + dir = 1 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "ety" = ( /obj/machinery/status_display{ @@ -23372,11 +23343,13 @@ /turf/simulated/floor/plasteel, /area/station/engineering/break_room/secondary) "eHF" = ( -/obj/machinery/computer/prisoner, -/obj/effect/turf_decal/tiles/department/security/side{ - dir = 10 +/obj/structure/table/reinforced, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high, +/obj/machinery/light{ + dir = 1 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "eHO" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -23941,9 +23914,8 @@ /area/station/engineering/break_room) "eOt" = ( /obj/machinery/economy/vending/cigarette, -/obj/machinery/firealarm/directional/south, -/obj/effect/turf_decal/tiles/department/medical/side, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/command/side, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "eOw" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -24197,18 +24169,13 @@ /turf/simulated/floor/grass, /area/station/security/permabrig) "eQY" = ( -/obj/machinery/power/apc/critical/directional/south, /obj/structure/cable, -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24; - pixel_y = -5 - }, -/obj/effect/turf_decal/tiles/department/medical/side{ +/obj/effect/turf_decal/tiles/department/command/side{ dir = 6 }, -/turf/simulated/floor/plasteel, +/obj/machinery/power/apc/critical/directional/east, +/obj/machinery/firealarm/directional/south, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "eRa" = ( /obj/effect/turf_decal/tiles/department/science/side, @@ -24458,11 +24425,11 @@ /turf/simulated/floor/plasteel, /area/station/public/dorms) "eUq" = ( -/obj/machinery/computer/shuttle/mining, -/obj/effect/turf_decal/tiles/department/virology/side{ - dir = 6 +/obj/structure/filingcabinet/filingcabinet, +/obj/machinery/light{ + dir = 1 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "eUr" = ( /obj/structure/transit_tube/curved/flipped, @@ -24844,13 +24811,13 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "eXJ" = ( /obj/machinery/power/apc/directional/north, @@ -25029,6 +24996,21 @@ /obj/effect/turf_decal/tiles/department/virology/side, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/garden) +"eZj" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 5 + }, +/obj/effect/turf_decal/siding{ + dir = 5 + }, +/obj/item/flag/nt{ + layer = 3.4 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "eZl" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/machinery/door/poddoor/preopen{ @@ -25533,15 +25515,10 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel/fakestairs/center, /area/station/command/bridge) "fdZ" = ( /obj/structure/disposalpipe/segment{ @@ -26443,8 +26420,11 @@ dir = 8 }, /obj/structure/table/reinforced, -/obj/item/radio/intercom/command, -/turf/simulated/floor/plasteel, +/obj/machinery/computer/security/wooden_tv{ + pixel_x = 2; + pixel_y = 2 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "fmR" = ( /obj/structure/chair{ @@ -28829,11 +28809,10 @@ /area/station/maintenance/abandoned_garden) "fIW" = ( /obj/item/kirbyplants/large, -/obj/structure/sign/poster/official/random/directional/south, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "fIY" = ( /obj/structure/closet, @@ -28868,7 +28847,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "fJA" = ( /obj/structure/cable{ @@ -29344,10 +29324,10 @@ /area/station/maintenance/dorms/port) "fNz" = ( /obj/machinery/economy/vending/coffee, -/obj/effect/turf_decal/tiles/department/medical/side{ - dir = 4 +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 5 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "fNB" = ( /obj/structure/sign/public/arrivals{ @@ -30381,6 +30361,18 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/command/office/rd) +"fZX" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tiles/department/science/corner{ + dir = 4 + }, +/obj/structure/chair/office{ + dir = 1 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "fZY" = ( /obj/machinery/alarm/directional/west, /obj/machinery/disposal, @@ -32351,7 +32343,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "gtC" = ( /obj/machinery/door/window/reinforced/normal{ @@ -35407,6 +35399,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/wood, /area/station/security/permabrig) +"hbx" = ( +/obj/machinery/hologram/holopad, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "hbD" = ( /obj/effect/spawner/random/trash, /turf/simulated/floor/wood, @@ -36215,15 +36211,16 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/warden) "hjs" = ( -/obj/machinery/light{ - dir = 1 - }, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/computer/supplycomp, -/obj/effect/turf_decal/tiles/department/virology/side, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/medical, +/obj/machinery/computer/med_data, +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_y = 30; + layer = 3.5 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "hju" = ( /obj/structure/table, @@ -36276,7 +36273,7 @@ }, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/autoname, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "hjA" = ( /obj/effect/decal/cleanable/dirt, @@ -36364,7 +36361,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "hky" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -38265,10 +38262,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tiles/department/medical/side{ - dir = 4 - }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "hCd" = ( /obj/structure/rack, @@ -38561,6 +38555,12 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) +"hEU" = ( +/obj/structure/railing/cap/normal{ + dir = 1 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "hEW" = ( /turf/simulated/wall/r_wall, /area/station/maintenance/storage) @@ -38801,15 +38801,16 @@ /turf/simulated/floor/plasteel/dark, /area/station/security/storage) "hHh" = ( -/obj/machinery/computer/security, -/obj/machinery/light{ - dir = 1 - }, /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/tiles/department/security/side, -/turf/simulated/floor/plasteel, +/obj/machinery/computer/atmos_alert, +/obj/effect/turf_decal/tiles/department/engineering, +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_y = 30; + layer = 3.5 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "hHm" = ( /turf/simulated/floor/plasteel{ @@ -40407,7 +40408,7 @@ /obj/structure/cable{ icon_state = "1-4" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "ibo" = ( /obj/effect/decal/cleanable/dirt, @@ -40692,10 +40693,10 @@ /obj/structure/chair/sofa/left{ dir = 4 }, -/obj/effect/turf_decal/tiles/department/medical/side{ +/obj/effect/turf_decal/tiles/department/command/side{ dir = 8 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "ieL" = ( /obj/structure/table/wood, @@ -41143,6 +41144,18 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/station/engineering/control) +"iiE" = ( +/obj/effect/turf_decal/tiles/department/medical/corner{ + dir = 1 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) +"iiT" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel/fakestairs/center, +/area/station/command/bridge) "iiU" = ( /obj/structure/chair{ dir = 1 @@ -41183,11 +41196,12 @@ /turf/simulated/floor/wood, /area/station/medical/psych) "ijj" = ( -/obj/item/radio/intercom{ +/obj/machinery/light_switch{ + dir = 1; name = "south bump"; - pixel_y = -28 + pixel_y = -24 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "ijk" = ( /obj/machinery/teleport/hub, @@ -41458,11 +41472,11 @@ /turf/simulated/floor/plasteel, /area/station/medical/break_room) "imd" = ( -/obj/machinery/computer/atmos_alert, -/obj/effect/turf_decal/tiles/department/engineering/side{ - dir = 10 +/obj/structure/table/reinforced, +/obj/machinery/recharger{ + pixel_y = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "imp" = ( /obj/structure/cable{ @@ -42076,8 +42090,8 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/effect/turf_decal/tiles/department/medical/side, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/command/side, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "isR" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -43087,14 +43101,6 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/security/permabrig) -"iCG" = ( -/obj/machinery/keycard_auth{ - pixel_x = -24; - pixel_y = 16 - }, -/obj/item/beacon, -/turf/simulated/floor/plasteel, -/area/station/command/bridge) "iCN" = ( /obj/structure/table, /obj/effect/spawner/random/maintenance, @@ -43285,7 +43291,7 @@ /obj/structure/disposalpipe/segment/corner{ dir = 1 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "iET" = ( /turf/simulated/floor/plating, @@ -43407,7 +43413,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "iFX" = ( /obj/structure/closet/emcloset, @@ -44053,16 +44059,25 @@ /turf/simulated/floor/plating, /area/station/maintenance/dorms/port) "iMm" = ( -/obj/structure/rack, -/obj/item/megaphone, -/obj/item/megaphone{ - pixel_y = -3; - pixel_x = -3 +/obj/structure/shelf/command, +/obj/item/aicard, +/obj/item/storage/secure/briefcase, +/obj/item/storage/box/ids{ + pixel_x = -2 }, -/obj/effect/turf_decal/tiles/department/medical/side{ +/obj/item/storage/box/pdas{ + pixel_x = -2; + pixel_y = 8 + }, +/obj/item/megaphone{ + pixel_x = 5; + pixel_y = 7 + }, +/obj/item/taperecorder, +/obj/effect/turf_decal/tiles/department/command/side{ dir = 10 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "iMn" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -45081,15 +45096,12 @@ /turf/space, /area/space/nearstation) "iWo" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Bridge Entrance"; dir = 5 }, /obj/machinery/firealarm/directional/west, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/fakestairs/left, /area/station/command/bridge) "iWA" = ( /obj/structure/disposalpipe/segment{ @@ -45447,7 +45459,10 @@ /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) "iZT" = ( -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "iZV" = ( /obj/structure/table, @@ -46475,7 +46490,7 @@ /obj/structure/disposalpipe/segment/corner{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "jlw" = ( /obj/machinery/status_display, @@ -46622,7 +46637,7 @@ pixel_y = 7; req_access = list(19) }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "jnb" = ( /obj/effect/decal/cleanable/dirt, @@ -46715,16 +46730,6 @@ }, /turf/simulated/floor/carpet, /area/station/command/office/hos) -"jnw" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/station/command/bridge) "jnC" = ( /turf/simulated/wall, /area/station/science/break_room) @@ -47094,10 +47099,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/effect/turf_decal/tiles/department/medical/corner{ +/obj/effect/turf_decal/tiles/department/command/corner{ dir = 8 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "jsU" = ( /obj/structure/disposalpipe/segment, @@ -47445,16 +47450,19 @@ /turf/simulated/wall, /area/station/maintenance/assembly_line) "jwF" = ( -/obj/structure/chair/office/dark{ - dir = 1 - }, /obj/structure/cable{ icon_state = "1-2" }, /obj/structure/cable{ icon_state = "2-8" }, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/engineering/corner{ + dir = 1 + }, +/obj/structure/chair/office{ + dir = 1 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "jwH" = ( /obj/machinery/computer/security{ @@ -47534,7 +47542,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "jxO" = ( /obj/structure/chair/comfy/beige{ @@ -47736,10 +47745,10 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/sw) "jzI" = ( -/obj/structure/chair/office/dark{ +/obj/effect/turf_decal/tiles/department/security/corner{ dir = 8 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "jzK" = ( /obj/machinery/door/window/classic/reversed{ @@ -49516,7 +49525,10 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/security/corner{ + dir = 1 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "jQN" = ( /obj/item/kirbyplants/large, @@ -49844,7 +49856,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "jTL" = ( /obj/machinery/door/airlock/maintenance{ @@ -49987,7 +49999,10 @@ dir = 10 }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/command/corner{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "jVr" = ( /obj/structure/window/reinforced, @@ -49995,11 +50010,19 @@ dir = 4 }, /obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 +/obj/item/folder/blue{ + pixel_x = 5; + pixel_y = 1 }, -/turf/simulated/floor/plasteel, +/obj/item/paper_bin/nanotrasen{ + pixel_x = -6; + pixel_y = 2 + }, +/obj/item/pen/multi/fountain{ + pixel_x = -7; + pixel_y = 4 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "jVF" = ( /obj/effect/turf_decal/stripes/line, @@ -51479,16 +51502,6 @@ icon_state = "cult" }, /area/station/service/library) -"kls" = ( -/obj/machinery/door/window/reinforced/reversed{ - name = "Captains seat" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/mapping_helpers/airlock/windoor/access/all/command/general, -/turf/simulated/floor/plasteel, -/area/station/command/bridge) "klt" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "BrigLeft"; @@ -53172,6 +53185,18 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/aisat/atmos) +"kCG" = ( +/obj/effect/turf_decal/tiles/department/science/corner{ + dir = 1 + }, +/obj/effect/turf_decal/tiles/department/command/corner{ + dir = 8 + }, +/obj/effect/turf_decal/siding{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "kCH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -54926,6 +54951,16 @@ /obj/item/storage/toolbox/emergency, /turf/simulated/floor/plating, /area/station/maintenance/starboard) +"kVx" = ( +/obj/effect/turf_decal/tiles/department/virology/corner{ + dir = 4 + }, +/obj/effect/turf_decal/tiles/department/command/corner, +/obj/effect/turf_decal/siding{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "kVH" = ( /obj/machinery/light/small{ dir = 8 @@ -55199,7 +55234,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "kZq" = ( /obj/effect/spawner/random/blood/maybe, @@ -55812,18 +55847,12 @@ /turf/simulated/floor/plasteel, /area/station/security/checkpoint/secondary) "lgu" = ( -/obj/machinery/computer/shuttle/labor, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = 30; - layer = 3.5 - }, /obj/machinery/camera{ c_tag = "Bridge East" }, -/obj/effect/turf_decal/tiles/department/virology/side{ - dir = 10 - }, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/medical, +/obj/machinery/computer/crew, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "lgz" = ( /obj/structure/table/wood, @@ -56514,8 +56543,11 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/hologram/holopad, -/turf/simulated/floor/plasteel, +/obj/item/beacon, +/obj/effect/turf_decal/siding{ + dir = 1 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "loM" = ( /obj/effect/turf_decal/stripes/line{ @@ -56898,7 +56930,7 @@ /obj/effect/mapping_helpers/airlock/access/any/command/general, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/autoname, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "lsf" = ( /obj/machinery/door/poddoor/shutters/preopen{ @@ -57629,11 +57661,8 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/fakestairs/right, /area/station/command/bridge) "lyX" = ( /obj/structure/table/wood, @@ -57988,7 +58017,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "lBU" = ( /obj/machinery/atmospherics/binary/valve/digital{ @@ -58302,10 +58331,11 @@ /obj/structure/disposalpipe/segment/corner{ dir = 2 }, -/obj/effect/turf_decal/tiles/department/science/corner{ - dir = 4 +/obj/effect/turf_decal/tiles/department/cargo, +/obj/machinery/computer/security/mining{ + dir = 8 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "lGc" = ( /obj/item/paper, @@ -58391,15 +58421,30 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) +"lHs" = ( +/obj/effect/turf_decal/tiles/department/command/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "lHB" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 8 }, /obj/structure/table/reinforced, -/obj/item/folder/blue, -/obj/item/pen, -/turf/simulated/floor/plasteel, +/obj/item/multitool/command{ + pixel_x = 8; + pixel_y = 4 + }, +/obj/item/book/manual/wiki/sop_command{ + pixel_x = -3; + pixel_y = 5 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "lHF" = ( /obj/structure/table/reinforced, @@ -58552,6 +58597,16 @@ /obj/effect/turf_decal/tiles/dark/corner, /turf/simulated/floor/plasteel, /area/station/engineering/control) +"lJF" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/light/floor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "lJN" = ( /obj/structure/cable{ icon_state = "4-8" @@ -58814,19 +58869,13 @@ /turf/simulated/wall, /area/station/service/clown) "lMG" = ( -/obj/machinery/computer/secure_data, /obj/machinery/camera{ c_tag = "Bridge West"; dir = 6 }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = 30; - layer = 3.5 - }, -/obj/effect/turf_decal/tiles/department/security/side{ - dir = 6 - }, -/turf/simulated/floor/plasteel, +/obj/machinery/computer/station_alert, +/obj/effect/turf_decal/tiles/department/engineering, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "lMN" = ( /obj/structure/sign/poster/official/state_laws/directional/north, @@ -59647,6 +59696,9 @@ /obj/effect/turf_decal/tiles/department/medical, /turf/simulated/floor/plasteel/white, /area/station/medical/reception) +"lWl" = ( +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "lWz" = ( /turf/simulated/wall/r_wall, /area/station/command/server) @@ -59708,8 +59760,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/tiles/department/medical/side, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "lWY" = ( /obj/structure/closet/crate, @@ -59866,9 +59917,15 @@ dir = 4 }, /obj/structure/table/reinforced, -/obj/item/ashtray/bronze, -/obj/item/clothing/mask/cigarette/pipe, -/turf/simulated/floor/plasteel, +/obj/item/clothing/mask/cigarette/cigar, +/obj/item/storage/fancy/matches{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/clothing/mask/cigarette/pipe{ + pixel_y = 4 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "lYW" = ( /obj/structure/cable{ @@ -60904,22 +60961,12 @@ /turf/simulated/floor/plasteel, /area/station/service/hydroponics) "mld" = ( -/obj/machinery/computer/station_alert, -/obj/machinery/light{ - dir = 1 - }, /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/status_display{ - pixel_y = 32; - layer = 4 - }, -/obj/effect/turf_decal/tiles/department/engineering/side, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/virology, +/obj/machinery/photocopier, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "mlg" = ( /obj/structure/chair/comfy/black{ @@ -63708,7 +63755,7 @@ dir = 5 }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "mPs" = ( /turf/simulated/wall, @@ -64569,10 +64616,10 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/chair/comfy/brown{ +/obj/structure/chair/comfy/blue{ dir = 1 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "mWU" = ( /obj/machinery/camera{ @@ -65535,16 +65582,19 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "nhb" = ( -/obj/structure/chair/office/dark{ - dir = 1 - }, /obj/structure/cable{ icon_state = "1-2" }, /obj/structure/cable{ icon_state = "2-4" }, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/medical/corner{ + dir = 4 + }, +/obj/structure/chair/office{ + dir = 1 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "nhc" = ( /obj/structure/cable/extra_insulated{ @@ -65629,22 +65679,16 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/asmaint) "nhy" = ( -/obj/structure/table/reinforced, /obj/machinery/firealarm/directional/south, /obj/machinery/light_switch{ dir = 4; name = "west bump"; pixel_x = -24 }, -/obj/machinery/recharger{ - pixel_y = 4 - }, -/obj/item/restraints/handcuffs, -/obj/item/flash, -/obj/effect/turf_decal/tiles/department/medical/side{ +/obj/effect/turf_decal/tiles/department/command/side{ dir = 10 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "nhE" = ( /obj/machinery/economy/slot_machine, @@ -67547,7 +67591,7 @@ dir = 4 }, /obj/effect/mapping_helpers/airlock/autoname, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "nAc" = ( /obj/effect/decal/cleanable/dirt, @@ -68643,7 +68687,7 @@ /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "nKr" = ( /obj/structure/table/glass, @@ -68889,7 +68933,7 @@ initialize_directions = 11 }, /obj/structure/disposalpipe/junction/reversed, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "nMz" = ( /obj/machinery/door/airlock/multi_tile/glass{ @@ -72451,20 +72495,15 @@ /turf/simulated/floor/plasteel, /area/station/command/office/ce) "otW" = ( -/obj/structure/table/reinforced, /obj/machinery/light{ dir = 8 }, /obj/machinery/requests_console/directional/west, -/obj/item/storage/box/pdas{ - pixel_x = 4; - pixel_y = 4 +/obj/machinery/computer/prisoner{ + dir = 4 }, -/obj/item/storage/box/ids, -/obj/effect/turf_decal/tiles/department/medical/side{ - dir = 8 - }, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/security, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "otY" = ( /obj/machinery/alarm/directional/west, @@ -72518,7 +72557,7 @@ /obj/structure/disposalpipe/segment/corner{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "ouQ" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -72586,10 +72625,8 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/north) "owa" = ( -/obj/structure/table/reinforced, -/obj/item/storage/toolbox/emergency, -/obj/effect/turf_decal/tiles/department/medical/side, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/command/side, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "owe" = ( /obj/machinery/atmospherics/pipe/simple/visible{ @@ -72726,8 +72763,11 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "oyi" = ( -/obj/machinery/computer/security/wooden_tv, -/turf/simulated/floor/plasteel, +/obj/structure/table/reinforced, +/obj/machinery/phone{ + pixel_y = 2 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "oyk" = ( /obj/structure/sink/directional/west, @@ -74444,6 +74484,12 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/north) +"oPb" = ( +/obj/structure/chair/office{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "oPi" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash, @@ -74913,11 +74959,17 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/north) "oUd" = ( -/obj/structure/table/reinforced, -/obj/machinery/newscaster/security_unit/directional/east, +/obj/structure/shelf/command, +/obj/item/storage/firstaid/machine, /obj/item/storage/firstaid/regular, -/obj/effect/turf_decal/tiles/department/medical/side, -/turf/simulated/floor/plasteel, +/obj/item/storage/toolbox/mechanical, +/obj/item/assembly/signaler, +/obj/item/radio/off, +/obj/machinery/newscaster/security_unit/directional/east, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 6 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "oUj" = ( /obj/structure/chair/sofa/corp/left, @@ -76444,6 +76496,9 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/north) +"phG" = ( +/turf/simulated/floor/plasteel/fakestairs/right, +/area/station/command/bridge) "phI" = ( /obj/effect/spawner/random/cobweb/right/rare, /obj/effect/spawner/random/oil/maybe, @@ -77239,7 +77294,7 @@ }, /obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "pps" = ( /obj/machinery/light{ @@ -84231,7 +84286,7 @@ /area/station/supply/office) "qMp" = ( /obj/machinery/economy/vending/wallmed/directional/south, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "qMr" = ( /obj/structure/cable{ @@ -86825,6 +86880,12 @@ /obj/structure/cable, /turf/simulated/floor/plating, /area/station/security/prison/cell_block) +"rlc" = ( +/obj/structure/railing/cap/reversed{ + dir = 1 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "rld" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/oil/maybe, @@ -86959,7 +87020,10 @@ /area/station/maintenance/abandoned_garden) "rmr" = ( /obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "rmx" = ( /obj/structure/punji_sticks/spikes{ @@ -87112,18 +87176,14 @@ /turf/simulated/floor/carpet, /area/station/legal/courtroom) "rnI" = ( -/obj/machinery/ai_status_display{ - pixel_x = 32; - step_size = 0 - }, -/obj/machinery/computer/rnd_backup/station{ +/obj/effect/turf_decal/tiles/department/cargo, +/obj/machinery/computer/shuttle/mining{ dir = 8 }, -/obj/item/disk/rnd_backup_disk, -/obj/effect/turf_decal/tiles/department/science/side{ - dir = 4 +/obj/machinery/status_display/supply_display{ + pixel_x = 32 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "rnM" = ( /turf/simulated/floor/plasteel, @@ -89563,7 +89623,7 @@ dir = 8 }, /obj/machinery/hologram/holopad, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "rMq" = ( /obj/machinery/hologram/holopad, @@ -92266,10 +92326,10 @@ /obj/structure/table/glass, /obj/item/paper, /obj/item/pen/blue, -/obj/effect/turf_decal/tiles/department/medical/side{ +/obj/effect/turf_decal/tiles/department/command/side{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "sos" = ( /obj/effect/decal/cleanable/dirt, @@ -93854,6 +93914,12 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft) +"sER" = ( +/obj/effect/turf_decal/tiles/department/engineering/corner{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "sEY" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plating, @@ -93929,7 +93995,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "sFB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -95585,13 +95651,6 @@ /obj/effect/turf_decal/tiles/department/medical/side, /turf/simulated/floor/plasteel, /area/station/medical/storage) -"sXd" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/station/command/bridge) "sXg" = ( /obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, @@ -96991,10 +97050,10 @@ pixel_x = -32; step_size = 0 }, -/obj/effect/turf_decal/tiles/department/medical/side{ - dir = 8 +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 9 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "tkU" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ @@ -98227,6 +98286,16 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/se) +"twy" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/light/floor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "twC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -98352,6 +98421,21 @@ }, /turf/simulated/floor/plasteel, /area/station/maintenance/aft) +"txU" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/turf_decal/tiles/department/command/side{ + dir = 9 + }, +/obj/effect/turf_decal/siding{ + dir = 9 + }, +/obj/item/flag/nt{ + layer = 3.4 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "txY" = ( /obj/structure/sign/public/evac, /turf/simulated/wall, @@ -98821,7 +98905,7 @@ dir = 9 }, /obj/structure/disposalpipe/junction/reversed, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "tDz" = ( /obj/structure/rack, @@ -99426,7 +99510,10 @@ /obj/structure/disposalpipe/segment/corner{ dir = 4 }, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/command/corner{ + dir = 1 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "tKc" = ( /obj/machinery/door/airlock/security/glass{ @@ -100783,8 +100870,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/turf_decal/tiles/department/medical/side, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "tXG" = ( /obj/structure/kitchenspike, @@ -101404,15 +101490,14 @@ /turf/simulated/floor/plasteel, /area/station/public/dorms) "udi" = ( -/obj/structure/table/reinforced, -/obj/item/aicard, /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/turf_decal/tiles/department/science/side{ - dir = 4 +/obj/effect/turf_decal/tiles/department/cargo, +/obj/machinery/computer/supplycomp{ + dir = 8 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "udm" = ( /obj/machinery/door/airlock/security/glass{ @@ -102416,10 +102501,6 @@ /obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/starboard) -"uoG" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/plasteel, -/area/station/command/bridge) "uoN" = ( /obj/effect/turf_decal/tiles/department/medical/side{ dir = 10 @@ -105848,6 +105929,9 @@ /obj/effect/turf_decal/tiles/department/science/side, /turf/simulated/floor/plasteel, /area/station/science/break_room) +"uYt" = ( +/turf/simulated/floor/plasteel/fakestairs/left, +/area/station/command/bridge) "uYT" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 @@ -108056,6 +108140,10 @@ }, /turf/simulated/floor/plasteel, /area/station/service/hydroponics) +"vwh" = ( +/obj/machinery/ai_status_display, +/turf/simulated/wall/r_wall, +/area/station/command/bridge) "vwl" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tiles/department/chemistry, @@ -108598,8 +108686,14 @@ /area/station/command/office/blueshield) "vBw" = ( /obj/structure/table/reinforced, -/obj/item/multitool/command, -/turf/simulated/floor/plasteel, +/obj/machinery/keycard_auth{ + pixel_y = 3 + }, +/obj/item/ashtray/bronze{ + pixel_x = 9; + pixel_y = -5 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "vBP" = ( /obj/structure/table/reinforced, @@ -109756,9 +109850,6 @@ icon_state = "1-4" }, /obj/effect/mapping_helpers/airlock/access/any/command/general, -/obj/machinery/door/firedoor{ - dir = 4 - }, /obj/effect/mapping_helpers/airlock/polarized{ id = "conference" }, @@ -110068,8 +110159,8 @@ /obj/structure/disposalpipe/segment/corner{ dir = 8 }, -/obj/effect/turf_decal/tiles/department/medical/corner, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/command/corner, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "vPm" = ( /obj/machinery/atmospherics/trinary/filter/flipped{ @@ -110486,10 +110577,10 @@ /turf/simulated/floor/plating, /area/station/security/warden) "vTs" = ( -/obj/effect/turf_decal/tiles/department/medical/corner{ +/obj/effect/turf_decal/tiles/department/command/corner{ dir = 8 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "vTt" = ( /obj/structure/table, @@ -111616,11 +111707,13 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "wfi" = ( /obj/machinery/door/airlock/maintenance, @@ -112658,11 +112751,11 @@ /turf/simulated/floor/plasteel/dark, /area/station/medical/morgue) "wpP" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/plasteel, +/obj/effect/turf_decal/tiles/department/cargo/corner, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "wpU" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -113882,6 +113975,16 @@ }, /turf/simulated/floor/lava/plasma/fuming, /area/station/engineering/atmos/asteroid_core) +"wET" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "wEW" = ( /obj/structure/table/wood, /obj/item/reagent_containers/drinks/bottle/ale, @@ -114034,6 +114137,20 @@ /obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plasteel/dark, /area/station/security/prisonlockers) +"wGs" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "wGv" = ( /obj/structure/table, /obj/machinery/light/small, @@ -114152,7 +114269,7 @@ /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "wIB" = ( /obj/effect/spawner/airlock/w_to_e, @@ -114174,10 +114291,10 @@ /obj/structure/chair/sofa{ dir = 4 }, -/obj/effect/turf_decal/tiles/department/medical/side{ +/obj/effect/turf_decal/tiles/department/command/side{ dir = 8 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "wIU" = ( /obj/machinery/atmospherics/unary/tank/oxygen{ @@ -115087,6 +115204,12 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos/asteroid_filtering) +"wRN" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "wRQ" = ( /obj/structure/table, /obj/item/storage/box/cups, @@ -116745,6 +116868,15 @@ /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/aft2) +"xkN" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tiles/department/cargo/corner{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "xkR" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/machinery/door/poddoor/preopen{ @@ -118289,7 +118421,7 @@ /obj/structure/chair{ dir = 1 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "xzG" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -118734,14 +118866,16 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/structure/disposalpipe/segment/corner{ dir = 2 }, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "xEL" = ( /obj/item/grown/corncob, @@ -121655,10 +121789,10 @@ /obj/structure/table/glass, /obj/item/clothing/mask/cigarette/cigar, /obj/item/ashtray/bronze, -/obj/effect/turf_decal/tiles/department/medical/side{ +/obj/effect/turf_decal/tiles/department/command/side{ dir = 8 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "ykK" = ( /obj/machinery/camera{ @@ -151658,7 +151792,7 @@ aZS eAn eHF jQM -iZT +wRN jzI vTs iMm @@ -151915,7 +152049,7 @@ aZS bRA hHh jwF -jxN +lWW hkw ibk tXF @@ -152171,9 +152305,9 @@ aZS huB xfe lMG -iZT -iZT -iZT +sER +lWl +lWl jTy bHH kSn @@ -152427,10 +152561,10 @@ jnP aZS eAn imd -iZT -iZT -iZT -uoG +lWl +lWl +hbx +lWl wfe bSz kSn @@ -152685,7 +152819,7 @@ aZS bRA mld eto -jxN +lJF jxN jxN eXG @@ -152941,10 +153075,10 @@ aZS huB xfe bJc -iZT -iZT -iZT -iZT +kVx +lHs +lWl +lWl nKf jTy qMp @@ -153199,10 +153333,10 @@ eAn cfW fmQ lHB -iZT -iZT +eZj +hEU bNT -lef +vwh lrY dCg lef @@ -153454,10 +153588,10 @@ aZS jnP eAn vBw -iCG -bDp -iZT -iZT +lWl +lWl +uYt +aje xzF jOx jTy @@ -153712,13 +153846,13 @@ jnP bMD iFR mWS -kls -jxN +lWW +iiT loL ouP ukI lBP -sFz +wGs fdQ rMp gdX @@ -153968,10 +154102,10 @@ aZS jnP rhx oyi -iZT -bDp -iZT -iZT +lWl +lWl +phG +aje kZo wnz jlu @@ -154227,10 +154361,10 @@ rhx lYJ jmZ jVr -iZT -iZT +txU +rlc fIW -lef +vwh hjz dCg lef @@ -154483,12 +154617,12 @@ aZS xfe huB dcb -iZT -iZT -iZT +kCG +cCk +lWl atZ wIk -dBW +hBP ijj gyd gyd @@ -154740,8 +154874,8 @@ jnP aZS bMD aXr -eto -jxN +fZX +twy jxN fJx btl @@ -154997,11 +155131,11 @@ jnP aZS rhx cFW -iZT -iZT -iZT +lWl +lWl +hbx atZ -dBW +hBP eOt ptA ptA @@ -155255,9 +155389,9 @@ aZS xfe huB lgu -iZT -iZT -sXd +iiE +lWl +atZ xEC isJ igM @@ -155513,8 +155647,8 @@ aZS bMD hjs nhb -jxN -fJx +lWW +wET cIG lWW vMB @@ -155769,10 +155903,10 @@ jnP aZS slH eUq -jQM -iZT +xkN +oPb wpP -jnw +jTy owa xjv pDh diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index d76b589502d..e2657d3619e 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -91,6 +91,11 @@ /area/space) "abb" = ( /obj/machinery/economy/vending/cigarette, +/obj/machinery/light_switch{ + dir = 4; + name = "west bump"; + pixel_x = -24 + }, /turf/simulated/floor/wood, /area/station/command/office/captain) "abf" = ( @@ -10046,10 +10051,8 @@ /turf/simulated/floor/plasteel/dark, /area/station/command/office/ce) "bop" = ( -/obj/machinery/computer/med_data, -/obj/effect/turf_decal/tiles/department/virology/side{ - dir = 1 - }, +/obj/machinery/computer/station_alert, +/obj/effect/turf_decal/tiles/department/engineering, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bou" = ( @@ -10082,21 +10085,18 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/computer/card, -/obj/effect/turf_decal/tiles/department/virology/side{ - dir = 9 - }, +/obj/effect/turf_decal/tiles/department/engineering, +/obj/machinery/computer/atmos_alert, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "boC" = ( -/obj/structure/chair/office/dark{ - dir = 8 +/obj/effect/turf_decal/tiles/department/engineering/corner{ + dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "boD" = ( -/obj/structure/chair/office/dark{ +/obj/structure/chair/office{ dir = 1 }, /turf/simulated/floor/plasteel/dark, @@ -10105,19 +10105,15 @@ /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "boF" = ( -/obj/structure/chair/office/dark{ - dir = 1 - }, /obj/structure/cable{ icon_state = "1-2" }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "boG" = ( -/obj/structure/chair/office/dark{ - dir = 4 +/obj/effect/turf_decal/tiles/department/medical/corner{ + dir = 1 }, -/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "boH" = ( @@ -10338,10 +10334,8 @@ /turf/simulated/floor/plasteel/dark, /area/station/procedure/trainer_office) "bpV" = ( -/obj/machinery/computer/crew, -/obj/effect/turf_decal/tiles/department/virology/side{ - dir = 1 - }, +/obj/effect/turf_decal/tiles/department/virology, +/obj/machinery/photocopier, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bpY" = ( @@ -10349,16 +10343,11 @@ layer = 4; pixel_y = 32 }, -/obj/item/folder/yellow{ - pixel_y = 4 - }, /obj/machinery/camera{ c_tag = "Bridge - Central" }, -/obj/structure/table/glass, -/obj/effect/turf_decal/tiles/department/cargo/side{ - dir = 1 - }, +/obj/machinery/computer/card, +/obj/effect/turf_decal/tiles/department/virology, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bqb" = ( @@ -10373,12 +10362,11 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/computer/monitor{ - name = "Bridge Power Monitoring Console" - }, -/obj/effect/turf_decal/tiles/department/cargo/side{ - dir = 1 +/obj/structure/table/glass/reinforced, +/obj/machinery/phone{ + pixel_y = 4 }, +/obj/effect/turf_decal/tiles/department/command, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bqe" = ( @@ -10386,48 +10374,44 @@ /turf/simulated/floor/plating, /area/station/maintenance/maintcentral) "bqf" = ( -/obj/machinery/computer/station_alert, -/obj/effect/turf_decal/tiles/department/cargo/side{ - dir = 1 +/obj/structure/table/glass/reinforced, +/obj/machinery/keycard_auth{ + pixel_y = 3 }, +/obj/effect/turf_decal/tiles/department/command, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bqg" = ( /obj/machinery/ai_status_display{ pixel_y = 32 }, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -1; - pixel_y = 4 - }, -/obj/structure/table/glass, -/obj/effect/turf_decal/tiles/department/cargo/side{ - dir = 1 - }, +/obj/effect/turf_decal/tiles/department/science, +/obj/machinery/computer/rnd_backup/station, +/obj/item/disk/rnd_backup_disk, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bqh" = ( -/obj/machinery/computer/atmos_alert, -/obj/effect/turf_decal/tiles/department/cargo/side{ - dir = 1 +/obj/structure/table/glass/reinforced, +/obj/effect/turf_decal/tiles/department/command, +/obj/machinery/door_control{ + id = "bridge blast"; + name = "Bridge Access Blast Door Control"; + pixel_y = 2; + req_access = list(19) }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bqj" = ( -/obj/machinery/computer/secure_data, -/obj/effect/turf_decal/tiles/department/security/side{ - dir = 1 - }, +/obj/effect/turf_decal/tiles/department/medical, +/obj/machinery/computer/crew, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bql" = ( /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/computer/prisoner, -/obj/effect/turf_decal/tiles/department/security/side{ - dir = 5 - }, +/obj/effect/turf_decal/tiles/department/medical, +/obj/machinery/computer/med_data, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bqn" = ( @@ -10733,39 +10717,26 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "bsb" = ( -/obj/machinery/light{ - dir = 8 - }, /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/table/glass, -/obj/item/storage/firstaid/regular{ - pixel_x = 3; - pixel_y = 3 +/obj/effect/turf_decal/tiles/department/engineering/corner{ + dir = 1 }, -/obj/effect/turf_decal/tiles/department/virology/side{ - dir = 8 +/obj/structure/chair/office{ + dir = 1 }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bsc" = ( -/obj/item/folder/red{ - pixel_y = 3 - }, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/light{ +/obj/effect/turf_decal/tiles/department/medical/corner{ dir = 4 }, -/obj/structure/table/glass, -/obj/item/folder/red{ - pixel_y = 3 - }, -/obj/item/folder/white, -/obj/effect/turf_decal/tiles/department/security/side{ - dir = 4 +/obj/structure/chair/office{ + dir = 1 }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) @@ -10996,7 +10967,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/effect/turf_decal/tiles/department/command/side, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "btR" = ( @@ -11007,7 +10977,6 @@ /turf/simulated/floor/plasteel, /area/station/engineering/engine_foyer) "btT" = ( -/obj/structure/table/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -11020,47 +10989,46 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/phone{ - pixel_y = 2 - }, -/obj/effect/turf_decal/tiles/department/virology/corner{ - dir = 1 - }, +/obj/machinery/computer/security, +/obj/effect/turf_decal/tiles/department/security, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "btU" = ( /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/recharger, -/obj/item/restraints/handcuffs, /obj/structure/table/glass, -/turf/simulated/floor/plasteel/dark, +/obj/item/storage/fancy/matches, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/carpet/black, /area/station/command/bridge) "btV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/computer/communications, -/turf/simulated/floor/plasteel/dark, -/area/station/command/bridge) -"btW" = ( +/obj/structure/railing{ + dir = 8 + }, /obj/structure/table/glass, /obj/machinery/computer/security/wooden_tv{ - pixel_x = 1; - pixel_y = 6 + pixel_x = 2; + pixel_y = 3 }, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/carpet/black, +/area/station/command/bridge) +"btW" = ( +/obj/machinery/computer/communications, +/turf/simulated/floor/carpet/black, /area/station/command/bridge) "btX" = ( /obj/structure/window/reinforced{ dir = 4 }, /obj/structure/table/glass, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 8 - }, -/turf/simulated/floor/plasteel/dark, +/obj/item/paper_bin/nanotrasen, +/obj/item/pen/multi/fountain, +/turf/simulated/floor/carpet/black, /area/station/command/bridge) "btY" = ( /obj/item/radio/intercom{ @@ -11076,20 +11044,11 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/turf_decal/tiles/department/command/side{ - dir = 1 - }, -/obj/machinery/computer/fission_monitor, +/obj/machinery/computer/secure_data, +/obj/effect/turf_decal/tiles/department/security, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "btZ" = ( -/obj/machinery/recharger{ - pixel_y = 3 - }, -/obj/item/restraints/handcuffs{ - pixel_y = 3 - }, -/obj/structure/table/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -11102,9 +11061,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/turf_decal/tiles/department/security/corner{ - dir = 4 - }, +/obj/effect/turf_decal/tiles/department/cargo, +/obj/machinery/computer/supplycomp, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bub" = ( @@ -11121,16 +11079,8 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/computer/rnd_backup/station, -/obj/item/disk/rnd_backup_disk, -/obj/effect/turf_decal/tiles/department/command/side{ - dir = 9 - }, -/turf/simulated/floor/plasteel/dark, -/area/station/command/bridge) -"buc" = ( -/obj/item/storage/fancy/donut_box, -/obj/structure/table/glass, +/obj/machinery/computer/prisoner, +/obj/effect/turf_decal/tiles/department/security, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bue" = ( @@ -11207,10 +11157,6 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "bum" = ( -/obj/machinery/keycard_auth{ - pixel_y = 24 - }, -/obj/machinery/computer/security/mining, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -11220,9 +11166,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/turf_decal/tiles/department/command/side{ - dir = 1 - }, +/obj/effect/turf_decal/tiles/department/cargo, +/obj/machinery/computer/shuttle/mining, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bun" = ( @@ -11248,8 +11193,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/tiles/department/command/side{ - dir = 8 +/obj/effect/turf_decal/tiles/department/security/corner{ + dir = 1 }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) @@ -11291,7 +11236,7 @@ id_tag = "bridge blast"; name = "Bridge Blast Doors" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bux" = ( /obj/effect/decal/cleanable/dirt, @@ -11347,16 +11292,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/machinery/computer/supplycomp, /obj/structure/cable{ icon_state = "1-8" }, /obj/structure/cable{ icon_state = "2-8" }, -/obj/effect/turf_decal/tiles/department/command/side{ - dir = 5 - }, +/obj/effect/turf_decal/tiles/department/cargo, +/obj/machinery/computer/security/mining, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "buH" = ( @@ -11551,9 +11494,6 @@ /turf/simulated/floor/wood, /area/station/command/office/hop) "bvr" = ( -/obj/structure/chair/office/dark{ - dir = 1 - }, /obj/structure/extinguisher_cabinet{ name = "east bump"; pixel_x = 27 @@ -11567,7 +11507,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/tiles/department/command/side{ +/obj/effect/turf_decal/tiles/department/cargo/corner{ dir = 4 }, /turf/simulated/floor/plasteel/dark, @@ -11784,35 +11724,34 @@ /obj/machinery/power/apc/important/directional/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/turf_decal/tiles/department/command/side{ - dir = 8 - }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bwh" = ( /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/cell_charger{ +/obj/structure/table/glass, +/obj/item/clothing/mask/cigarette/cigar, +/obj/item/clothing/mask/cigarette/pipe{ pixel_y = 4 }, -/obj/structure/table/glass, -/obj/item/stock_parts/cell/high{ - charge = 100; - maxcharge = 15000 +/obj/structure/railing/cap/normal{ + dir = 1 }, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/carpet/black, /area/station/command/bridge) "bwi" = ( /turf/simulated/floor/carpet, /area/station/command/bridge) "bwj" = ( -/obj/structure/chair/comfy/black{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/railing/cap/reversed{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/carpet, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/carpet/black, /area/station/command/bridge) "bwk" = ( /obj/structure/window/reinforced{ @@ -11828,7 +11767,7 @@ /obj/item/ashtray/bronze{ pixel_y = 11 }, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/carpet/black, /area/station/command/bridge) "bwl" = ( /obj/structure/sign/directions/engineering{ @@ -11850,19 +11789,19 @@ layer = 4; pixel_y = 32 }, -/obj/structure/displaycase/captain, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/item/radio/intercom/private{ - pixel_x = -28 - }, /obj/structure/cable{ icon_state = "2-4" }, +/obj/structure/table/wood, +/obj/item/storage/lockbox/medal{ + pixel_y = 5 + }, /turf/simulated/floor/wood, /area/station/command/office/captain) "bwp" = ( @@ -12282,12 +12221,19 @@ /turf/simulated/floor/wood, /area/station/command/office/hop) "byp" = ( -/obj/machinery/firealarm/directional/south, -/obj/structure/rack, -/obj/item/storage/secure/briefcase, -/obj/item/clothing/mask/cigarette/cigar, -/obj/effect/turf_decal/tiles/department/command/side{ - dir = 1 +/obj/effect/turf_decal/tiles/department/command/side, +/obj/structure/table/glass/reinforced, +/obj/machinery/cell_charger{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/stock_parts/cell/high{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/machinery/recharger{ + pixel_x = 8; + pixel_y = 4 }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) @@ -12306,7 +12252,7 @@ /obj/machinery/economy/vending/cola{ pixel_x = 2 }, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/carpet/black, /area/station/command/bridge) "bys" = ( /obj/machinery/door_control{ @@ -12327,19 +12273,14 @@ c_tag = "Bridge - Command Chair"; dir = 1 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/black, /area/station/command/bridge) "byt" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/carpet, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/carpet/black, /area/station/command/bridge) "byu" = ( /obj/machinery/pdapainter, @@ -12355,31 +12296,31 @@ /turf/simulated/floor/wood, /area/station/command/office/hop) "byw" = ( -/obj/structure/rack, +/obj/structure/shelf/command, /obj/item/aicard, -/obj/item/radio/off, -/obj/machinery/computer/security/telescreen/minisat{ - dir = 1; - pixel_y = -30 +/obj/item/storage/secure/briefcase, +/obj/item/storage/box/ids{ + pixel_x = -2 }, +/obj/item/storage/box/pdas{ + pixel_x = -2; + pixel_y = 8 + }, +/obj/item/megaphone{ + pixel_x = 5; + pixel_y = 7 + }, +/obj/item/taperecorder, /obj/effect/turf_decal/tiles/department/command/side{ - dir = 1 + dir = 6 }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "byx" = ( -/obj/item/storage/toolbox/emergency, -/obj/item/storage/toolbox/emergency{ - pixel_x = -2; - pixel_y = -3 - }, -/obj/item/wrench, /obj/machinery/newscaster/directional/south, -/obj/item/multitool/command, -/obj/structure/shelf/command, -/obj/effect/turf_decal/tiles/department/command/side{ - dir = 1 - }, +/obj/effect/turf_decal/tiles/department/command/side, +/obj/structure/table/glass/reinforced, +/obj/item/storage/fancy/donut_box, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "byy" = ( @@ -12387,29 +12328,22 @@ name = "south bump"; pixel_y = -28 }, -/obj/structure/rack, +/obj/structure/shelf/command, +/obj/item/storage/firstaid/machine, +/obj/item/storage/firstaid/regular, +/obj/item/storage/toolbox/mechanical, /obj/item/assembly/signaler, -/obj/item/assembly/signaler, -/obj/item/assembly/timer, /obj/effect/turf_decal/tiles/department/command/side{ - dir = 1 + dir = 10 }, +/obj/item/radio/off, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "byA" = ( /obj/structure/closet/fireaxecabinet{ pixel_y = -32 }, -/obj/item/paper_bin{ - pixel_x = -4; - pixel_y = 10 - }, -/obj/item/pen{ - pixel_y = 3 - }, -/obj/structure/table/glass, -/obj/machinery/firealarm/directional/east, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/wall/r_wall, /area/station/command/bridge) "byE" = ( /obj/structure/cable/extra_insulated{ @@ -12793,9 +12727,8 @@ name = "south bump"; pixel_y = -24 }, -/obj/effect/turf_decal/tiles/department/command/side{ - dir = 10 - }, +/obj/effect/turf_decal/tiles/department/command/side, +/obj/structure/filingcabinet/filingcabinet, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bAi" = ( @@ -13096,7 +13029,7 @@ /obj/machinery/economy/vending/snack{ pixel_x = -2 }, -/turf/simulated/floor/plasteel/dark, +/turf/simulated/floor/carpet/black, /area/station/command/bridge) "bBP" = ( /obj/structure/table/wood, @@ -13138,7 +13071,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/carpet/black, /area/station/command/bridge) "bBV" = ( /obj/machinery/disposal, @@ -13233,21 +13166,12 @@ "bCd" = ( /obj/structure/table/wood, /obj/structure/window/reinforced, -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24 - }, -/obj/item/storage/secure/briefcase{ - pixel_x = -2; - pixel_y = 4 - }, -/obj/item/storage/lockbox/medal, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-2" }, +/obj/item/melee/chainofcommand, /turf/simulated/floor/wood, /area/station/command/office/captain) "bCf" = ( @@ -13584,7 +13508,6 @@ /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bDz" = ( -/obj/machinery/hologram/holopad, /obj/machinery/status_display{ layer = 4; pixel_y = 32 @@ -13645,10 +13568,13 @@ /area/station/command/bridge) "bDX" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command{ +/obj/effect/mapping_helpers/airlock/access/all/command/general, +/obj/machinery/door/airlock/command/glass{ name = "Council Chamber" }, -/obj/effect/mapping_helpers/airlock/access/all/command/general, +/obj/effect/mapping_helpers/airlock/polarized{ + id = "council_chamber" + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bDY" = ( @@ -13657,9 +13583,7 @@ /area/station/command/bridge) "bDZ" = ( /obj/structure/chair/comfy/black, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet, /area/station/command/bridge) "bEb" = ( @@ -13925,11 +13849,17 @@ /obj/structure/chair/comfy/black{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/carpet, /area/station/command/bridge) "bFN" = ( /obj/structure/table/wood, /obj/item/folder/white, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/carpet, /area/station/command/bridge) "bFO" = ( @@ -13940,6 +13870,9 @@ pixel_x = -9; pixel_y = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/carpet, /area/station/command/bridge) "bFP" = ( @@ -15582,12 +15515,6 @@ }, /turf/simulated/floor/plasteel, /area/station/maintenance/disposal) -"bNS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/carpet, -/area/station/command/bridge) "bNU" = ( /obj/item/toy/plushie/nukeplushie, /obj/item/toy/syndicateballoon{ @@ -17146,9 +17073,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/tiles/department/command/side{ - dir = 6 - }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bWA" = ( @@ -17779,6 +17703,13 @@ "bZX" = ( /turf/simulated/wall, /area/station/supply/expedition) +"cai" = ( +/obj/machinery/power/apc/important/directional/west, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/simulated/floor/wood, +/area/station/command/office/captain) "caj" = ( /obj/structure/closet/crate/can, /obj/effect/spawner/random/maintenance, @@ -18191,9 +18122,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/tiles/department/command/side{ - dir = 4 - }, +/obj/machinery/firealarm/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "cca" = ( @@ -18736,10 +18665,8 @@ /turf/simulated/floor/plasteel/dark, /area/station/command/office/ce) "cfh" = ( -/obj/machinery/computer/security, -/obj/effect/turf_decal/tiles/department/security/side{ - dir = 1 - }, +/obj/effect/turf_decal/tiles/department/science, +/obj/machinery/computer/aifixer, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "cfq" = ( @@ -20957,9 +20884,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/turf_decal/tiles/department/command/side{ - dir = 10 - }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "cri" = ( @@ -29612,21 +29536,6 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/engineering/ai_transit_tube) -"dIq" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/sortjunction, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/effect/mapping_helpers/sortjunc_helper/captains_office, -/turf/simulated/floor/plasteel, -/area/station/hallway/primary/central/east) "dIG" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -32081,16 +31990,18 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/airlock/command{ - id_tag = "ntrepofficedoor"; - name = "NT Representative's Office"; - dir = 4 - }, /obj/effect/mapping_helpers/airlock/access/all/command/ntrep, /obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "1-4" }, +/obj/machinery/door/airlock/command/glass{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/polarized{ + id = "NT" + }, /turf/simulated/floor/wood, /area/station/command/office/ntrep) "exI" = ( @@ -34973,7 +34884,10 @@ /area/station/medical/coldroom) "fsZ" = ( /obj/effect/turf_decal/tiles/department/command/side{ - dir = 10 + dir = 8 + }, +/obj/item/flag/nt{ + layer = 3.4 }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) @@ -37948,6 +37862,7 @@ /obj/effect/turf_decal/tiles/department/command/corner{ dir = 8 }, +/obj/machinery/light/floor, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "gry" = ( @@ -38462,6 +38377,16 @@ }, /turf/simulated/floor/plasteel, /area/station/security/lobby) +"gBk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "gBl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -38973,7 +38898,6 @@ /turf/simulated/floor/plasteel/white, /area/station/service/break_room) "gIm" = ( -/obj/item/beacon, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, @@ -38986,7 +38910,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/hologram/holopad, +/obj/item/beacon, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "gIq" = ( @@ -42582,14 +42506,6 @@ /obj/structure/chair, /turf/simulated/floor/plasteel, /area/station/security/processing) -"hSa" = ( -/obj/machinery/door/window/reinforced/normal{ - name = "Command Desk" - }, -/obj/effect/mapping_helpers/airlock/windoor/access/all/command/general, -/obj/effect/turf_decal/tiles/department/command/side, -/turf/simulated/floor/plasteel/dark, -/area/station/command/bridge) "hSc" = ( /obj/effect/turf_decal/tiles/department/security/side{ dir = 4 @@ -43376,6 +43292,10 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel/dark, /area/station/engineering/atmos/control) +"igi" = ( +/obj/machinery/hologram/holopad, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "igm" = ( /obj/effect/turf_decal/tiles/department/security/corner, /turf/simulated/floor/plasteel, @@ -43434,6 +43354,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/station/science/robotics) +"ihk" = ( +/obj/effect/turf_decal/tiles/department/security/corner{ + dir = 4 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "ihn" = ( /obj/structure/cable{ icon_state = "4-8" @@ -46289,7 +46215,9 @@ id_tag = "council blast"; name = "Council Blast Doors" }, -/obj/effect/spawner/window/reinforced/grilled, +/obj/effect/spawner/window/reinforced/polarized/grilled{ + id = "council_chamber" + }, /turf/simulated/floor/plating, /area/station/command/bridge) "jby" = ( @@ -46897,6 +46825,13 @@ /obj/effect/turf_decal/tiles/neutral/corner, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/north) +"jne" = ( +/obj/effect/turf_decal/tiles/department/virology/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "jnk" = ( /obj/effect/turf_decal/tiles/department/medical/side{ dir = 4 @@ -47508,6 +47443,13 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/medical/virology) +"jyA" = ( +/obj/effect/turf_decal/tiles/department/science/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "jyL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, @@ -47585,13 +47527,6 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/lounge) -"jzW" = ( -/obj/structure/chair/comfy/beige, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/carpet, -/area/station/command/bridge) "jAh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -47700,6 +47635,16 @@ icon_state = "freezerfloor" }, /area/station/security/brig) +"jBJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "jBW" = ( /obj/effect/turf_decal/tiles/department/cargo/side{ dir = 1 @@ -56195,6 +56140,12 @@ "mhE" = ( /turf/simulated/floor/plating, /area/station/maintenance/fsmaint2) +"mhM" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/carpet/black, +/area/station/command/bridge) "mhS" = ( /obj/structure/sign/poster/official/random/directional/north, /turf/simulated/floor/plasteel{ @@ -57073,10 +57024,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "mAk" = ( @@ -57185,6 +57138,12 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/service/chapel/funeral) +"mCf" = ( +/obj/structure/chair/comfy/blue{ + dir = 1 + }, +/turf/simulated/floor/carpet/black, +/area/station/command/bridge) "mCu" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor, @@ -57301,10 +57260,6 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/break_room) -"mEq" = ( -/obj/machinery/light/floor, -/turf/simulated/floor/plasteel/dark, -/area/station/command/bridge) "mEu" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 9 @@ -57607,7 +57562,9 @@ id_tag = "council blast"; name = "Council Blast Doors" }, -/obj/effect/spawner/window/reinforced/grilled, +/obj/effect/spawner/window/reinforced/polarized/grilled{ + id = "council_chamber" + }, /turf/simulated/floor/plating, /area/station/command/bridge) "mJJ" = ( @@ -57962,6 +57919,11 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/medical/reception) +"mPH" = ( +/turf/simulated/floor/plasteel/fakestairs{ + dir = 1 + }, +/area/station/command/bridge) "mPK" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/extra_insulated{ @@ -58686,14 +58648,17 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/door/airlock/command{ - dir = 4 - }, /obj/effect/mapping_helpers/airlock/access/all/command/blueshield, /obj/effect/mapping_helpers/airlock/autoname, /obj/structure/cable{ icon_state = "1-4" }, +/obj/effect/mapping_helpers/airlock/polarized{ + id = "BS" + }, +/obj/machinery/door/airlock/command/glass{ + dir = 4 + }, /turf/simulated/floor/wood, /area/station/command/office/blueshield) "nbl" = ( @@ -59327,6 +59292,10 @@ }, /turf/simulated/floor/plasteel, /area/station/public/locker) +"nki" = ( +/obj/machinery/status_display/supply_display, +/turf/simulated/wall/r_wall, +/area/station/command/bridge) "nkm" = ( /obj/machinery/light/small{ dir = 1 @@ -60431,7 +60400,10 @@ /area/station/maintenance/electrical/fore_port) "nGj" = ( /obj/effect/turf_decal/tiles/department/command/side{ - dir = 6 + dir = 4 + }, +/obj/item/flag/nt{ + layer = 3.4 }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) @@ -64727,18 +64699,13 @@ /turf/simulated/floor/plasteel, /area/station/security/permabrig) "pcy" = ( -/obj/structure/table/wood, -/obj/item/book/manual/wiki/security_space_law, -/obj/item/coin/plasma, -/obj/item/melee/chainofcommand, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/power/apc/important/directional/west, /obj/structure/cable{ icon_state = "1-2" }, /obj/structure/cable{ - icon_state = "0-2" + icon_state = "2-8" }, /turf/simulated/floor/wood, /area/station/command/office/captain) @@ -65015,6 +64982,7 @@ /area/station/medical/exam_room) "phE" = ( /obj/effect/turf_decal/tiles/department/command/corner, +/obj/machinery/light/floor, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "pig" = ( @@ -65301,19 +65269,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/aft) -"pmZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/item/beacon, -/turf/simulated/floor/plasteel/dark, -/area/station/command/bridge) "pnB" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel, @@ -72737,6 +72692,15 @@ /obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) +"rKd" = ( +/obj/effect/turf_decal/tiles/department/science/corner{ + dir = 1 + }, +/obj/structure/chair/office{ + dir = 1 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "rKq" = ( /obj/effect/spawner/random/trash, /obj/effect/mapping_helpers/turfs/burn, @@ -72927,6 +72891,17 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/engimaint) +"rNg" = ( +/obj/structure/window/reinforced, +/obj/structure/table/wood, +/obj/item/storage/secure/briefcase{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/coin/plasma, +/turf/simulated/floor/wood, +/area/station/command/office/captain) "rNk" = ( /obj/structure/table, /obj/effect/spawner/random/food_trash, @@ -75020,7 +74995,9 @@ id_tag = "council blast"; name = "Council Blast Doors" }, -/obj/effect/spawner/window/reinforced/grilled, +/obj/effect/spawner/window/reinforced/polarized/grilled{ + id = "council_chamber" + }, /turf/simulated/floor/plating, /area/station/command/bridge) "sxV" = ( @@ -75289,6 +75266,12 @@ }, /turf/simulated/floor/plasteel, /area/station/maintenance/solar_maintenance/fore_port) +"sCo" = ( +/obj/effect/turf_decal/tiles/department/cargo/corner{ + dir = 1 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "sCE" = ( /turf/simulated/floor/plasteel, /area/station/science/robotics) @@ -75879,7 +75862,6 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/effect/turf_decal/tiles/department/command/side, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "sLD" = ( @@ -77072,10 +77054,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "teN" = ( @@ -77255,6 +77239,12 @@ /obj/machinery/light, /turf/simulated/floor/carpet/blue, /area/station/command/office/blueshield) +"tiT" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/carpet, +/area/station/command/bridge) "tjq" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -82283,12 +82273,6 @@ /obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/simulated/floor/engine, /area/station/engineering/engine/reactor) -"uRT" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/plasteel/dark, -/area/station/command/bridge) "uSc" = ( /obj/structure/closet/secure_closet/brig, /obj/effect/turf_decal/tiles/department/security/side{ @@ -82659,11 +82643,15 @@ name = "south bump"; pixel_y = -24 }, -/obj/structure/filingcabinet/chestdrawer{ - pixel_y = 3 +/obj/effect/turf_decal/tiles/department/command/side, +/obj/structure/table/glass/reinforced, +/obj/item/book/manual/wiki/sop_command{ + pixel_x = -6; + pixel_y = 5 }, -/obj/effect/turf_decal/tiles/department/command/side{ - dir = 6 +/obj/item/multitool/command{ + pixel_x = 8; + pixel_y = 4 }, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) @@ -83780,7 +83768,9 @@ id_tag = "council blast"; name = "Council Blast Doors" }, -/obj/effect/spawner/window/reinforced/grilled, +/obj/effect/spawner/window/reinforced/polarized/grilled{ + id = "council_chamber" + }, /turf/simulated/floor/plating, /area/station/command/bridge) "vrb" = ( @@ -84573,6 +84563,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "vBI" = ( @@ -85669,7 +85660,9 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/effect/spawner/window/reinforced/grilled, +/obj/effect/spawner/window/reinforced/polarized/grilled{ + id = "council_chamber" + }, /turf/simulated/floor/plating, /area/station/command/bridge) "vXk" = ( @@ -86965,10 +86958,11 @@ /turf/simulated/floor/bluegrid, /area/station/turret_protected/ai_upload) "wsw" = ( -/obj/machinery/light_switch{ +/obj/machinery/button/windowtint{ dir = 1; - pixel_y = -24; - name = "south bump" + id = "council_chamber"; + pixel_y = -22; + req_access = list(19) }, /turf/simulated/floor/carpet, /area/station/command/bridge) @@ -88021,6 +88015,13 @@ /obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel, /area/station/service/janitor) +"wIz" = ( +/obj/item/radio/intercom/private{ + pixel_y = 28 + }, +/obj/structure/displaycase/captain, +/turf/simulated/floor/wood, +/area/station/command/office/captain) "wIF" = ( /obj/effect/turf_decal/tiles/department/security/side{ dir = 8 @@ -88539,6 +88540,15 @@ /obj/effect/mapping_helpers/airlock/windoor/access/any/service/hydroponics, /turf/simulated/floor/plasteel, /area/station/service/kitchen) +"wPX" = ( +/obj/effect/turf_decal/tiles/department/virology/corner{ + dir = 4 + }, +/obj/structure/chair/office{ + dir = 1 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "wQe" = ( /obj/machinery/firealarm/directional/west, /obj/effect/spawner/random/dirt/frequent, @@ -90249,6 +90259,21 @@ /obj/effect/turf_decal/tiles/department/medical/corner, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/lounge) +"xpC" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/sortjunction, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/effect/mapping_helpers/sortjunc_helper/captains_office, +/turf/simulated/floor/plasteel, +/area/station/hallway/primary/central/east) "xpF" = ( /obj/structure/disposalpipe/segment/corner{ dir = 1 @@ -118898,8 +118923,8 @@ aBV aIb bkW btY -boE -boE +boD +igi btQ jse vdP @@ -119155,7 +119180,7 @@ aCV boB bsb btT -boE +ihk boE uYQ byq @@ -119413,12 +119438,12 @@ bop boC teE boE -mEq +boE byp byq bAi xhX -uRT +boE bFK bkW bLl @@ -119667,16 +119692,16 @@ jMy abq aDK bpV -boD -gDB +jne +jBJ phE nGj byw byq byq bDM -bNS bwi +tiT bkW bac bNd @@ -119924,7 +119949,7 @@ jMy abq bkW bpY -boE +wPX hRu bvW btU @@ -119932,7 +119957,7 @@ bwh byr byq bDz -bNS +bwi bFM vqS bJr @@ -120181,15 +120206,15 @@ jMy abq aEh bqf -boD -pmZ -hSa +oRh +gDB boE -bwi +mPH +mhM bys byq boE -jzW +bDY bFN mJv bJr @@ -120695,11 +120720,11 @@ jMy abq aDK bqh -boD +byQ hht bvW btW -bwi +mCf bBU byq cpO @@ -120952,7 +120977,7 @@ jMy abq bkW bqg -boE +rKd gUi bvW btX @@ -121209,8 +121234,8 @@ jMy abq aEh cfh -boD -hht +jyA +gBk grn fsZ byy @@ -121469,7 +121494,7 @@ bqj boG mAa boE -mEq +boE byx byq bAi @@ -121725,7 +121750,7 @@ boe bql bsc btZ -boE +sCo boE bAb byq @@ -121980,10 +122005,10 @@ jMy abq aEt aIH -bkW +nki bum -boE -boE +boD +igi sLs jse bCA @@ -122497,7 +122522,7 @@ abq bkW bkW bkW -buc +bkW byA bkW qgk @@ -122754,9 +122779,9 @@ bhw bhw ayj bhw -qgk -qgk -qgk +wIz +cai +rNg bAl abb bEi @@ -125326,7 +125351,7 @@ bqu qif hFg hlD -dIq +xpC wFq rUD hlD