diff --git a/code/game/machinery/doors/blast_door.dm b/code/game/machinery/doors/blast_door.dm index 9d7e5ed958..1143c3e0cd 100644 --- a/code/game/machinery/doors/blast_door.dm +++ b/code/game/machinery/doors/blast_door.dm @@ -285,6 +285,7 @@ return force_close() + return 1 // Proc: repair() // Parameters: None @@ -375,5 +376,81 @@ obj/machinery/door/blast/gate/open icon_state = "bars_1" density = 0 +// SUBTYPE: Multi-tile +// Pod doors ported from Paradise + + // Whoever wrote the old code for multi-tile spesspod doors needs to burn in hell. - Unknown + // Wise words. - Bxil +/obj/machinery/door/blast/multi_tile + name = "large blast door" + +/obj/machinery/door/blast/multi_tile/Initialize(mapload) + . = ..() + apply_opacity_to_my_turfs(opacity) + +/obj/machinery/door/blast/multi_tile/open() + if((. = ..())) + apply_opacity_to_my_turfs(opacity) + +/obj/machinery/door/blast/multi_tile/close() + if((. = ..())) + apply_opacity_to_my_turfs(opacity) + +/obj/machinery/door/blast/multi_tile/Destroy() + apply_opacity_to_my_turfs(0) + return ..() + +//Multi-tile poddoors don't turn invisible automatically, so we change the opacity of the turfs below instead one by one. +/obj/machinery/door/blast/multi_tile/proc/apply_opacity_to_my_turfs(new_opacity) + for(var/turf/T in locs) + T.opacity = new_opacity + T.has_opaque_atom = new_opacity + T.reconsider_lights() + update_nearby_tiles() + +/obj/machinery/door/blast/multi_tile + icon_state_open = "open" + icon_state_opening = "opening" + icon_state_closed = "closed" + icon_state_closing = "closing" + icon_state = "closed" + +/obj/machinery/door/blast/multi_tile/four_tile_ver + icon = 'icons/obj/doors/1x4blast_vert.dmi' + bound_height = 128 + width = 4 + dir = NORTH + +/obj/machinery/door/blast/multi_tile/three_tile_ver + icon = 'icons/obj/doors/1x3blast_vert.dmi' + bound_height = 96 + width = 3 + dir = NORTH + +/obj/machinery/door/blast/multi_tile/two_tile_ver + icon = 'icons/obj/doors/1x2blast_vert.dmi' + bound_height = 64 + width = 2 + dir = NORTH + +/obj/machinery/door/blast/multi_tile/four_tile_hor + icon = 'icons/obj/doors/1x4blast_hor.dmi' + bound_width = 128 + width = 4 + dir = EAST + +/obj/machinery/door/blast/multi_tile/three_tile_hor + icon = 'icons/obj/doors/1x3blast_hor.dmi' + bound_width = 96 + width = 3 + dir = EAST + +/obj/machinery/door/blast/multi_tile/two_tile_hor + icon = 'icons/obj/doors/1x2blast_hor.dmi' + bound_width = 64 + width = 2 + dir = EAST + + #undef BLAST_DOOR_CRUSH_DAMAGE #undef SHUTTER_CRUSH_DAMAGE \ No newline at end of file diff --git a/code/game/objects/structures/holoplant.dm b/code/game/objects/structures/holoplant.dm index bf2365a7b1..dbd39361d6 100644 --- a/code/game/objects/structures/holoplant.dm +++ b/code/game/objects/structures/holoplant.dm @@ -46,12 +46,12 @@ return plant = prepare_icon(emagged ? "emagged" : null) - overlays += plant + overlays = list(plant) set_light(2) update_use_power(USE_POWER_ACTIVE) /obj/machinery/holoplant/proc/deactivate() - overlays -= plant + overlays.Cut() QDEL_NULL(plant) set_light(0) update_use_power(USE_POWER_OFF) @@ -66,16 +66,16 @@ /obj/machinery/holoplant/proc/flicker() interference = TRUE spawn(0) - overlays -= plant + overlays.Cut() set_light(0) sleep(rand(2,4)) - overlays += plant + overlays = list(plant) set_light(2) sleep(rand(2,4)) - overlays -= plant + overlays.Cut() set_light(0) sleep(rand(2,4)) - overlays += plant + overlays = list(plant) set_light(2) interference = FALSE diff --git a/icons/obj/doors/1x2blast_hor.dmi b/icons/obj/doors/1x2blast_hor.dmi index a0a3d9351f..59827a2807 100644 Binary files a/icons/obj/doors/1x2blast_hor.dmi and b/icons/obj/doors/1x2blast_hor.dmi differ diff --git a/icons/obj/doors/1x2blast_vert.dmi b/icons/obj/doors/1x2blast_vert.dmi index 6e810457d1..f3fe9da8bb 100644 Binary files a/icons/obj/doors/1x2blast_vert.dmi and b/icons/obj/doors/1x2blast_vert.dmi differ diff --git a/icons/obj/doors/1x3blast_hor.dmi b/icons/obj/doors/1x3blast_hor.dmi new file mode 100644 index 0000000000..72d8898ae6 Binary files /dev/null and b/icons/obj/doors/1x3blast_hor.dmi differ diff --git a/icons/obj/doors/1x3blast_vert.dmi b/icons/obj/doors/1x3blast_vert.dmi new file mode 100644 index 0000000000..6fe220f28c Binary files /dev/null and b/icons/obj/doors/1x3blast_vert.dmi differ diff --git a/icons/obj/doors/1x4blast_hor.dmi b/icons/obj/doors/1x4blast_hor.dmi index d43298973c..41165639a9 100644 Binary files a/icons/obj/doors/1x4blast_hor.dmi and b/icons/obj/doors/1x4blast_hor.dmi differ diff --git a/icons/obj/doors/1x4blast_vert.dmi b/icons/obj/doors/1x4blast_vert.dmi index 26c730b983..2835732ad5 100644 Binary files a/icons/obj/doors/1x4blast_vert.dmi and b/icons/obj/doors/1x4blast_vert.dmi differ diff --git a/maps/offmap_vr/om_ships/aro3.dmm b/maps/offmap_vr/om_ships/aro3.dmm index 7bb71d2464..ba654b3829 100644 --- a/maps/offmap_vr/om_ships/aro3.dmm +++ b/maps/offmap_vr/om_ships/aro3.dmm @@ -25922,7 +25922,7 @@ Ua icon_state = "4-8" }, /turf/simulated/floor/tiled/eris/dark/danger, -/area/space) +/area/aro3/flight_deck) "aq" = ( /turf/simulated/wall/rpshull, /area/aro3/power) @@ -26083,11 +26083,11 @@ Ua /turf/simulated/floor/reinforced/airless, /area/space) "bH" = ( -/obj/structure/cable/cyan{ - icon_state = "1-2" +/obj/structure/closet/walllocker/emerglocker/north{ + dir = 8; + pixel_x = -32; + pixel_y = 0 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_port) "bN" = ( @@ -26445,11 +26445,17 @@ Ua /turf/simulated/floor/tiled/eris/dark/gray_perforated, /area/aro3/hallway_port) "ei" = ( -/obj/item/modular_computer/console/preset/civilian{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock{ + id_tag = "aro3_private1"; + name = "Private Room 1" }, -/turf/simulated/floor/carpet/turcarpet, -/area/aro3/suite_starboard) +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/eris/dark/panels, +/area/aro3/suite_port) "el" = ( /turf/simulated/floor/outdoors/grass/heavy, /area/aro3/park) @@ -26479,16 +26485,6 @@ Ua /obj/structure/hull_corner, /turf/space, /area/space) -"er" = ( -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/carpet/turcarpet, -/area/aro3/suite_port) "eA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -26610,6 +26606,18 @@ Ua }, /turf/simulated/floor/tiled/eris/dark, /area/aro3/function) +"fW" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock{ + id_tag = "aro3_private2"; + name = "Private Room 2" + }, +/turf/simulated/floor/tiled/eris/dark/panels, +/area/aro3/suite_starboard) "fZ" = ( /obj/machinery/button/remote/blast_door{ dir = 4; @@ -26861,18 +26869,6 @@ Ua /obj/item/device/sleevemate, /turf/simulated/floor/tiled/eris/white/cargo, /area/aro3/medical) -"hx" = ( -/obj/structure/bed/chair/office/dark{ - dir = 4 - }, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/carpet/turcarpet, -/area/aro3/suite_starboard) "hz" = ( /obj/structure/sink{ dir = 8; @@ -27196,6 +27192,13 @@ Ua }, /turf/simulated/floor/tiled/techmaint, /area/aro3/medical) +"ke" = ( +/obj/structure/fans/hardlight, +/obj/machinery/door/blast/multi_tile/two_tile_hor{ + id = "aroshipshutter_ramp" + }, +/turf/simulated/floor/reinforced, +/area/aro3/flight_deck) "kg" = ( /obj/machinery/light{ dir = 4 @@ -27226,13 +27229,8 @@ Ua /area/aro3/hallway_starboard) "kk" = ( /obj/structure/cable/cyan{ - icon_state = "2-8" + icon_state = "1-8" }, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_starboard) "kl" = ( @@ -27244,9 +27242,6 @@ Ua }, /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/suite_starboard_wc) -"kn" = ( -/turf/space/internal_edge/bottomright, -/area/aro3/suite_starboard) "kp" = ( /obj/structure/cable/cyan{ icon_state = "2-8" @@ -27351,15 +27346,9 @@ Ua /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/hallway_port) "lf" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, /obj/structure/cable/cyan{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_port) "ln" = ( @@ -27399,7 +27388,6 @@ Ua /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/item/modular_computer/tablet/preset/custom_loadout/hybrid, /obj/machinery/light{ dir = 8 }, @@ -27453,11 +27441,6 @@ Ua /obj/machinery/light{ dir = 8 }, -/obj/machinery/button/remote/blast_door{ - id = "aroshipshutter_ramp"; - name = "hangar shutters"; - pixel_x = -28 - }, /turf/simulated/floor/tiled/eris/dark/danger, /area/aro3/flight_deck) "mg" = ( @@ -27664,11 +27647,6 @@ Ua }, /turf/simulated/floor/wood, /area/aro3/suite_starboard) -"nR" = ( -/obj/structure/table/steel, -/obj/item/device/flashlight/lamp/green, -/turf/simulated/floor/carpet/turcarpet, -/area/aro3/suite_starboard) "nW" = ( /obj/structure/table/fancyblack, /obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ @@ -28019,18 +27997,10 @@ Ua /turf/simulated/floor/wood, /area/aro3/suite_port) "rc" = ( -/obj/machinery/light_switch{ - dir = 1; - pixel_x = 3; - pixel_y = -24 - }, -/obj/machinery/button/remote/airlock{ - dir = 1; - id = "aro3_private2"; - name = "Door Bolts"; - pixel_x = -8; - pixel_y = -24; - specialfunctions = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/cyan{ + icon_state = "1-2" }, /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_starboard) @@ -28177,7 +28147,25 @@ Ua /turf/simulated/floor/water/indoors/surfluid, /area/aro3/surfluid) "sr" = ( -/obj/structure/table/rack/shelf/steel, +/obj/machinery/button/remote/airlock{ + dir = 1; + id = "aro3_private2"; + name = "Door Bolts"; + pixel_x = 8; + pixel_y = -24; + specialfunctions = 4 + }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -3; + pixel_y = -24 + }, +/obj/structure/closet/crate/bin{ + anchored = 1; + density = 0; + name = "trash bin"; + pixel_y = 3 + }, /turf/simulated/floor/wood, /area/aro3/suite_starboard) "sv" = ( @@ -28338,8 +28326,11 @@ Ua /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/hallway_port) "tY" = ( -/obj/structure/table/steel, -/turf/simulated/floor/carpet/turcarpet, +/obj/machinery/door/airlock{ + id_tag = "aro3_private2_bed"; + name = "Private Room 1" + }, +/turf/simulated/floor/tiled/eris/dark/panels, /area/aro3/suite_starboard) "tZ" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, @@ -28399,11 +28390,13 @@ Ua /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/aro3/hallway_port) "uS" = ( -/obj/item/modular_computer/console/preset/civilian{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/cable/cyan{ + icon_state = "1-2" }, -/turf/simulated/floor/carpet/turcarpet, -/area/aro3/suite_port) +/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/area/aro3/hallway_port) "uX" = ( /obj/structure/cable/cyan{ icon_state = "1-2" @@ -28711,15 +28704,7 @@ Ua /turf/simulated/floor/tiled/eris/dark/violetcorener, /area/aro3/cockpit) "xh" = ( -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_y = 23 - }, -/obj/structure/closet/crate/bin{ - anchored = 1; - density = 0; - name = "trash bin"; - pixel_y = 3 - }, +/obj/item/modular_computer/console/preset/civilian, /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_port) "xj" = ( @@ -28760,8 +28745,25 @@ Ua /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/aro3/bar) "xw" = ( -/turf/space/internal_edge/topright, +/obj/machinery/button/remote/airlock{ + dir = 4; + id = "aro3_private2_bed"; + name = "Door Bolts"; + pixel_x = -24; + pixel_y = -24; + specialfunctions = 4 + }, +/obj/structure/closet/walllocker_double/north, +/turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_starboard) +"xA" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/area/aro3/hallway_starboard) "xB" = ( /obj/structure/sign/vacuum{ pixel_x = -32 @@ -28786,10 +28788,6 @@ Ua /area/aro3/power) "xG" = ( /obj/structure/fans/hardlight, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "aroshipshutter_ramp" - }, /obj/structure/cable/cyan{ icon_state = "1-2" }, @@ -28818,10 +28816,6 @@ Ua /obj/structure/cable/cyan{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_starboard) "xS" = ( @@ -28845,14 +28839,11 @@ Ua /turf/simulated/floor/tiled/eris/dark/gray_perforated, /area/aro3/atmos) "ye" = ( -/obj/structure/cable/cyan{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/aro3/hallway_port) @@ -29144,6 +29135,9 @@ Ua /obj/structure/cable/cyan{ icon_state = "2-8" }, +/obj/structure/cable/cyan{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/aro3/hallway_starboard) "zW" = ( @@ -29258,9 +29252,6 @@ Ua }, /turf/simulated/floor/reinforced/airless, /area/space) -"Aw" = ( -/turf/space/internal_edge/bottomleft, -/area/aro3/suite_port) "AA" = ( /obj/structure/marker_beacon{ mapped_in_color = "Olive"; @@ -29337,22 +29328,18 @@ Ua /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/aro3/hallway_starboard) "Bw" = ( +/obj/structure/fans/hardlight, +/obj/machinery/door/blast/multi_tile/four_tile_hor{ + id = "aroshipshutter_ramp" + }, /obj/machinery/button/remote/blast_door{ + dir = 4; id = "aroshipshutter_ramp"; name = "hangar shutters"; - pixel_x = 28; - pixel_y = 28 + pixel_x = -28 }, -/obj/structure/marker_beacon{ - mapped_in_color = "Olive"; - name = "green beacon"; - perma = 1 - }, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/turf/simulated/floor/reinforced, +/area/aro3/flight_deck) "Bx" = ( /obj/structure/cable/cyan{ icon_state = "5-8" @@ -29416,18 +29403,10 @@ Ua /turf/simulated/floor/tiled/eris/dark/gray_perforated, /area/aro3/hallway_port) "Cw" = ( -/obj/machinery/light_switch{ - dir = 1; - pixel_x = -3; - pixel_y = -24 - }, -/obj/machinery/button/remote/airlock{ - dir = 1; - id = "aro3_private1"; - name = "Door Bolts"; - pixel_x = 8; - pixel_y = -24; - specialfunctions = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/cyan{ + icon_state = "1-2" }, /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_port) @@ -29460,17 +29439,6 @@ Ua }, /turf/simulated/floor/tiled/eris/dark, /area/aro3/function) -"CF" = ( -/obj/structure/cable/cyan{ - icon_state = "4-8" - }, -/obj/structure/cable/cyan{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/aro3/hallway_starboard) "CH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -29489,21 +29457,14 @@ Ua /area/space) "CM" = ( /obj/machinery/button/remote/blast_door{ + dir = 8; id = "aroshipshutter_ramp"; name = "hangar shutters"; - pixel_x = -28; - pixel_y = 28 + pixel_x = 28 }, -/obj/structure/marker_beacon{ - mapped_in_color = "Burgundy"; - name = "red beacon"; - perma = 1 - }, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 8 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) +/obj/structure/fans/hardlight, +/turf/simulated/floor/reinforced, +/area/aro3/flight_deck) "CN" = ( /obj/structure/cable/cyan{ icon_state = "1-2" @@ -29572,15 +29533,12 @@ Ua /turf/simulated/floor/tiled/eris/dark/gray_platform, /area/aro3/hallway_bunkrooms) "DA" = ( -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 25 +/obj/structure/fans/hardlight, +/obj/machinery/door/blast/multi_tile/four_tile_hor{ + id = "aroshipshutter_ramp" }, -/obj/machinery/door/firedoor/glass/hidden{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/danger, -/area/aro3/repair_bay) +/turf/simulated/floor/reinforced, +/area/aro3/flight_deck) "DB" = ( /obj/structure/cable/cyan{ icon_state = "2-8" @@ -29672,8 +29630,11 @@ Ua /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/aro3/hallway_port) "Eu" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 + dir = 10 }, /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_starboard) @@ -29897,6 +29858,10 @@ Ua dir = 8 }, /obj/item/weapon/inducer/hybrid, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -24 + }, /turf/simulated/floor/tiled/eris/dark/gray_perforated, /area/aro3/repair_bay) "Gy" = ( @@ -29915,18 +29880,6 @@ Ua }, /turf/simulated/floor/plating/eris/under, /area/space) -"GA" = ( -/obj/machinery/door/airlock{ - id_tag = "aro3_private1"; - name = "Private Room 1" - }, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/eris/dark/panels, -/area/aro3/suite_port) "GC" = ( /obj/machinery/vending/engineering{ dir = 8; @@ -29978,8 +29931,13 @@ Ua /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/aro3/hallway_port) "Hj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/cyan{ - icon_state = "4-8" + icon_state = "2-4" + }, +/obj/structure/cable/cyan{ + icon_state = "2-8" }, /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_port) @@ -30009,6 +29967,18 @@ Ua "Hv" = ( /turf/simulated/floor/bluegrid, /area/space) +"Hz" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/machinery/button/remote/blast_door{ + dir = 1; + id = "aroshipshutter_ramp2"; + name = "hangar shutters"; + pixel_y = -28 + }, +/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/area/aro3/hallway_starboard) "HE" = ( /turf/simulated/shuttle/wall/voidcraft/blue, /area/shuttle/aroboat3) @@ -30045,8 +30015,13 @@ Ua /turf/simulated/floor/plating/eris/under, /area/aro3/atmos) "HY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/cyan{ - icon_state = "4-8" + icon_state = "2-4" + }, +/obj/structure/cable/cyan{ + icon_state = "2-8" }, /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_starboard) @@ -30059,17 +30034,6 @@ Ua }, /turf/simulated/floor/tiled/eris/dark, /area/aro3/atmos) -"Ih" = ( -/obj/structure/cable/cyan{ - icon_state = "4-8" - }, -/obj/structure/cable/cyan{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/aro3/hallway_port) "Is" = ( /turf/simulated/floor/tiled/eris/dark/danger, /area/aro3/repair_bay) @@ -30090,8 +30054,9 @@ Ua /turf/space/internal_edge/bottomright, /area/aro3/function) "II" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 6 }, /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_port) @@ -30181,11 +30146,6 @@ Ua }, /turf/simulated/floor/tiled/eris/dark/danger, /area/aro3/flight_deck) -"Kc" = ( -/obj/structure/table/steel, -/obj/item/device/flashlight/lamp/green, -/turf/simulated/floor/carpet/turcarpet, -/area/aro3/suite_port) "Kj" = ( /obj/machinery/light_switch{ dir = 1; @@ -30322,8 +30282,11 @@ Ua /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/aro3/hallway_starboard) "KX" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 + dir = 6 }, /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_port) @@ -30463,8 +30426,11 @@ Ua /turf/space, /area/space) "Ma" = ( -/turf/space/internal_edge/right, -/area/aro3/suite_starboard) +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/reinforced/airless, +/area/aro3/eva_hall) "Mb" = ( /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = 23 @@ -30605,13 +30571,8 @@ Ua /area/aro3/function) "MY" = ( /obj/structure/cable/cyan{ - icon_state = "2-4" + icon_state = "1-4" }, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_port) "Na" = ( @@ -30628,18 +30589,6 @@ Ua }, /turf/simulated/floor/tiled/eris/white/golden, /area/aro3/medical) -"Ni" = ( -/obj/machinery/door/airlock{ - id_tag = "aro3_private2"; - name = "Private Room 2" - }, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/eris/dark/panels, -/area/aro3/suite_starboard) "Nj" = ( /obj/machinery/door/airlock/maintenance/common{ name = "Materials Storage" @@ -30746,7 +30695,8 @@ Ua /obj/structure/cable/cyan{ icon_state = "1-2" }, -/obj/structure/closet/walllocker/emerglocker/north, +/obj/structure/table/steel, +/obj/item/modular_computer/tablet/preset/custom_loadout/hybrid, /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_starboard) "Or" = ( @@ -30808,7 +30758,25 @@ Ua /turf/simulated/floor/tiled/eris/dark, /area/aro3/power) "OR" = ( -/obj/structure/table/rack/shelf/steel, +/obj/machinery/button/remote/airlock{ + dir = 1; + id = "aro3_private1"; + name = "Door Bolts"; + pixel_x = 8; + pixel_y = -24; + specialfunctions = 4 + }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = -3; + pixel_y = -24 + }, +/obj/structure/closet/crate/bin{ + anchored = 1; + density = 0; + name = "trash bin"; + pixel_y = 3 + }, /turf/simulated/floor/wood, /area/aro3/suite_port) "OV" = ( @@ -30866,6 +30834,12 @@ Ua /obj/structure/closet/crate/freezer/centauri, /turf/simulated/floor/tiled/eris/cafe, /area/aro3/kitchen) +"PC" = ( +/obj/machinery/door/firedoor/glass/hidden{ + dir = 8 + }, +/turf/simulated/floor/tiled/eris/dark/danger, +/area/aro3/repair_bay) "PG" = ( /obj/structure/table/glass, /obj/item/roller/adv{ @@ -30901,14 +30875,11 @@ Ua /turf/simulated/floor/tiled/eris/dark/gray_platform, /area/aro3/workshop) "PO" = ( -/obj/structure/cable/cyan{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/aro3/hallway_starboard) @@ -30972,6 +30943,9 @@ Ua "QD" = ( /obj/structure/fans/hardlight, /obj/machinery/door/firedoor/glass/hidden, +/obj/machinery/door/blast/multi_tile/two_tile_hor{ + id = "aroshipshutter_ramp2" + }, /turf/simulated/floor/tiled/eris/dark/danger, /area/aro3/flight_deck) "QE" = ( @@ -31043,8 +31017,11 @@ Ua /turf/simulated/floor/tiled/eris/dark/gray_platform, /area/aro3/hallway_bunkrooms) "Rm" = ( -/obj/structure/table/steel, -/turf/simulated/floor/carpet/turcarpet, +/obj/machinery/door/airlock{ + id_tag = "aro3_private1_bed"; + name = "Private Room 1" + }, +/turf/simulated/floor/tiled/eris/dark/panels, /area/aro3/suite_port) "Rp" = ( /obj/structure/reagent_dispensers/fueltank, @@ -31118,7 +31095,8 @@ Ua /obj/structure/cable/cyan{ icon_state = "1-2" }, -/obj/structure/closet/walllocker/emerglocker/north, +/obj/structure/table/steel, +/obj/item/modular_computer/tablet/preset/custom_loadout/hybrid, /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_port) "Sp" = ( @@ -31260,6 +31238,9 @@ Ua /obj/structure/cable/cyan{ icon_state = "2-4" }, +/obj/structure/cable/cyan{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/aro3/hallway_port) "TF" = ( @@ -31397,8 +31378,9 @@ Ua /area/aro3/flight_deck) "US" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_starboard) "UU" = ( @@ -31416,10 +31398,6 @@ Ua /area/space) "Vg" = ( /obj/structure/fans/hardlight, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "aroshipshutter_ramp" - }, /turf/simulated/floor/reinforced, /area/aro3/flight_deck) "Vl" = ( @@ -31489,7 +31467,9 @@ Ua /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/aro3/hallway_starboard) "Wg" = ( -/turf/space/internal_edge/left, +/obj/structure/table/steel, +/obj/item/device/flashlight/lamp, +/turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_port) "Wk" = ( /obj/structure/cable/cyan{ @@ -31515,15 +31495,7 @@ Ua /turf/simulated/wall/rpshull, /area/aro3/workshop) "WB" = ( -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_y = 23 - }, -/obj/structure/closet/crate/bin{ - anchored = 1; - density = 0; - name = "trash bin"; - pixel_y = 3 - }, +/obj/item/modular_computer/console/preset/civilian, /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_starboard) "WG" = ( @@ -31710,7 +31682,16 @@ Ua /turf/simulated/floor/tiled/eris/dark/gray_perforated, /area/aro3/repair_bay) "Yu" = ( -/turf/space/internal_edge/topleft, +/obj/machinery/button/remote/airlock{ + dir = 8; + id = "aro3_private1_bed"; + name = "Door Bolts"; + pixel_x = 24; + pixel_y = -24; + specialfunctions = 4 + }, +/obj/structure/closet/walllocker_double/north, +/turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_port) "Yw" = ( /obj/structure/hull_corner/long_horiz{ @@ -31723,7 +31704,6 @@ Ua /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/item/modular_computer/tablet/preset/custom_loadout/hybrid, /obj/machinery/light{ dir = 4 }, @@ -31744,6 +31724,11 @@ Ua "YJ" = ( /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/aro3/surfluid) +"YN" = ( +/obj/structure/table/steel, +/obj/item/device/flashlight/lamp, +/turf/simulated/floor/carpet/turcarpet, +/area/aro3/suite_starboard) "YO" = ( /turf/simulated/floor/tiled/eris/steel/panels, /area/aro3/atmos) @@ -31844,17 +31829,6 @@ Ua }, /turf/simulated/floor/tiled/eris/white, /area/aro3/wc_starboard) -"Zy" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/button/remote/blast_door{ - id = "aroshipshutter_ramp"; - name = "hangar shutters"; - pixel_x = 28 - }, -/turf/simulated/floor/tiled/eris/dark/danger, -/area/aro3/flight_deck) "ZB" = ( /obj/structure/cable/cyan{ icon_state = "4-8" @@ -31885,11 +31859,11 @@ Ua /turf/simulated/floor/carpet/blucarpet, /area/aro3/bunkrooms) "ZL" = ( -/obj/structure/cable/cyan{ - icon_state = "1-2" +/obj/structure/closet/walllocker/emerglocker/north{ + dir = 4; + pixel_x = 32; + pixel_y = 0 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet/turcarpet, /area/aro3/suite_starboard) "ZM" = ( @@ -39825,8 +39799,8 @@ Fn eN eN Yu +Pu Wg -Aw eN pV hN @@ -39965,10 +39939,10 @@ Fn Fn eN eN -uS +eN Rm -Pu -Kc +eN +eN eN zI ef @@ -40108,12 +40082,12 @@ Cg Kn Sm lf -er +lf MY bH -GA +eN ye -Ih +ZP fc Uj bN @@ -40253,8 +40227,8 @@ KX II Hj Cw -eN -Fr +ei +uS TD Ul gp @@ -40940,7 +40914,7 @@ Fn Fn Fn Nu -UN +Ma UN Nu Nu @@ -41280,8 +41254,8 @@ tz Ov md xB -Vg -CM +Bw +pq RL RL RL @@ -41848,7 +41822,7 @@ Ov Ov Ov Ov -Vg +ke hD hD hD @@ -41975,7 +41949,7 @@ DL ij ij xE -DA +PC ow Xp wS @@ -42132,7 +42106,7 @@ Ov Ov Ov Ov -Vg +DA hD hD hD @@ -42261,7 +42235,7 @@ Is Yt NC Md -Mr +Hz Ur UR Ov @@ -42556,10 +42530,10 @@ Ov Ov Ov Ov -Zy +kg Es -Vg -Bw +CM +je LI LI LI @@ -42786,7 +42760,7 @@ Fn Fn Fn Nu -UN +Ma UN Nu Nu @@ -43519,8 +43493,8 @@ Eu US HY rc -pS -CH +fW +xA zV Wk ia @@ -43657,13 +43631,13 @@ rd rd aU Oq -hx +xP xP kk ZL -Ni +pS PO -CF +aR DY MK oL @@ -43799,10 +43773,10 @@ Fn Fn pS pS -ei +pS tY -Fl -nR +pS +pS pS QT sW @@ -43943,8 +43917,8 @@ Fn pS pS xw -Ma -kn +Fl +YN pS Yj LS