diff --git a/html/changelogs/fabiank3-map-fixes.yml b/html/changelogs/fabiank3-map-fixes.yml
new file mode 100644
index 00000000000..455be651719
--- /dev/null
+++ b/html/changelogs/fabiank3-map-fixes.yml
@@ -0,0 +1,8 @@
+author: FabianK3
+
+delete-after: True
+
+changes:
+ - bugfix: "Fixed misconfigured safety shutters in the bridge conference room. All shutters around the bridge now listen to the same command."
+ - qol: "Added a bridge safety shutters button to bridge break room."
+ - bugfix: "Removed duplicate lightswitch in security interrogations."
diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm
index eb24923d409..43e6f670341 100644
--- a/maps/sccv_horizon/sccv_horizon.dmm
+++ b/maps/sccv_horizon/sccv_horizon.dmm
@@ -22814,18 +22814,17 @@
/obj/effect/floor_decal/spline/fancy/wood{
dir = 6
},
-/obj/machinery/button/remote/blast_door{
- dir = 9;
- id = "conferencesafetyshutters";
- name = "Conference Room Shutters";
- pixel_x = -26;
- pixel_y = 8;
- req_access = list(19)
- },
/obj/machinery/light_switch{
dir = 5;
pixel_x = -26
},
+/obj/machinery/button/remote/blast_door{
+ dir = 9;
+ id = "shutters_deck3_bridgesafety";
+ name = "Bridge Safety Shutters";
+ pixel_x = -26;
+ pixel_y = 8
+ },
/turf/simulated/floor/carpet,
/area/horizon/command/bridge/meeting_room)
"cZt" = (
@@ -57456,7 +57455,7 @@
/obj/structure/cable/green,
/obj/machinery/door/blast/shutters/open{
dir = 4;
- id = "conferencesafetyshutters";
+ id = "shutters_deck3_bridgesafety";
name = "Safety Shutter"
},
/obj/machinery/door/firedoor{
@@ -64965,7 +64964,13 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/light_switch{
dir = 8;
- pixel_x = -19
+ pixel_x = -20
+ },
+/obj/machinery/button/remote/blast_door{
+ dir = 9;
+ id = "shutters_deck3_bridgesafety";
+ name = "Bridge Safety Shutters";
+ pixel_x = -29
},
/turf/simulated/floor/wood,
/area/horizon/command/bridge/minibar)
@@ -69293,7 +69298,7 @@
/obj/structure/window/shuttle/scc_space_ship,
/obj/machinery/door/blast/shutters/open{
dir = 4;
- id = "conferencesafetyshutters";
+ id = "shutters_deck3_bridgesafety";
name = "Safety Shutter"
},
/obj/machinery/door/firedoor{
@@ -70006,7 +70011,7 @@
},
/obj/machinery/door/blast/shutters/open{
dir = 4;
- id = "conferencesafetyshutters";
+ id = "shutters_deck3_bridgesafety";
name = "Safety Shutter"
},
/obj/machinery/door/firedoor{
@@ -80271,7 +80276,7 @@
},
/obj/machinery/door/blast/shutters/open{
dir = 2;
- id = "conferencesafetyshutters";
+ id = "shutters_deck3_bridgesafety";
name = "Safety Shutter"
},
/turf/simulated/floor/plating,
@@ -92358,9 +92363,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
-/obj/machinery/light_switch/east{
- pixel_y = 30
- },
/turf/simulated/floor/tiled/dark,
/area/horizon/security/interrogation)
"mjJ" = (
@@ -100675,7 +100677,7 @@
},
/obj/machinery/door/blast/shutters/open{
dir = 4;
- id = "conferencesafetyshutters";
+ id = "shutters_deck3_bridgesafety";
name = "Safety Shutter"
},
/obj/machinery/door/firedoor{
@@ -121080,6 +121082,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
dir = 4
},
+/obj/structure/lattice/catwalk/indoor/grate/dark,
/turf/simulated/floor/plating,
/area/horizon/maintenance/deck_1/main/starboard)
"qfo" = (