From af24b315d3fa4aa32d856dd6fc0e998028bd05eb Mon Sep 17 00:00:00 2001 From: FabianK3 <21039694+FabianK3@users.noreply.github.com> Date: Fri, 4 Oct 2024 16:42:44 +0200 Subject: [PATCH 1/5] Updated engineering lobby layout - New layout - Add notice board - Moved engineering FAK locker --- maps/sccv_horizon/sccv_horizon.dmm | 794 ++++++++++++++++------------- 1 file changed, 440 insertions(+), 354 deletions(-) diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index f57c1029295..2ff7e0607f5 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -2990,17 +2990,16 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/door/airlock/glass_engineering{ - dir = 1; - name = "Engineering Hallway"; - req_access = list(10) - }, /obj/machinery/door/firedoor, /obj/effect/map_effect/door_helper/unres{ dir = 1 }, +/obj/machinery/door/airlock/engineering{ + name = "Engineering Lobby"; + req_one_access = list(10) + }, /turf/simulated/floor/tiled/full, -/area/hallway/engineering) +/area/engineering/lobby) "aue" = ( /obj/machinery/recharge_station, /obj/machinery/light/small{ @@ -13112,7 +13111,6 @@ /obj/effect/floor_decal/corner_wide/yellow{ dir = 8 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/hallway/engineering) "bRQ" = ( @@ -15194,19 +15192,21 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/floor_decal/corner_wide/yellow{ + dir = 5 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 8 }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_engineering{ - dir = 4; - name = "Engineering Front Desk"; - req_access = list(10) +/obj/structure/closet/walllocker/medical{ + pixel_y = 32 }, -/turf/simulated/floor/tiled/full, +/obj/effect/floor_decal/industrial/outline/medical, +/obj/item/storage/firstaid/regular, +/turf/simulated/floor/tiled, /area/engineering/lobby) "chw" = ( /obj/effect/floor_decal/carpet{ @@ -17834,21 +17834,17 @@ /turf/simulated/floor/holofloor/tiled, /area/horizon/holodeck/source_emptycourt) "cCI" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, /obj/effect/floor_decal/corner/yellow{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + dir = 8 }, /turf/simulated/floor/tiled, /area/engineering/lobby) @@ -19194,6 +19190,7 @@ /obj/effect/floor_decal/corner/dark_green{ dir = 8 }, +/obj/machinery/alarm/west, /turf/simulated/floor/tiled, /area/engineering/lobby) "cOx" = ( @@ -22530,16 +22527,11 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard/deck1) "dog" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/corner/yellow{ - dir = 9 +/obj/effect/floor_decal/corner/dark_green{ + dir = 10 }, -/obj/machinery/ringer_button{ - id = "engie_ringer"; - pixel_x = -21; - pixel_y = -21 +/obj/machinery/status_display{ + pixel_y = -32 }, /turf/simulated/floor/tiled, /area/engineering/lobby) @@ -22964,7 +22956,7 @@ /area/maintenance/wing/port/far) "dqO" = ( /obj/effect/floor_decal/corner/dark_green/full, -/obj/structure/extinguisher_cabinet/south, +/obj/machinery/firealarm/south, /turf/simulated/floor/tiled, /area/engineering/lobby) "dqR" = ( @@ -23588,9 +23580,13 @@ /area/horizon/security/investigators_office) "duH" = ( /obj/machinery/light, -/obj/structure/closet/firecloset, -/obj/effect/floor_decal/industrial/outline/firefighting_closet, -/turf/simulated/floor/tiled/dark/full, +/obj/effect/floor_decal/corner/dark_green{ + dir = 10 + }, +/obj/structure/bed/stool/chair{ + dir = 1 + }, +/turf/simulated/floor/tiled, /area/engineering/lobby) "duI" = ( /obj/machinery/button/remote/blast_door{ @@ -25928,9 +25924,6 @@ /turf/simulated/floor/grass, /area/horizon/hydroponics/lower) "dMU" = ( -/obj/effect/floor_decal/corner_wide/yellow{ - dir = 6 - }, /obj/structure/cable/green{ icon_state = "2-4" }, @@ -25942,8 +25935,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/floor_decal/corner_wide/yellow{ + dir = 5 + }, /turf/simulated/floor/tiled, -/area/hallway/engineering) +/area/engineering/lobby) "dMV" = ( /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; @@ -29534,6 +29530,8 @@ /obj/effect/floor_decal/corner/yellow{ dir = 10 }, +/obj/item/modular_computer/console/preset/engineering, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/engineering/lobby) "eoG" = ( @@ -29633,18 +29631,22 @@ /turf/simulated/floor/tiled, /area/horizon/crew_quarters/fitness/changing) "epH" = ( -/obj/structure/table/standard, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/corner/yellow{ + dir = 5 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal/small/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/machinery/power/apc/north, /obj/structure/cable/green{ - icon_state = "0-8" + icon_state = "4-8" }, -/obj/effect/floor_decal/corner/yellow{ - dir = 5 +/obj/machinery/light{ + dir = 1 }, -/obj/item/storage/bag/circuits/basic, /turf/simulated/floor/tiled, /area/engineering/lobby) "epT" = ( @@ -32951,12 +32953,17 @@ /turf/simulated/floor, /area/bridge/meeting_room) "eQG" = ( -/obj/effect/floor_decal/corner_wide/yellow{ - dir = 9 +/obj/machinery/door/firedoor, +/obj/effect/map_effect/door_helper/unres{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/hallway/engineering) +/obj/machinery/door/airlock/glass_engineering{ + dir = 1; + name = "Engineering Hallway"; + req_access = list(10) + }, +/turf/simulated/floor/tiled/full, +/area/engineering/lobby) "eQH" = ( /obj/effect/floor_decal/corner/dark_blue/full, /obj/machinery/light{ @@ -33466,14 +33473,7 @@ /turf/simulated/open, /area/horizon/hallway/deck_three/primary/central) "eUO" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/floor_decal/corner/yellow{ - dir = 9 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/modular_computer/console/preset/engineering{ +/obj/structure/bed/stool/chair/office/dark{ dir = 4 }, /turf/simulated/floor/tiled, @@ -37187,7 +37187,6 @@ /obj/machinery/light{ dir = 4 }, -/obj/random/pottedplant, /obj/effect/floor_decal/corner/dark_green{ dir = 6 }, @@ -37445,17 +37444,15 @@ /turf/space/transit/east, /area/template_noop) "fzM" = ( -/obj/structure/table/standard, -/obj/machinery/cell_charger{ - pixel_y = 4 +/obj/effect/floor_decal/corner_wide/yellow{ + dir = 10 }, -/obj/machinery/alarm/west, -/obj/machinery/requests_console/south{ - department = "Engineering"; - departmentType = 1; - name = "Engineering RC" +/obj/item/modular_computer/console/preset/engineering, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/camera/network/engineering{ + c_tag = "Engineering - Lobby"; + dir = 1 }, -/obj/effect/floor_decal/corner/yellow/full, /turf/simulated/floor/tiled, /area/engineering/lobby) "fzO" = ( @@ -38973,9 +38970,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/effect/floor_decal/corner/yellow/diagonal, +/obj/effect/floor_decal/corner_wide/yellow/full, /turf/simulated/floor/tiled, -/area/hallway/engineering) +/area/engineering/lobby) "fLG" = ( /obj/effect/landmark{ name = "Revenant" @@ -39043,6 +39040,9 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/engineering) "fLZ" = ( @@ -39227,17 +39227,16 @@ /turf/simulated/floor/shuttle/black, /area/shuttle/distress) "fNq" = ( -/obj/machinery/door/airlock/glass_engineering{ - dir = 1; - name = "Engineering Hallway"; - req_access = list(10) - }, /obj/machinery/door/firedoor, /obj/effect/map_effect/door_helper/unres{ dir = 1 }, +/obj/machinery/door/airlock/engineering{ + name = "Engineering Lobby"; + req_one_access = list(10) + }, /turf/simulated/floor/tiled/full, -/area/hallway/engineering) +/area/engineering/lobby) "fNt" = ( /obj/structure/shuttle_part/scc/research{ icon_state = "12,26"; @@ -40892,7 +40891,6 @@ /obj/effect/floor_decal/corner/dark_green{ dir = 5 }, -/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/engineering/lobby) "fZH" = ( @@ -44564,10 +44562,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, -/turf/simulated/floor/tiled/full, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, /area/hallway/engineering) "gCb" = ( /obj/machinery/door/airlock/centcom{ @@ -45592,9 +45591,17 @@ /turf/simulated/floor/tiled/dark, /area/storage/eva) "gJz" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/space_heater, -/turf/simulated/floor/tiled/dark/full, +/obj/effect/floor_decal/corner/dark_green/full, +/obj/structure/table/standard, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 1 + }, +/obj/item/pen{ + pixel_x = 2; + pixel_y = 3 + }, +/turf/simulated/floor/tiled, /area/engineering/lobby) "gJB" = ( /obj/structure/disposalpipe/segment{ @@ -47647,12 +47654,12 @@ }, /area/antag/mercenary) "gYC" = ( -/obj/machinery/status_display{ - pixel_y = -32 - }, /obj/effect/floor_decal/corner/dark_green{ dir = 10 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/engineering/lobby) "gYL" = ( @@ -47871,8 +47878,11 @@ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/full, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, /area/hallway/engineering) "haX" = ( /obj/structure/cable/green{ @@ -49326,12 +49336,14 @@ /turf/unsimulated/floor/plating, /area/centcom/specops) "hnx" = ( -/obj/structure/table/standard, -/obj/item/storage/slide_projector, -/obj/machinery/light, /obj/effect/floor_decal/corner/yellow{ dir = 10 }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/computer/security/engineering{ + name = "Drone Monitoring Cameras" + }, +/obj/machinery/light, /turf/simulated/floor/tiled, /area/engineering/lobby) "hnK" = ( @@ -49432,17 +49444,22 @@ /turf/simulated/floor/carpet/rubber, /area/server) "hoS" = ( -/obj/effect/floor_decal/corner_wide/yellow{ - dir = 6 - }, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/alarm/east, -/turf/simulated/floor/tiled, -/area/hallway/engineering) +/obj/machinery/door/firedoor, +/obj/effect/map_effect/door_helper/unres{ + dir = 1 + }, +/obj/machinery/door/airlock/glass_engineering{ + dir = 1; + name = "Engineering Hallway"; + req_access = list(10) + }, +/turf/simulated/floor/tiled/full, +/area/engineering/lobby) "hoT" = ( /obj/structure/bed/stool/chair/padded/blue{ dir = 4 @@ -49651,13 +49668,16 @@ /turf/simulated/floor/wood, /area/crew_quarters/heads/hop/xo) "hpZ" = ( -/obj/machinery/disposal/small/north, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, /obj/effect/floor_decal/corner/yellow{ dir = 10 }, +/obj/structure/table/standard, +/obj/machinery/button/remote/blast_door{ + id = "shutters_deck2_eng_frontdesk"; + name = "remote shutter control"; + pixel_y = -1; + pixel_x = -6 + }, /turf/simulated/floor/tiled, /area/engineering/lobby) "hqa" = ( @@ -51455,13 +51475,9 @@ }, /area/centcom/bar) "hEo" = ( -/obj/structure/bed/stool/chair{ - dir = 8 - }, -/obj/effect/floor_decal/corner/dark_green{ - dir = 6 - }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/outline/emergency_closet, +/obj/structure/closet/emcloset, +/turf/simulated/floor/tiled/dark/full, /area/engineering/lobby) "hEp" = ( /turf/unsimulated/floor{ @@ -51930,14 +51946,14 @@ /turf/simulated/floor/carpet, /area/lawoffice/representative_two) "hHV" = ( -/obj/effect/floor_decal/corner_wide/yellow{ - dir = 6 - }, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/corner_wide/yellow/full{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/engineering) "hHY" = ( @@ -53966,7 +53982,8 @@ name = "CE Office"; sortType = "CE Office" }, -/turf/simulated/floor/tiled/full, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, /area/hallway/engineering) "hYg" = ( /obj/effect/floor_decal/corner/red/diagonal, @@ -55136,15 +55153,24 @@ /turf/simulated/floor/plating, /area/maintenance/wing/port) "ihT" = ( -/obj/effect/floor_decal/corner_wide/yellow{ - dir = 6 +/obj/machinery/door/blast/shutters/open{ + dir = 2; + id = "shutters_deck2_eng_frontdesk"; + name = "Engineering Front Desk Shutter" }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/desk/northleft{ + req_access = list(10); + name = "Engineering Front Desk Internal" }, -/obj/item/device/radio/intercom/east, -/turf/simulated/floor/tiled, -/area/hallway/engineering) +/obj/machinery/ringer_button{ + id = "engie_ringer"; + pixel_x = -9; + pixel_y = -9 + }, +/turf/simulated/floor/tiled/dark/full, +/area/engineering/lobby) "ihW" = ( /obj/structure/closet/emcloset, /obj/effect/floor_decal/industrial/outline/emergency_closet, @@ -57270,9 +57296,11 @@ /turf/simulated/floor/exoplanet/barren/raskara, /area/centcom/shared_dream) "iyM" = ( -/obj/effect/floor_decal/corner/yellow/diagonal, -/turf/simulated/floor/tiled, -/area/hallway/engineering) +/obj/item/device/radio/intercom/west, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/space_heater, +/turf/simulated/floor/tiled/dark/full, +/area/engineering/lobby) "iyU" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 5 @@ -59479,11 +59507,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/closet/walllocker/medical{ - pixel_y = 32 - }, -/obj/effect/floor_decal/industrial/outline/medical, -/obj/item/storage/firstaid/regular, /obj/structure/platform_deco{ dir = 8 }, @@ -64516,11 +64539,11 @@ /obj/structure/cable/green{ icon_state = "2-8" }, -/obj/effect/floor_decal/corner_wide/yellow/full{ - dir = 4 +/obj/effect/floor_decal/corner_wide/yellow{ + dir = 10 }, /turf/simulated/floor/tiled, -/area/hallway/engineering) +/area/engineering/lobby) "jzl" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 10 @@ -66099,10 +66122,14 @@ /turf/simulated/floor/grass, /area/centcom/spawning) "jLD" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/portable_atmospherics/powered/scrubber, -/turf/simulated/floor/tiled/dark/full, -/area/hallway/engineering) +/obj/effect/floor_decal/corner/yellow{ + dir = 10 + }, +/obj/structure/bed/stool/chair/office/dark{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/lobby) "jLO" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 5 @@ -72233,8 +72260,8 @@ /turf/simulated/floor/tiled, /area/hangar/intrepid) "kEw" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/portable_atmospherics/powered/pump/filled, +/obj/effect/floor_decal/industrial/outline/firefighting_closet, +/obj/structure/closet/firecloset, /turf/simulated/floor/tiled/dark/full, /area/hallway/engineering) "kEJ" = ( @@ -72398,9 +72425,6 @@ /obj/effect/floor_decal/corner/dark_green{ dir = 10 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /turf/simulated/floor/tiled, /area/engineering/lobby) "kGp" = ( @@ -73003,6 +73027,15 @@ }, /turf/simulated/floor/reinforced/airmix, /area/engineering/atmos/air) +"kKA" = ( +/obj/effect/floor_decal/corner/dark_green/full{ + dir = 4 + }, +/obj/structure/bed/stool/chair{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/engineering/lobby) "kKL" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/corner/dark_blue{ @@ -76198,20 +76231,9 @@ /turf/simulated/floor/tiled/dark, /area/horizon/bar/backroom) "lkP" = ( -/obj/structure/table/standard, /obj/effect/floor_decal/corner/yellow{ dir = 6 }, -/obj/machinery/button/remote/blast_door{ - id = "shutters_deck2_eng_frontdesk"; - name = "remote shutter control"; - pixel_x = 6; - pixel_y = -2 - }, -/obj/random/pottedplant_small{ - pixel_x = 3; - pixel_y = 11 - }, /turf/simulated/floor/tiled, /area/engineering/lobby) "llb" = ( @@ -76704,6 +76726,11 @@ /obj/effect/map_effect/window_spawner/full/reinforced/firedoor, /turf/simulated/floor/tiled/dark/full, /area/medical/reception) +"lpU" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/portable_atmospherics/powered/pump/filled, +/turf/simulated/floor/tiled/dark/full, +/area/engineering/lobby) "lpV" = ( /obj/machinery/atmospherics/binary/pump{ dir = 4; @@ -77511,10 +77538,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/engineering/lobby) @@ -81241,12 +81270,12 @@ /turf/simulated/floor/reinforced/airless, /area/horizon/exterior) "lYT" = ( -/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, /obj/machinery/door/blast/shutters/open{ dir = 2; id = "shutters_deck2_eng_frontdesk"; name = "Engineering Front Desk Shutter" }, +/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, /turf/simulated/floor/tiled/dark/full, /area/engineering/lobby) "lYV" = ( @@ -83870,8 +83899,20 @@ /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/bridge/controlroom) "msN" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, /area/engineering/lobby) "msQ" = ( /obj/structure/table/stone/marble, @@ -87943,13 +87984,11 @@ }, /area/centcom/shared_dream) "naz" = ( -/obj/item/modular_computer/console/preset/engineering{ - dir = 1 - }, /obj/effect/floor_decal/corner/yellow/full{ dir = 4 }, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/table/standard, +/obj/item/storage/slide_projector, /turf/simulated/floor/tiled, /area/engineering/lobby) "naK" = ( @@ -89429,15 +89468,12 @@ /turf/simulated/floor/tiled/dark, /area/medical/gen_treatment) "nmA" = ( -/obj/structure/closet/emcloset, -/obj/effect/floor_decal/corner/dark_green{ - dir = 6 - }, -/obj/effect/floor_decal/industrial/outline/emergency_closet, /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/portable_atmospherics/powered/scrubber, +/turf/simulated/floor/tiled/dark/full, /area/engineering/lobby) "nmF" = ( /obj/effect/floor_decal/corner/dark_blue/full, @@ -89637,6 +89673,15 @@ /obj/machinery/firealarm/east, /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology/dissection) +"noC" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/corner/yellow{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/engineering/lobby) "noF" = ( /turf/unsimulated/floor{ icon_state = "wood" @@ -91019,16 +91064,15 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/corner_wide/yellow{ + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/firealarm/north, -/obj/effect/floor_decal/corner/yellow/full{ dir = 8 }, +/obj/structure/noticeboard{ + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/engineering/lobby) "nyL" = ( @@ -91162,14 +91206,9 @@ /turf/simulated/floor/plating, /area/maintenance/wing/port) "nAb" = ( -/obj/structure/bed/stool/chair{ - dir = 8 - }, -/obj/machinery/alarm/east, -/obj/effect/floor_decal/corner/dark_green{ - dir = 6 - }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/outline/firefighting_closet, +/obj/structure/closet/firecloset, +/turf/simulated/floor/tiled/dark/full, /area/engineering/lobby) "nAf" = ( /obj/structure/lattice/catwalk/indoor/grate, @@ -91621,15 +91660,24 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction/flipped{ name = "Engineering"; sortType = "Engineering" }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, -/area/hallway/engineering) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/corner_wide/yellow{ + dir = 5 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/engineering/lobby) "nDy" = ( /obj/structure/reagent_dispensers/coolanttank, /obj/machinery/firealarm/west, @@ -97826,11 +97874,13 @@ /turf/simulated/floor/tiled, /area/horizon/security/warden) "oAv" = ( -/obj/machinery/door/firedoor, /obj/effect/floor_decal/corner/dark_green{ dir = 10 }, /obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/firedoor{ + dir = 4 + }, /turf/simulated/floor/tiled/full, /area/engineering/lobby) "oAy" = ( @@ -98014,7 +98064,7 @@ icon = 'icons/obj/items.dmi'; icon_state = "blueprints"; name = "station blueprints"; - pixel_y = -3; + pixel_y = -3 }, /obj/item/reagent_containers/food/drinks/coffee{ pixel_x = -7; @@ -98245,8 +98295,10 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner_wide/yellow{ + dir = 10 + }, +/turf/simulated/floor/tiled, /area/hallway/engineering) "oCY" = ( /turf/simulated/floor/plating, @@ -103304,20 +103356,10 @@ /turf/simulated/floor/plating, /area/shuttle/skipjack) "pqw" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/effect/floor_decal/corner_wide/yellow{ + dir = 9 }, -/obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled, /area/engineering/lobby) "pqK" = ( /obj/structure/flora/ausbushes/fullgrass, @@ -111683,6 +111725,7 @@ dir = 8 }, /obj/random/pottedplant, +/obj/machinery/alarm/east, /turf/simulated/floor/wood, /area/hallway/engineering) "qBX" = ( @@ -112891,11 +112934,14 @@ /turf/simulated/floor/plating, /area/maintenance/security_port) "qJZ" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, +/turf/simulated/floor/tiled/dark/full, /area/engineering/lobby) "qKd" = ( /obj/structure/platform/ledge, @@ -116062,16 +116108,14 @@ /turf/unsimulated/floor, /area/antag/burglar) "rhX" = ( -/obj/structure/bed/stool/chair{ - dir = 8 +/obj/effect/floor_decal/corner/dark_green{ + dir = 6 }, +/obj/random/pottedplant, /obj/machinery/camera/network/engineering{ c_tag = "Engineering - Hallway 1"; dir = 8 }, -/obj/effect/floor_decal/corner/dark_green{ - dir = 6 - }, /turf/simulated/floor/tiled, /area/engineering/lobby) "ric" = ( @@ -116739,13 +116783,8 @@ }, /area/centcom/specops) "rol" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering{ - dir = 1; - name = "Engineering Front Desk"; - req_access = list(10) - }, -/turf/simulated/floor/tiled/full, +/obj/structure/table/standard, +/turf/simulated/floor/tiled, /area/engineering/lobby) "ros" = ( /obj/structure/table/standard, @@ -117885,6 +117924,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/engineering) "rwv" = ( @@ -122514,7 +122556,8 @@ /obj/effect/floor_decal/corner/yellow{ dir = 6 }, -/obj/structure/bed/stool/chair/office/dark{ +/obj/structure/table/standard, +/obj/machinery/light{ dir = 4 }, /turf/simulated/floor/tiled, @@ -123475,7 +123518,8 @@ /obj/structure/disposalpipe/sortjunction/untagged/flipped{ dir = 4 }, -/turf/simulated/floor/tiled/full, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, /area/hallway/engineering) "srw" = ( /obj/machinery/atmospherics/pipe/manifold/visible/purple{ @@ -125494,6 +125538,10 @@ /obj/structure/railing/mapped, /turf/simulated/floor/tiled, /area/hallway/primary/central_one) +"sGf" = ( +/obj/effect/floor_decal/corner_wide/yellow/full, +/turf/simulated/floor/tiled, +/area/hallway/engineering) "sGo" = ( /obj/effect/floor_decal/spline/plain/corner, /turf/simulated/floor/lino/diamond, @@ -126307,15 +126355,16 @@ /turf/simulated/floor/grass, /area/horizon/hydroponics/garden) "sMD" = ( -/obj/machinery/computer/security/engineering{ - name = "Drone Monitoring Cameras" - }, /obj/effect/floor_decal/corner/yellow{ dir = 5 }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/light{ - dir = 1 +/obj/machinery/power/apc/north, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/structure/table/standard, +/obj/item/storage/bag/circuits/basic{ + pixel_y = 6 }, /turf/simulated/floor/tiled, /area/engineering/lobby) @@ -128516,6 +128565,16 @@ icon_state = "white" }, /area/centcom/legion) +"tdZ" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/engineering/lobby) "teb" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -129813,6 +129872,15 @@ /obj/structure/table/wood, /turf/simulated/floor/holofloor/lino, /area/horizon/holodeck/source_meetinghall) +"tpD" = ( +/obj/effect/floor_decal/corner/dark_green{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/engineering/lobby) "tpF" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -130617,7 +130685,7 @@ }, /obj/structure/sign/directions/prop{ dir = 4; - pixel_y = 24 + pixel_y = 34 }, /turf/simulated/floor/tiled, /area/engineering/lobby) @@ -131433,10 +131501,12 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/door/firedoor, /obj/effect/floor_decal/corner/dark_green{ dir = 5 }, +/obj/machinery/door/firedoor{ + dir = 4 + }, /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/full, /area/engineering/lobby) @@ -132996,6 +133066,21 @@ /obj/effect/floor_decal/industrial/outline/security, /turf/simulated/floor/tiled/white, /area/horizon/security/autopsy_laboratory) +"tNd" = ( +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,73); + dir = 4 + }, +/obj/effect/map_effect/door_helper/unres{ + dir = 8 + }, +/obj/machinery/door/airlock/engineering{ + dir = 4; + name = "Engineering Lobby"; + req_one_access = list(10) + }, +/turf/simulated/floor/tiled/full, +/area/engineering/lobby) "tNi" = ( /obj/structure/shuttle_part/scc_space_ship{ icon_state = "d3-6" @@ -133017,7 +133102,9 @@ dir = 4 }, /obj/effect/floor_decal/industrial/hatch/yellow, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 4 + }, /turf/simulated/floor/tiled/full, /area/engineering/lobby) "tNp" = ( @@ -133392,17 +133479,12 @@ }, /area/centcom/holding) "tPZ" = ( -/obj/structure/table/reinforced, /obj/machinery/door/blast/shutters/open{ dir = 4; id = "shutters_deck2_eng_frontdesk"; name = "Engineering Front Desk Shutter" }, -/obj/machinery/door/window/desk/westleft{ - name = "Engineering Front Desk Internal"; - req_access = list(10) - }, -/obj/machinery/door/firedoor, +/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, /turf/simulated/floor/tiled/dark/full, /area/engineering/lobby) "tQl" = ( @@ -136125,10 +136207,21 @@ /turf/simulated/floor/airless, /area/engineering/atmos) "ukr" = ( -/obj/structure/closet/firecloset, -/obj/effect/floor_decal/industrial/outline/firefighting_closet, -/turf/simulated/floor/tiled/dark/full, -/area/hallway/engineering) +/obj/effect/floor_decal/corner_wide/yellow/full{ + dir = 8 + }, +/obj/structure/table/standard, +/obj/machinery/recharger{ + pixel_y = -1; + pixel_x = -8 + }, +/obj/machinery/cell_charger{ + pixel_y = 13; + pixel_x = -2 + }, +/obj/machinery/firealarm/north, +/turf/simulated/floor/tiled, +/area/engineering/lobby) "ukv" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -136136,18 +136229,18 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/newscaster/north, -/obj/machinery/camera/network/engineering{ - c_tag = "Engineering - Lobby" - }, /obj/effect/floor_decal/corner/yellow{ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 8 + }, +/obj/machinery/ringer/north{ + department = "Engineering"; + id = "engie_ringer"; + pixel_y = 30; + req_access = null; + req_one_access = list(11,24) }, /turf/simulated/floor/tiled, /area/engineering/lobby) @@ -137901,16 +137994,10 @@ /area/centcom/holding) "uwX" = ( /obj/effect/floor_decal/corner_wide/yellow{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/tiled, -/area/hallway/engineering) +/area/engineering/lobby) "uxb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -141382,8 +141469,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/map_effect/window_spawner/full/reinforced/firedoor, +/obj/machinery/door/blast/shutters/open{ + dir = 2; + id = "shutters_deck2_eng_frontdesk"; + name = "Engineering Front Desk Shutter" + }, /turf/simulated/floor/tiled/dark/full, -/area/hallway/engineering) +/area/engineering/lobby) "uYF" = ( /obj/structure/platform{ dir = 8 @@ -144773,8 +144865,26 @@ /turf/simulated/floor/tiled/dark, /area/horizon/crew_quarters/lounge/bar) "vxp" = ( -/obj/structure/bed/stool/chair/office/dark{ - dir = 1 +/obj/effect/floor_decal/corner_wide/yellow{ + dir = 10 + }, +/obj/structure/table/standard, +/obj/machinery/requests_console/south{ + department = "Engineering"; + departmentType = 1; + name = "Engineering Lobby RC" + }, +/obj/item/paper_bin{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/folder/yellow{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/pen{ + pixel_x = 5; + pixel_y = 9 }, /turf/simulated/floor/tiled, /area/engineering/lobby) @@ -147254,6 +147364,13 @@ }, /turf/simulated/floor/tiled, /area/horizon/security/brig) +"vSx" = ( +/obj/effect/floor_decal/corner/dark_green{ + dir = 10 + }, +/obj/machinery/alarm/south, +/turf/simulated/floor/tiled, +/area/engineering/lobby) "vSF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -150336,6 +150453,7 @@ pixel_x = -4; pixel_y = 4 }, +/obj/machinery/newscaster/north, /turf/simulated/floor/tiled, /area/engineering/lobby) "wpo" = ( @@ -152977,28 +153095,14 @@ /turf/simulated/wall, /area/engineering/atmos/storage) "wHp" = ( -/obj/structure/table/standard, -/obj/item/device/radio/intercom/north, /obj/effect/floor_decal/corner/yellow/full{ dir = 1 }, -/obj/item/paper_bin{ - pixel_x = 4; - pixel_y = 8 - }, -/obj/item/pen{ - pixel_x = 5; - pixel_y = 9 - }, -/obj/item/folder/yellow{ - pixel_x = -7; - pixel_y = 8 - }, -/obj/item/folder/yellow{ - pixel_x = -7; - pixel_y = 8 +/obj/machinery/alarm/north, +/obj/structure/table/standard, +/obj/item/storage/box/fancy/crayons/chalkbox{ + pixel_y = 5 }, -/obj/item/storage/box/fancy/crayons/chalkbox, /turf/simulated/floor/tiled, /area/engineering/lobby) "wHq" = ( @@ -153967,7 +154071,7 @@ }, /area/centcom/legion) "wOj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, /turf/simulated/floor/tiled, @@ -155584,20 +155688,13 @@ /turf/simulated/floor/wood, /area/horizon/bar) "wZy" = ( -/obj/structure/table/standard, -/obj/machinery/recharger, -/obj/effect/floor_decal/corner/yellow{ - dir = 9 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/machinery/ringer/north{ - department = "Engineering"; - dir = 8; - id = "engie_ringer"; - pixel_x = -10; - pixel_y = 0; - req_access = null; - req_one_access = list(11,24) +/obj/effect/floor_decal/corner/dark_green{ + dir = 9 }, +/obj/structure/extinguisher_cabinet/west, /turf/simulated/floor/tiled, /area/engineering/lobby) "wZI" = ( @@ -159164,17 +159261,11 @@ }, /area/horizon/kitchen/freezer) "xzc" = ( -/obj/effect/floor_decal/corner_wide/yellow{ - dir = 6 - }, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/light{ - dir = 4 - }, /turf/simulated/floor/tiled, -/area/hallway/engineering) +/area/engineering/lobby) "xzd" = ( /obj/structure/table/stone/marble, /obj/machinery/firealarm/west, @@ -159589,7 +159680,7 @@ /obj/machinery/requests_console/south{ department = "Engineering"; departmentType = 1; - name = "Engineering RC" + name = "Engineering Breakroom RC" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -161855,9 +161946,7 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/wing/starboard) "xSp" = ( -/obj/structure/bed/stool/chair/office/dark{ - dir = 8 - }, +/obj/structure/bed/stool/chair/office/dark, /turf/simulated/floor/tiled, /area/engineering/lobby) "xSt" = ( @@ -162535,8 +162624,9 @@ /obj/effect/floor_decal/corner_wide/yellow{ dir = 10 }, +/obj/machinery/light, /turf/simulated/floor/tiled, -/area/hallway/engineering) +/area/engineering/lobby) "xXN" = ( /obj/machinery/door/airlock/highsecurity{ dir = 4; @@ -163895,12 +163985,11 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/obj/effect/floor_decal/corner_wide/yellow{ + dir = 10 }, -/obj/effect/floor_decal/corner_wide/yellow/full, /turf/simulated/floor/tiled, -/area/hallway/engineering) +/area/engineering/lobby) "yhn" = ( /obj/structure/grille/diagonal{ dir = 1 @@ -164558,12 +164647,9 @@ /turf/simulated/floor/tiled/dark, /area/horizon/security/evidence_storage) "ylO" = ( -/obj/effect/floor_decal/corner_wide/yellow{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/corner/dark_green, /turf/simulated/floor/tiled, -/area/hallway/engineering) +/area/engineering/lobby) "ylS" = ( /obj/effect/floor_decal/corner/mauve{ dir = 6 @@ -259305,12 +259391,12 @@ pxC sJD vYt kEw -jLD +vDM ukr iyM -iyM +pqw fLF -iXY +wLx wpl aCW ttU @@ -259561,11 +259647,11 @@ sBj tet srq bRG -eQG +sGf eQG uwX -ylO -ylO +aCW +aCW yhj fNq gKO @@ -259819,10 +259905,10 @@ haW gCa hYc oCX -oCX +qJZ nDm -oCX -oCX +vfz +vfz xXM uYv kFd @@ -260078,13 +260164,13 @@ tkx hHV hoS dMU -ihT +xzc xzc jzi aud xWn eAT -ttU +vSx stC wkd wCG @@ -260335,9 +260421,9 @@ xRO qBW vDM chv -vDM -wcQ -vDM +nPX +rol +vxp wLx fZE lwh @@ -260592,12 +260678,12 @@ uQm oJL wLx nyJ -wZy +aCW eUO fzM wLx joZ -pqw +eAT kGm stC aOF @@ -260849,13 +260935,13 @@ qaW jzV wLx ukv -aCW +kbs xSp hnx lYT jTw eAT -ttU +dog stC aOF eSE @@ -261106,10 +261192,10 @@ psk tVy kJF cCI -qJZ -msN +aCW +aCW hpZ -wLx +lYT jTw eAT ttU @@ -261364,12 +261450,12 @@ eln wLx epH wOj -nPX -eoC -lYT -jTw -eAT -eoC +aCW +jLD +ihT +jmu +msN +tpD gJz qbF pyW @@ -261620,13 +261706,13 @@ kgh kCJ wLx sMD -vxp -kbs +aCW +xSp eoC -rol -jmu +lYT +jTw eAT -eoC +aCW duH qbF cbR @@ -261883,8 +261969,8 @@ naz lYT jTw kcq -eoC -gJz +ylO +kKA qbF gPa lsv @@ -262134,14 +262220,14 @@ oJL oJL wLx gXH -gXH +tNd tPZ -gXH -lYT +tPZ +wLx tAG tNk oAv -vDM +wcQ qbF jzW giz @@ -262391,10 +262477,10 @@ ouz aNE cOs brV -brV -dog +noC brV brV +wZy ejy kcq mch @@ -262648,10 +262734,10 @@ lCT kYM bie fyo -jIz csG vfz -vfz +tdZ +jIz fyo uoY aCW @@ -262905,10 +262991,10 @@ jql loY acd aCW -vGS hMN aCW aCW +vGS aCW aCW aCW @@ -263162,7 +263248,7 @@ hFH ykM tur nmA -hEo +lpU nAb hEo rhX From c3b867b85b891760775b8b28ce9a89d40155d300 Mon Sep 17 00:00:00 2001 From: FabianK3 <21039694+FabianK3@users.noreply.github.com> Date: Fri, 4 Oct 2024 16:42:53 +0200 Subject: [PATCH 2/5] Add changelog --- .../fabiank3-engineering-lobby-revision.yml | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 html/changelogs/fabiank3-engineering-lobby-revision.yml diff --git a/html/changelogs/fabiank3-engineering-lobby-revision.yml b/html/changelogs/fabiank3-engineering-lobby-revision.yml new file mode 100644 index 00000000000..a225a847633 --- /dev/null +++ b/html/changelogs/fabiank3-engineering-lobby-revision.yml @@ -0,0 +1,54 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: FabianK3 + +delete-after: True + +changes: + - rscadd: "Updated engineering lobby layout and adjacent areas." + - rscadd: "Added a notice board to the engineering lobby." + - qol: "Moved engineering first aid locker into the lobby. Remember that." From 372ec72c955c05ba3657c27bf45a158397728a68 Mon Sep 17 00:00:00 2001 From: FabianK3 <21039694+FabianK3@users.noreply.github.com> Date: Fri, 4 Oct 2024 16:46:35 +0200 Subject: [PATCH 3/5] Cleanup changelog --- .../fabiank3-engineering-lobby-revision.yml | 46 ------------------- 1 file changed, 46 deletions(-) diff --git a/html/changelogs/fabiank3-engineering-lobby-revision.yml b/html/changelogs/fabiank3-engineering-lobby-revision.yml index a225a847633..1eaa2c91576 100644 --- a/html/changelogs/fabiank3-engineering-lobby-revision.yml +++ b/html/changelogs/fabiank3-engineering-lobby-revision.yml @@ -1,49 +1,3 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# - (fixes bugs) -# wip -# - (work in progress) -# qol -# - (quality of life) -# soundadd -# - (adds a sound) -# sounddel -# - (removes a sound) -# rscadd -# - (adds a feature) -# rscdel -# - (removes a feature) -# imageadd -# - (adds an image or sprite) -# imagedel -# - (removes an image or sprite) -# spellcheck -# - (fixes spelling or grammar) -# experiment -# - (experimental change) -# balance -# - (balance changes) -# code_imp -# - (misc internal code change) -# refactor -# - (refactors code) -# config -# - (makes a change to the config files) -# admin -# - (makes changes to administrator tools) -# server -# - (miscellaneous changes to server) -################################# - -# Your name. author: FabianK3 delete-after: True From 96b2d26901f018dd22b9159e9baa1a6df1a299bc Mon Sep 17 00:00:00 2001 From: FabianK3 <21039694+FabianK3@users.noreply.github.com> Date: Sat, 5 Oct 2024 21:10:27 +0200 Subject: [PATCH 4/5] Fixing ill placed piping --- maps/sccv_horizon/sccv_horizon.dmm | 42 ++++++++++++++++-------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index 2ff7e0607f5..fa712a77ede 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -25924,20 +25924,24 @@ /turf/simulated/floor/grass, /area/horizon/hydroponics/lower) "dMU" = ( -/obj/structure/cable/green{ - icon_state = "2-4" - }, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/floor_decal/corner_wide/yellow{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled, /area/engineering/lobby) "dMV" = ( @@ -44559,11 +44563,11 @@ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, @@ -49447,8 +49451,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, /obj/effect/map_effect/door_helper/unres{ dir = 1 @@ -51949,8 +51951,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner_wide/yellow/full{ dir = 4 }, @@ -53976,12 +53976,16 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/sortjunction/flipped{ name = "CE Office"; sortType = "CE Office" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/hallway/engineering) @@ -129322,13 +129326,13 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/structure/disposalpipe/segment{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 8 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/tiled, From af4164c7f59e79144a1f714b14afa92244e824e2 Mon Sep 17 00:00:00 2001 From: FabianK3 <21039694+FabianK3@users.noreply.github.com> Date: Fri, 11 Oct 2024 16:42:32 +0200 Subject: [PATCH 5/5] Refactore change of previous master-merge --- maps/sccv_horizon/sccv_horizon.dmm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index ca95113a5a8..2baaa7985c8 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -17822,12 +17822,6 @@ /turf/simulated/floor/holofloor/tiled, /area/horizon/holodeck/source_emptycourt) "cCI" = ( -/obj/structure/disposalpipe/segment{ - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" },