diff --git a/html/changelogs/sleepygemmy-hydroponics_labeller.yml b/html/changelogs/sleepygemmy-hydroponics_labeller.yml
new file mode 100644
index 00000000000..c638b40bf64
--- /dev/null
+++ b/html/changelogs/sleepygemmy-hydroponics_labeller.yml
@@ -0,0 +1,6 @@
+author: SleepyGemmy
+
+delete-after: True
+
+changes:
+ - maptweak: "Added a labeller to hydroponics and a audioconsole."
diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
index 4ef73f73e9f..afc8b615f22 100644
--- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
+++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm
@@ -22034,9 +22034,6 @@
/turf/simulated/wall,
/area/maintenance/substation/security)
"pAP" = (
-/obj/effect/landmark/start{
- name = "Gardener"
- },
/obj/effect/floor_decal/corner/green/full,
/obj/effect/floor_decal/spline/plain{
dir = 10
@@ -24755,6 +24752,7 @@
/obj/machinery/light/small{
dir = 8
},
+/obj/item/device/hand_labeler,
/turf/simulated/floor/tiled/dark/full,
/area/horizon/hydroponics/lower)
"rtC" = (
@@ -27277,9 +27275,6 @@
/turf/simulated/floor/plating,
/area/maintenance/operations)
"tlt" = (
-/obj/effect/landmark/start{
- name = "Gardener"
- },
/obj/effect/floor_decal/corner/green/full{
dir = 8
},
diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
index 9c753a28f2d..1d0ee8163ae 100644
--- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
+++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
@@ -2054,6 +2054,9 @@
},
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/seed_extractor,
+/obj/machinery/media/jukebox/audioconsole/wall{
+ pixel_y = 32
+ },
/turf/simulated/floor/tiled/dark/full,
/area/horizon/hydroponics)
"aUh" = (
@@ -3086,6 +3089,9 @@
pixel_x = -35;
pixel_y = -7
},
+/obj/effect/landmark/start{
+ name = "Gardener"
+ },
/turf/simulated/floor/tiled,
/area/horizon/hydroponics)
"buG" = (
@@ -7971,6 +7977,11 @@
c_tag = "Service - Deck 2 - Booth 1";
dir = 4
},
+/obj/machinery/alarm{
+ req_one_access = list(24,11,55);
+ dir = 4;
+ pixel_x = -28
+ },
/turf/simulated/floor/carpet/red,
/area/horizon/crew_quarters/lounge/bar)
"dVw" = (
@@ -10910,10 +10921,7 @@
/obj/effect/floor_decal/spline/fancy/wood{
dir = 6
},
-/obj/item/device/radio/intercom{
- dir = 1;
- pixel_y = -24
- },
+/obj/structure/bed/stool/bar/padded/black,
/turf/simulated/floor/wood,
/area/horizon/crew_quarters/lounge/bar)
"ftS" = (
@@ -11196,20 +11204,18 @@
/area/engineering/locker_room)
"fCE" = (
/obj/effect/floor_decal/spline/fancy/wood,
-/obj/machinery/firealarm/south,
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/floor_decal/spline/fancy/wood/corner{
dir = 4
},
-/obj/machinery/button/remote/blast_door{
- dir = 1;
- id = "lounge_window_shutters";
- name = "Viewing Shutters";
- pixel_y = -37
- },
/obj/machinery/light,
+/obj/machinery/alarm{
+ pixel_y = -28;
+ req_one_access = list(24,11,55);
+ dir = 1
+ },
/turf/simulated/floor/wood,
/area/horizon/crew_quarters/lounge/bar)
"fCI" = (
@@ -13198,14 +13204,9 @@
/turf/simulated/floor/tiled,
/area/engineering/storage_eva)
"gsY" = (
+/obj/machinery/door/firedoor,
/obj/structure/grille/diagonal,
/obj/structure/window/shuttle/scc_space_ship,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/blast/shutters/open{
- dir = 2;
- id = "lounge_window_shutters";
- name = "lounge window shutter"
- },
/turf/simulated/floor/reinforced,
/area/horizon/crew_quarters/lounge/bar)
"gtk" = (
@@ -15719,6 +15720,9 @@
/obj/effect/floor_decal/spline/plain{
dir = 4
},
+/obj/effect/landmark/start{
+ name = "Gardener"
+ },
/turf/simulated/floor/tiled,
/area/horizon/hydroponics)
"hBJ" = (
@@ -20024,6 +20028,13 @@
dir = 1;
icon_state = "pipe-c"
},
+/obj/machinery/firealarm/south,
+/obj/machinery/button/remote/blast_door{
+ dir = 1;
+ id = "lounge_window_shutters";
+ name = "Viewing Shutters";
+ pixel_y = -37
+ },
/turf/simulated/floor/wood,
/area/horizon/crew_quarters/lounge/bar)
"jEq" = (
@@ -21643,16 +21654,11 @@
/turf/simulated/floor/tiled,
/area/horizon/security/brig)
"kvd" = (
+/obj/machinery/door/firedoor,
/obj/structure/grille/diagonal{
dir = 4
},
/obj/structure/window/shuttle/scc_space_ship,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/blast/shutters/open{
- dir = 2;
- id = "lounge_window_shutters";
- name = "lounge window shutter"
- },
/turf/simulated/floor/reinforced,
/area/horizon/crew_quarters/lounge/bar)
"kvs" = (
@@ -26235,6 +26241,15 @@
},
/turf/simulated/floor/tiled,
/area/operations/office)
+"mKD" = (
+/obj/machinery/door/blast/shutters/open{
+ dir = 2;
+ id = "shutters_deck2_hydroponicswindows";
+ name = "Window Shutter"
+ },
+/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
+/turf/simulated/floor/tiled/dark/full,
+/area/horizon/hydroponics)
"mKJ" = (
/obj/effect/floor_decal/corner_wide/yellow{
dir = 10
@@ -28481,6 +28496,17 @@
/obj/machinery/door/firedoor,
/turf/simulated/floor/plating,
/area/maintenance/wing/starboard)
+"nKX" = (
+/obj/structure/bed/stool/chair/padded/red{
+ dir = 8
+ },
+/obj/machinery/alarm{
+ req_one_access = list(24,11,55);
+ dir = 8;
+ pixel_x = 28
+ },
+/turf/simulated/floor/carpet/red,
+/area/horizon/crew_quarters/lounge/bar)
"nLg" = (
/obj/machinery/porta_turret/stationary{
req_access = list(19);
@@ -29200,6 +29226,17 @@
dir = 8
},
/area/maintenance/wing/starboard)
+"ogf" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/blast/shutters/open{
+ dir = 8;
+ id = "lounge_window_shutters";
+ name = "Lounge Window Shutter"
+ },
+/obj/structure/grille,
+/obj/structure/window/shuttle/scc_space_ship,
+/turf/simulated/floor/plating,
+/area/horizon/crew_quarters/lounge/bar)
"ogu" = (
/obj/effect/floor_decal/corner/green{
dir = 6
@@ -29467,7 +29504,6 @@
/area/hallway/engineering)
"oml" = (
/obj/effect/floor_decal/spline/fancy/wood/corner,
-/obj/structure/bed/stool/bar/padded/black,
/turf/simulated/floor/wood,
/area/horizon/crew_quarters/lounge/bar)
"omA" = (
@@ -32909,9 +32945,9 @@
},
/obj/machinery/camera/network/service{
c_tag = "Service - Deck 2 - Dining Hall 2";
- dir = 1
+ dir = 4
},
-/obj/structure/table/rack/fancy_table/black,
+/obj/structure/synthesized_instrument/synthesizer/piano,
/turf/simulated/floor/wood,
/area/horizon/crew_quarters/lounge/bar)
"qaf" = (
@@ -42853,10 +42889,6 @@
/obj/structure/cable/green{
icon_state = "2-4"
},
-/obj/machinery/alarm{
- pixel_y = 28;
- req_one_access = list(24,11,55)
- },
/obj/structure/disposalpipe/junction{
dir = 4
},
@@ -43415,17 +43447,17 @@
/turf/simulated/floor/tiled/full,
/area/horizon/security/armoury)
"vgh" = (
-/obj/structure/grille,
/obj/machinery/door/firedoor,
-/obj/structure/window/shuttle/scc_space_ship,
-/obj/machinery/door/blast/shutters/open{
- dir = 2;
- id = "lounge_window_shutters";
- name = "lounge window shutter"
- },
/obj/effect/landmark/entry_point/fore{
name = "fore, dining hall"
},
+/obj/machinery/door/blast/shutters/open{
+ dir = 2;
+ id = "lounge_window_shutters";
+ name = "Lounge Window Shutter"
+ },
+/obj/structure/grille,
+/obj/structure/window/shuttle/scc_space_ship,
/turf/simulated/floor/plating,
/area/horizon/crew_quarters/lounge/bar)
"vgt" = (
@@ -43770,14 +43802,14 @@
/turf/simulated/floor/tiled,
/area/horizon/security/hallway)
"vtX" = (
-/obj/structure/grille,
/obj/machinery/door/firedoor,
-/obj/structure/window/shuttle/scc_space_ship,
/obj/machinery/door/blast/shutters/open{
dir = 2;
id = "lounge_window_shutters";
- name = "lounge window shutter"
+ name = "Lounge Window Shutter"
},
+/obj/structure/grille,
+/obj/structure/window/shuttle/scc_space_ship,
/turf/simulated/floor/plating,
/area/horizon/crew_quarters/lounge/bar)
"vua" = (
@@ -43883,7 +43915,10 @@
/obj/effect/floor_decal/spline/fancy/wood{
dir = 8
},
-/obj/structure/synthesized_instrument/synthesizer/piano,
+/obj/structure/table/rack/fancy_table/black,
+/obj/machinery/light{
+ dir = 8
+ },
/turf/simulated/floor/wood,
/area/horizon/crew_quarters/lounge/bar)
"vxe" = (
@@ -44301,13 +44336,14 @@
/obj/effect/floor_decal/spline/fancy/wood{
dir = 8
},
-/obj/machinery/light{
- dir = 8
- },
/obj/machinery/disposal/small/east,
/obj/structure/disposalpipe/trunk{
dir = 4
},
+/obj/item/device/radio/intercom{
+ dir = 4;
+ pixel_x = -24
+ },
/turf/simulated/floor/wood,
/area/horizon/crew_quarters/lounge/bar)
"vHl" = (
@@ -44501,6 +44537,17 @@
/obj/effect/floor_decal/industrial/warning,
/turf/simulated/floor/tiled/dark/full,
/area/turbolift/scc_ship/morgue_lift)
+"vKP" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/blast/shutters/open{
+ dir = 4;
+ id = "lounge_window_shutters";
+ name = "Lounge Window Shutter"
+ },
+/obj/structure/grille,
+/obj/structure/window/shuttle/scc_space_ship,
+/turf/simulated/floor/plating,
+/area/horizon/crew_quarters/lounge/bar)
"vLu" = (
/obj/structure/closet/secure_closet/guncabinet/sci,
/obj/effect/floor_decal/industrial/outline/yellow,
@@ -46587,6 +46634,17 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/dark,
/area/horizon/zta)
+"wDX" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/blast/shutters/open{
+ dir = 2;
+ id = "lounge_window_shutters";
+ name = "Lounge Window Shutter"
+ },
+/obj/structure/grille,
+/obj/structure/window/shuttle/scc_space_ship/cardinal,
+/turf/simulated/floor/plating,
+/area/horizon/crew_quarters/lounge/bar)
"wEc" = (
/obj/machinery/door/blast/shutters/open{
dir = 2;
@@ -69251,7 +69309,7 @@ nNF
vGT
vwx
pZX
-eeQ
+wDX
xVu
cbK
cbK
@@ -69453,7 +69511,7 @@ uTY
gRh
oml
ftB
-eeQ
+wDX
tMp
xXW
gNm
@@ -69656,7 +69714,7 @@ hQI
jDZ
sKJ
eeQ
-vtX
+ogf
kvd
xVu
qgN
@@ -71069,7 +71127,7 @@ usD
jGa
vNF
rGX
-kRB
+nKX
kRB
vtX
xVu
@@ -71272,7 +71330,7 @@ upP
rRS
upP
mPl
-vtX
+vKP
gsY
xVu
qgN
@@ -71867,7 +71925,7 @@ maV
maV
qZb
gEf
-dvw
+mKD
uPW
vxK
rGj