From dd37b014d4672ee8c4d4e3a17f54b924832be33e Mon Sep 17 00:00:00 2001
From: Casper3667 <CasperMC@hotmail.dk>
Date: Sat, 31 Jul 2021 12:47:48 +0200
Subject: [PATCH] Fixes some cameras and adds lights to the brig control room
 (#12234)

---
 html/changelogs/CameraFixes.yml    |  8 ++++++++
 maps/aurora/aurora-3_sublevel.dmm  |  8 ++++----
 maps/aurora/aurora-4_mainlevel.dmm | 26 +++++++++++++++++++-------
 3 files changed, 31 insertions(+), 11 deletions(-)
 create mode 100644 html/changelogs/CameraFixes.yml

diff --git a/html/changelogs/CameraFixes.yml b/html/changelogs/CameraFixes.yml
new file mode 100644
index 00000000000..813ec6664c4
--- /dev/null
+++ b/html/changelogs/CameraFixes.yml
@@ -0,0 +1,8 @@
+author: TheGreyWolf
+
+delete-after: True
+
+changes:
+  - maptweak: "The sublevel crusher camera was moved up one to allow full view of the crusher contents."
+  - maptweak: "Put the bar booth, brig shower and the lower hallway outside the diner's cameras on the proper networks."
+  - maptweak: "Brig control room lights near the windoor was moved one to the right, and another added opposite from it."
diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm
index 4f53ece6f8a..2563563d666 100644
--- a/maps/aurora/aurora-3_sublevel.dmm
+++ b/maps/aurora/aurora-3_sublevel.dmm
@@ -23731,6 +23731,10 @@
 /obj/machinery/light/small/emergency{
 	dir = 8
 	},
+/obj/machinery/camera/network/supply{
+	c_tag = "Cargo - Disposals, Lower";
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/maintenance/disposal)
 "bcb" = (
@@ -23745,10 +23749,6 @@
 /obj/item/modular_computer/telescreen/preset/trashcompactor{
 	pixel_x = -32
 	},
-/obj/machinery/camera/network/supply{
-	c_tag = "Cargo - Disposals, Lower";
-	dir = 4
-	},
 /turf/simulated/floor/tiled,
 /area/maintenance/disposal)
 "bce" = (
diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm
index 8207ff92533..e6bd270939f 100644
--- a/maps/aurora/aurora-4_mainlevel.dmm
+++ b/maps/aurora/aurora-4_mainlevel.dmm
@@ -20590,9 +20590,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/light{
-	dir = 1
-	},
 /obj/machinery/camera/network/security{
 	c_tag = "Security - Lobby Desk"
 	},
@@ -23736,6 +23733,7 @@
 /obj/structure/table/standard,
 /obj/item/folder/sec,
 /obj/item/paper_scanner,
+/obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/security/brig/control_room)
 "aPg" = (
@@ -23770,7 +23768,8 @@
 	},
 /obj/machinery/camera/network/security{
 	c_tag = "Security - Communal Bathroom";
-	dir = 4
+	dir = 4;
+	network = list("Prison")
 	},
 /turf/simulated/floor/tiled/freezer,
 /area/security/prison)
@@ -53959,7 +53958,8 @@
 /obj/structure/table/wood,
 /obj/machinery/camera/network/civilian_main{
 	c_tag = "Bar - Booths";
-	dir = 1
+	dir = 1;
+	network = list("Service")
 	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/bar)
@@ -68846,6 +68846,18 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/vault)
+"uiJ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/tiled,
+/area/security/brig/control_room)
 "ujv" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -69431,7 +69443,7 @@
 /obj/machinery/camera/network/civilian_main{
 	c_tag = "Aft Corridor - Camera 2";
 	dir = 8;
-	network = list("Service")
+	network = list("Civilian Main")
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/aft)
@@ -101452,7 +101464,7 @@ omB
 aEm
 aGk
 aIq
-aJJ
+uiJ
 ntc
 aNp
 aPf