From d4cc015cacc19d747d1ba25b0e53fea0f4bc15ac Mon Sep 17 00:00:00 2001 From: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> Date: Fri, 3 Feb 2023 23:49:08 +0100 Subject: [PATCH] Kitchen Foyer Tweaks (#15467) --- html/changelogs/hydro_kitchen_tweaks.yml | 6 + maps/sccv_horizon/sccv_horizon-2_deck_2.dmm | 191 ++++++++++---------- 2 files changed, 101 insertions(+), 96 deletions(-) create mode 100644 html/changelogs/hydro_kitchen_tweaks.yml diff --git a/html/changelogs/hydro_kitchen_tweaks.yml b/html/changelogs/hydro_kitchen_tweaks.yml new file mode 100644 index 00000000000..8ddca39bd34 --- /dev/null +++ b/html/changelogs/hydro_kitchen_tweaks.yml @@ -0,0 +1,6 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - maptweak: "Tweaks the kitchen foyer wall mountable layout slightly. Gives hydroponics a window so they can listen to kitchen conversations." \ No newline at end of file diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index 731d694e727..2fcea61b9f0 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -3264,18 +3264,15 @@ /turf/simulated/floor/tiled/white, /area/horizon/security/brig) "byh" = ( -/obj/machinery/newscaster{ - pixel_x = -32 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, /obj/effect/floor_decal/corner/grey{ dir = 9 }, /obj/machinery/light{ dir = 8 }, +/obj/machinery/orderterminal{ + pixel_x = -32 + }, /turf/simulated/floor/lino/grey, /area/horizon/kitchen/hallway) "byq" = ( @@ -3633,9 +3630,6 @@ /turf/simulated/floor/tiled/full, /area/horizon/security/brig) "bGg" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -3648,6 +3642,10 @@ /obj/effect/floor_decal/corner/grey{ dir = 6 }, +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" + }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "bGh" = ( @@ -4590,6 +4588,15 @@ }, /turf/simulated/floor/tiled, /area/engineering/locker_room) +"cbK" = ( +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/camera/network/service{ + c_tag = "Service- Hydroponics 2"; + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/hydroponics) "ccl" = ( /obj/effect/floor_decal/corner/green{ dir = 5 @@ -4894,14 +4901,13 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "cks" = ( -/obj/item/device/radio/intercom{ - dir = 4; - pixel_x = -34 - }, -/obj/machinery/firealarm/west, /obj/effect/floor_decal/corner/grey{ dir = 9 }, +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = -24 + }, /turf/simulated/floor/lino/grey, /area/horizon/kitchen/hallway) "cku" = ( @@ -7895,8 +7901,13 @@ /turf/simulated/floor/tiled, /area/horizon/security/holding_cell_a) "dQZ" = ( -/obj/machinery/ai_status_display, -/turf/simulated/wall, +/obj/effect/map_effect/window_spawner/full/reinforced/firedoor, +/obj/machinery/door/blast/shutters/open{ + id = "shutters_deck2_hydroponicswindows"; + name = "Viewing Shutter"; + dir = 2 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/kitchen/hallway) "dRk" = ( /obj/machinery/atmospherics/unary/vent_pump/on, @@ -8854,12 +8865,10 @@ /turf/simulated/floor/tiled, /area/maintenance/wing/port) "esy" = ( -/obj/machinery/media/jukebox/audioconsole/wall{ - pixel_y = 32 - }, /obj/effect/floor_decal/corner/grey{ dir = 5 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/lino/grey, /area/horizon/kitchen/hallway) "esX" = ( @@ -11612,20 +11621,17 @@ /obj/structure/cable/green{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, /obj/effect/floor_decal/corner/grey, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/lino/grey, /area/horizon/kitchen/hallway) "fPb" = ( @@ -13394,12 +13400,12 @@ c_tag = "Service - Deck 2 - Bar Hallway"; dir = 8 }, -/obj/machinery/orderterminal{ - pixel_x = 32 - }, /obj/effect/floor_decal/corner/green{ dir = 6 }, +/obj/machinery/newscaster{ + pixel_x = 32 + }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "gBa" = ( @@ -17347,16 +17353,14 @@ }, /area/maintenance/wing/starboard/far) "izV" = ( -/obj/structure/extinguisher_cabinet{ - layer = 3.3; - pixel_x = 26 - }, -/obj/machinery/light{ - dir = 4 - }, /obj/effect/floor_decal/corner/green{ dir = 6 }, +/obj/machinery/firealarm/east, +/obj/machinery/disposal/small/west, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "iAB" = ( @@ -19769,12 +19773,13 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, /obj/effect/floor_decal/corner/grey{ dir = 6 }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/lino/grey, /area/horizon/kitchen/hallway) "jHd" = ( @@ -21641,13 +21646,12 @@ /turf/simulated/floor/reinforced, /area/horizon/secure_ammunition_storage) "kKM" = ( -/obj/machinery/disposal/small/west, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, /obj/effect/floor_decal/corner/green{ dir = 6 }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "kKO" = ( @@ -29943,16 +29947,13 @@ /turf/simulated/floor/tiled/dark/full, /area/engineering/engine_room) "oRn" = ( -/obj/machinery/disposal/small/east, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, /obj/effect/floor_decal/corner/grey{ dir = 9 }, -/obj/structure/extinguisher_cabinet{ - layer = 3.3; - pixel_x = -26 +/obj/machinery/firealarm/west, +/obj/machinery/disposal/small/east, +/obj/structure/disposalpipe/trunk{ + dir = 1 }, /turf/simulated/floor/lino/grey, /area/horizon/kitchen/hallway) @@ -33407,19 +33408,11 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/alarm{ - pixel_y = 40 - }, /obj/effect/floor_decal/corner/grey/full{ dir = 1 }, -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 +/obj/machinery/media/jukebox/audioconsole/wall{ + pixel_y = 32 }, /turf/simulated/floor/lino/grey, /area/horizon/kitchen/hallway) @@ -34190,11 +34183,11 @@ /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology) "qVJ" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "qVS" = ( @@ -36496,8 +36489,8 @@ /obj/effect/floor_decal/corner/grey{ dir = 10 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /turf/simulated/floor/lino/grey, /area/horizon/kitchen/hallway) @@ -38569,15 +38562,16 @@ /turf/simulated/floor/carpet/rubber, /area/server) "thY" = ( -/obj/machinery/orderterminal{ - pixel_x = -32 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /obj/effect/floor_decal/corner/grey{ dir = 9 }, +/obj/machinery/power/apc{ + dir = 8; + pixel_x = -24 + }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, /turf/simulated/floor/lino/grey, /area/horizon/kitchen/hallway) "tis" = ( @@ -38625,15 +38619,15 @@ /turf/simulated/floor/tiled, /area/operations/office) "tiF" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/machinery/light, -/obj/machinery/camera/network/service{ - c_tag = "Service- Hydroponics 2"; - dir = 1 +/obj/structure/bed/stool/padded/red, +/obj/effect/floor_decal/corner/grey{ + dir = 10 }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/dark, -/area/horizon/hydroponics) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/lino/grey, +/area/horizon/kitchen/hallway) "tiJ" = ( /obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor, /turf/simulated/floor/tiled/dark/full, @@ -40504,6 +40498,10 @@ /obj/effect/floor_decal/corner/green/full{ dir = 4 }, +/obj/structure/extinguisher_cabinet{ + layer = 3.3; + pixel_x = 32 + }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "ugp" = ( @@ -41215,12 +41213,10 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /obj/effect/floor_decal/corner/grey{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/lino/grey, /area/horizon/kitchen/hallway) "usK" = ( @@ -42080,6 +42076,10 @@ /obj/machinery/light{ dir = 8 }, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -28 + }, /turf/simulated/floor/lino/grey, /area/horizon/kitchen/hallway) "uOT" = ( @@ -44242,6 +44242,10 @@ /obj/effect/floor_decal/corner/grey{ dir = 10 }, +/obj/item/device/radio/intercom{ + dir = 1; + pixel_y = -24 + }, /turf/simulated/floor/tiled/dark, /area/horizon/hallway/deck_two/fore) "vSd" = ( @@ -45901,9 +45905,6 @@ /obj/effect/floor_decal/corner/grey/full{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, /turf/simulated/floor/lino/grey, /area/horizon/kitchen/hallway) "wDv" = ( @@ -48029,6 +48030,7 @@ /obj/effect/floor_decal/corner/grey{ dir = 5 }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/lino/grey, /area/horizon/kitchen/hallway) "xDR" = ( @@ -49569,11 +49571,8 @@ /turf/simulated/floor/tiled/dark/full, /area/turbolift/scc_ship/morgue_lift) "ylh" = ( -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-j2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "ylk" = ( @@ -69967,7 +69966,7 @@ pED pED pED pED -dQZ +pED pED pED fco @@ -70369,7 +70368,7 @@ xDI fOX fCS usD -fCS +usD jGa vNF rGX @@ -70565,10 +70564,10 @@ lgB maV maV asG -maV +cbK pED pFU -sbK +tiF pGu uws uws @@ -70767,8 +70766,8 @@ lgB maV maV asG -tiF -pED +maV +dQZ esy sbK oKf @@ -71171,7 +71170,7 @@ hMX gRr bpF asG -maV +gEf upP vxK rGj