diff --git a/code/__defines/machinery.dm b/code/__defines/machinery.dm
index 54f4528ce30..fefb784a616 100644
--- a/code/__defines/machinery.dm
+++ b/code/__defines/machinery.dm
@@ -32,6 +32,8 @@
 #define NETWORK_CRESCENT "Crescent"
 #define NETWORK_CIVILIAN_EAST "Civilian East"
 #define NETWORK_CIVILIAN_WEST "Civilian West"
+#define NETWORK_CIVILIAN_MAIN "Civilian Main"
+#define NETWORK_CIVILIAN_SURFACE "Civilian Surface"
 #define NETWORK_COMMAND "Command"
 #define NETWORK_ENGINE "Engine"
 #define NETWORK_ENGINEERING "Engineering"
@@ -52,6 +54,7 @@
 #define NETWORK_ALARM_POWER "Power Alarms"
 #define NETWORK_ALARM_FIRE "Fire Alarms"
 #define NETWORK_SUPPLY "Supply"
+#define NETWORK_SERVICE "Service"
 #define NETWORK_EXPEDITION "Expedition"
 #define NETWORK_CALYPSO "Calypso"
 #define NETWORK_POD "General Utility Pod"
diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm
index 811e18eb067..79d0736c50f 100644
--- a/code/game/machinery/camera/presets.dm
+++ b/code/game/machinery/camera/presets.dm
@@ -17,6 +17,18 @@ var/global/list/engineering_networks = list(
 /obj/machinery/camera/network/civilian_west
 	network = list(NETWORK_CIVILIAN_WEST)
 
+/obj/machinery/camera/network/civilian_main
+	network = list(NETWORK_CIVILIAN_MAIN)
+
+/obj/machinery/camera/network/civilian_surface
+	network = list(NETWORK_CIVILIAN_SURFACE)
+
+/obj/machinery/camera/network/supply
+	network = list(NETWORK_SUPPLY)
+
+/obj/machinery/camera/network/service
+	network = list(NETWORK_SERVICE)
+
 /obj/machinery/camera/network/command
 	network = list(NETWORK_COMMAND)
 
diff --git a/code/modules/modular_computers/file_system/programs/security/camera.dm b/code/modules/modular_computers/file_system/programs/security/camera.dm
index 0776b14f84b..5fa8f0e1764 100644
--- a/code/modules/modular_computers/file_system/programs/security/camera.dm
+++ b/code/modules/modular_computers/file_system/programs/security/camera.dm
@@ -18,7 +18,7 @@
 			return access_research
 		if(NETWORK_MINE,NETWORK_SUPPLY,NETWORK_CIVILIAN_WEST,NETWORK_EXPEDITION,NETWORK_CALYPSO,NETWORK_POD)
 			return access_mailsorting // Cargo office - all cargo staff should have access here.
-		if(NETWORK_COMMAND,NETWORK_TELECOM)
+		if(NETWORK_COMMAND,NETWORK_TELECOM,NETWORK_CIVILIAN_EAST,NETWORK_CIVILIAN_MAIN,NETWORK_CIVILIAN_SURFACE,NETWORK_SERVICE)
 			return access_heads
 		if(NETWORK_CRESCENT,NETWORK_ERT)
 			return access_cent_specops
diff --git a/html/changelogs/arrow768-cams.yml b/html/changelogs/arrow768-cams.yml
new file mode 100644
index 00000000000..a74cb6d749c
--- /dev/null
+++ b/html/changelogs/arrow768-cams.yml
@@ -0,0 +1,37 @@
+################################
+# 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
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#################################
+
+# Your name.  
+author: Arrow768
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - tweak: "Change the camera networks from  Civilian East / Civilian West to Civilian Main / Civilian Surface / Supply / Service"
diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm
index 256a9437aba..0bc2ba91242 100644
--- a/maps/aurora/aurora-3_sublevel.dmm
+++ b/maps/aurora/aurora-3_sublevel.dmm
@@ -26965,7 +26965,7 @@
 	pixel_x = 0;
 	pixel_y = -32
 	},
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/civilian_main{
 	c_tag = "Maintenance - Trash Compactor Crushers";
 	dir = 4
 	},
diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm
index 690f1c49e16..b99229849cc 100644
--- a/maps/aurora/aurora-4_mainlevel.dmm
+++ b/maps/aurora/aurora-4_mainlevel.dmm
@@ -17296,7 +17296,7 @@
 /obj/machinery/atm{
 	pixel_x = -32
 	},
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/civilian_main{
 	c_tag = "Starboard Corridor - Internal Affairs Entrance";
 	dir = 4
 	},
@@ -21753,10 +21753,10 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/civilian_main{
 	c_tag = "Starboard Corridor - Camera 4";
 	dir = 8;
-	network = list("Civilian West","Capt_Office")
+	network = list("Civilian Main","Capt_Office")
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/starboard)
@@ -25752,7 +25752,7 @@
 	name = "west bump";
 	pixel_x = -24
 	},
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/civilian_main{
 	c_tag = "Starboard Corridor - Camera 3";
 	dir = 4
 	},
@@ -27805,7 +27805,7 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/civilian_main{
 	c_tag = "Port Corridor - Engineering Entrance"
 	},
 /obj/effect/floor_decal/corner/yellow{
@@ -28141,7 +28141,7 @@
 /turf/simulated/floor/tiled,
 /area/hallway/primary/starboard)
 "aWe" = (
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/civilian_main{
 	c_tag = "Starboard Corridor - Camera 2"
 	},
 /turf/simulated/floor/tiled,
@@ -28237,7 +28237,7 @@
 /obj/machinery/newscaster{
 	pixel_y = -32
 	},
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/civilian_main{
 	c_tag = "Starboard Corridor - Store";
 	dir = 1
 	},
@@ -28322,7 +28322,7 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/civilian_main{
 	c_tag = "Bridge - Head of Personnel Processing";
 	dir = 1
 	},
@@ -28892,7 +28892,7 @@
 	icon_state = "tube1";
 	pixel_y = 0
 	},
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/civilian_main{
 	c_tag = "Port Corridor - Camera 2";
 	dir = 4
 	},
@@ -29722,7 +29722,7 @@
 /turf/simulated/floor/tiled,
 /area/hallway/primary/port)
 "aYy" = (
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/civilian_main{
 	c_tag = "Port Corridor - Camera 1";
 	dir = 1
 	},
@@ -29763,7 +29763,7 @@
 	pixel_y = -32
 	},
 /obj/machinery/light,
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/civilian_main{
 	c_tag = "Central Corridor - Security Entrance";
 	dir = 1
 	},
@@ -33401,7 +33401,7 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -32
 	},
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/civilian_main{
 	c_tag = "Central Corridor - Camera 7";
 	dir = 4
 	},
@@ -34991,7 +34991,7 @@
 	icon_state = "corner_white";
 	dir = 6
 	},
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/civilian_main{
 	c_tag = "Central Corridor - Camera 6";
 	dir = 8
 	},
@@ -40073,7 +40073,7 @@
 /turf/simulated/floor/tiled,
 /area/assembly/robotics)
 "bqa" = (
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/civilian_main{
 	c_tag = "Central Corridor - Camera 5";
 	dir = 1
 	},
@@ -41539,7 +41539,7 @@
 	dir = 10
 	},
 /obj/machinery/light,
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/civilian_main{
 	c_tag = "Central Corridor";
 	dir = 1
 	},
@@ -43057,7 +43057,7 @@
 /turf/simulated/floor/tiled/white,
 /area/rnd/research)
 "buJ" = (
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/civilian_main{
 	c_tag = "Central Corridor - Research Entrance";
 	dir = 4
 	},
@@ -43089,7 +43089,7 @@
 /turf/simulated/floor/holofloor/reinforced,
 /area/holodeck/alphadeck)
 "buM" = (
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/civilian_main{
 	c_tag = "Central Corridor - Medical Entrance";
 	dir = 8
 	},
@@ -44838,7 +44838,7 @@
 /turf/simulated/floor/tiled,
 /area/rnd/lab)
 "bxl" = (
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/civilian_main{
 	c_tag = "Central Corridor - Camera 4"
 	},
 /obj/effect/floor_decal/corner/mauve/full{
@@ -49222,7 +49222,7 @@
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_one)
 "bEy" = (
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/civilian_main{
 	c_tag = "Central Corridor - Camera 3";
 	dir = 8
 	},
@@ -50460,7 +50460,7 @@
 /turf/simulated/floor/tiled/white,
 /area/outpost/research/chemistry)
 "bGp" = (
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/civilian_main{
 	c_tag = "Central Corridor - Camera 1";
 	dir = 4
 	},
@@ -50530,7 +50530,7 @@
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_one)
 "bGu" = (
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/civilian_main{
 	c_tag = "Central Corridor - Camera 2";
 	dir = 8
 	},
@@ -51486,7 +51486,7 @@
 /obj/item/device/eftpos{
 	eftpos_name = "Library EFTPOS scanner"
 	},
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/service{
 	c_tag = "Library - Backroom";
 	dir = 8
 	},
@@ -51878,7 +51878,7 @@
 	icon_state = "tube1";
 	pixel_x = 0
 	},
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/service{
 	c_tag = "Library - Fore Camera";
 	dir = 8
 	},
@@ -53145,7 +53145,7 @@
 	name = "Station Intercom (General)";
 	pixel_x = -28
 	},
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/civilian_main{
 	c_tag = "Dormitories - Main Level";
 	dir = 4
 	},
@@ -53913,7 +53913,7 @@
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/locker/locker_toilet)
 "bMI" = (
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/civilian_main{
 	c_tag = "Main Level - Restrooms";
 	dir = 8
 	},
@@ -54152,7 +54152,7 @@
 	icon_state = "tube1";
 	pixel_y = 0
 	},
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/civilian_main{
 	c_tag = "Aft Corridor - Camera 3";
 	dir = 4
 	},
@@ -54710,7 +54710,7 @@
 	icon_state = "spline_fancy";
 	dir = 1
 	},
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/civilian_main{
 	c_tag = "Chapel - Office";
 	dir = 8
 	},
@@ -54801,7 +54801,7 @@
 	pixel_y = -27
 	},
 /obj/machinery/light,
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/service{
 	c_tag = "Library - Port Camera";
 	dir = 1
 	},
@@ -54843,7 +54843,7 @@
 /obj/structure/bed/chair/comfy/black{
 	dir = 1
 	},
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/service{
 	c_tag = "Library - Starboard Camera";
 	dir = 1
 	},
@@ -56453,7 +56453,7 @@
 	pixel_x = 30
 	},
 /obj/effect/floor_decal/corner/grey/diagonal,
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/service{
 	c_tag = "Kitchen - Food Preparation";
 	dir = 8
 	},
@@ -56464,7 +56464,7 @@
 /obj/machinery/light/small{
 	dir = 8
 	},
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/service{
 	c_tag = "Kitchen - Cold Storage";
 	dir = 4
 	},
@@ -57180,7 +57180,7 @@
 	icon_state = "tube1";
 	pixel_y = 0
 	},
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/service{
 	c_tag = "Hydroponics - Produce Storage";
 	dir = 4
 	},
@@ -57262,7 +57262,7 @@
 /area/hallway/primary/aft)
 "bTy" = (
 /obj/machinery/light,
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/civilian_main{
 	c_tag = "Aft Corridor - Camera 2";
 	dir = 1
 	},
@@ -57495,7 +57495,7 @@
 	dir = 4
 	},
 /obj/structure/disposalpipe/segment,
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/service{
 	c_tag = "Hydroponics - Greenhouse";
 	dir = 8
 	},
@@ -58170,7 +58170,7 @@
 	icon_state = "tube1";
 	pixel_y = 0
 	},
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/service{
 	c_tag = "Bar - Kitchen Counter";
 	dir = 4
 	},
@@ -58205,7 +58205,7 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/bar)
 "bVB" = (
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/service{
 	c_tag = "Bar - Dance Floor";
 	dir = 8
 	},
@@ -58394,7 +58394,7 @@
 /turf/simulated/floor/grass,
 /area/hydroponics)
 "bVX" = (
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/service{
 	c_tag = "Hydroponics - Animal Pen";
 	dir = 1
 	},
@@ -58632,7 +58632,7 @@
 /turf/simulated/floor/plating,
 /area/hydroponics)
 "bWr" = (
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/civilian_main{
 	c_tag = "Aft Corridor - Camera 1";
 	dir = 4
 	},
@@ -58696,7 +58696,7 @@
 	name = "Bar Shutters";
 	pixel_y = 36
 	},
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/service{
 	c_tag = "Bar - Counter"
 	},
 /obj/machinery/button/windowtint{
@@ -58973,7 +58973,7 @@
 /obj/machinery/alarm{
 	pixel_y = 23
 	},
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/supply{
 	c_tag = "Cargo - Main Lobby"
 	},
 /obj/machinery/atmospherics/unary/vent_pump/on,
@@ -59320,7 +59320,7 @@
 	icon_state = "tube1";
 	pixel_x = 0
 	},
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/service{
 	c_tag = "Bar - Backroom";
 	dir = 8
 	},
@@ -59800,7 +59800,7 @@
 /obj/structure/table/standard{
 	name = "plastic table frame"
 	},
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/supply{
 	c_tag = "Cargo - Main Desk";
 	dir = 4
 	},
@@ -59953,7 +59953,7 @@
 /obj/machinery/light/small{
 	dir = 8
 	},
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/civilian_main{
 	c_tag = "Civilian - Civilian Substation";
 	dir = 4
 	},
@@ -60096,7 +60096,7 @@
 /area/crew_quarters/bar)
 "bZi" = (
 /obj/machinery/vending/cigarette,
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/service{
 	c_tag = "Bar - Smoking Lounge"
 	},
 /turf/simulated/floor/wood,
@@ -60609,7 +60609,7 @@
 "caj" = (
 /obj/structure/table/wood,
 /obj/machinery/light/small,
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/service{
 	c_tag = "Bar - Diner Seating";
 	dir = 1
 	},
@@ -60830,7 +60830,7 @@
 	suffix = "#2"
 	},
 /obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/supply{
 	c_tag = "Cargo - MULE Storage";
 	dir = 8
 	},
@@ -60935,8 +60935,8 @@
 /turf/simulated/floor/tiled,
 /area/quartermaster/storage)
 "caL" = (
-/obj/machinery/camera/network/civilian_west{
-	c_tag = "Cargo - Camera 1";
+/obj/machinery/camera/network/supply{
+	c_tag = "Cargo - Warehouse Entrence";
 	dir = 1
 	},
 /obj/effect/floor_decal/corner/brown{
@@ -61704,7 +61704,7 @@
 "ccq" = (
 /obj/structure/table/standard,
 /obj/item/trash/tray,
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/supply{
 	c_tag = "Cargo - Break Room";
 	dir = 8
 	},
@@ -61764,7 +61764,7 @@
 	name = "west bump";
 	pixel_x = -24
 	},
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/civilian_main{
 	c_tag = "Maintenance - Trash Compactor Control";
 	dir = 4
 	},
@@ -62122,7 +62122,7 @@
 /area/quartermaster/storage)
 "cdb" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/camera/network/civilian_west{
+/obj/machinery/camera/network/supply{
 	c_tag = "Cargo - Main Warehouse";
 	dir = 1
 	},
diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm
index 6cc60c41b7e..3b86fbdcb14 100644
--- a/maps/aurora/aurora-6_surface.dmm
+++ b/maps/aurora/aurora-6_surface.dmm
@@ -1478,7 +1478,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Blue Dock Port";
 	dir = 4
 	},
@@ -1513,7 +1513,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
 	},
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Blue Dock Starboard";
 	dir = 8
 	},
@@ -2653,7 +2653,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Yellow Dock Fore"
 	},
 /obj/machinery/status_display{
@@ -2761,7 +2761,7 @@
 	icon_state = "tube1";
 	dir = 1
 	},
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Red Dock Fore"
 	},
 /obj/effect/floor_decal/corner/red{
@@ -4116,7 +4116,7 @@
 /obj/item/device/radio/intercom{
 	pixel_y = 27
 	},
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Arrivals Terminal Fore"
 	},
 /obj/effect/floor_decal/corner/lime{
@@ -6063,7 +6063,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Arrivals Terminal Incoming";
 	dir = 4
 	},
@@ -6115,8 +6115,8 @@
 	icon_state = "corner_white";
 	dir = 9
 	},
-/obj/machinery/camera/network/civilian_east{
-	c_tag = "Surface - Arrivals Terminal Flight Tower";
+/obj/machinery/camera/network/civilian_surface{
+	c_tag = "Surface - Arrivals Terminal Checkpoint";
 	dir = 4;
 	pixel_y = 0
 	},
@@ -6146,7 +6146,7 @@
 	icon_state = "tube1";
 	dir = 4
 	},
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Arrivals Terminal Outgoing";
 	dir = 8
 	},
@@ -6319,7 +6319,7 @@
 /area/hallway/secondary/entry/port)
 "lm" = (
 /obj/machinery/light,
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Yellow Dock Aft";
 	dir = 1
 	},
@@ -6494,7 +6494,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
 	},
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Red Dock Aft";
 	dir = 1
 	},
@@ -7357,7 +7357,7 @@
 /turf/simulated/floor/tiled,
 /area/hallway/secondary/entry/fore)
 "nd" = (
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Arrivals Terminal Aft";
 	dir = 1
 	},
@@ -8067,7 +8067,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Corridor Camera 11";
 	dir = 4
 	},
@@ -8611,7 +8611,7 @@
 	d2 = 8;
 	icon_state = "0-8"
 	},
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Vacant Office 2";
 	dir = 8
 	},
@@ -8652,7 +8652,7 @@
 /area/hallway/secondary/entry/fore)
 "py" = (
 /obj/structure/bed/chair/comfy/beige,
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Waiting Room";
 	dir = 8
 	},
@@ -8805,7 +8805,7 @@
 /area/security/vacantoffice)
 "pO" = (
 /obj/machinery/light,
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Vacant Office 1";
 	dir = 1
 	},
@@ -9193,7 +9193,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Primary Tool Storage Fore"
 	},
 /turf/simulated/floor/tiled,
@@ -9497,7 +9497,7 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Corridor Camera 10";
 	dir = 8
 	},
@@ -10120,7 +10120,7 @@
 	d2 = 2;
 	icon_state = "0-2"
 	},
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Cryostorage"
 	},
 /obj/effect/landmark{
@@ -10472,7 +10472,7 @@
 /obj/structure/table/standard,
 /obj/item/weapon/hand_labeler,
 /obj/machinery/light,
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Primary Tool Storage Aft";
 	dir = 1
 	},
@@ -10747,7 +10747,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Public Garden"
 	},
 /turf/simulated/floor/grass,
@@ -11735,7 +11735,7 @@
 /area/crew_quarters/locker)
 "vE" = (
 /obj/structure/reagent_dispensers/fueltank,
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Locker Rooms Fore"
 	},
 /turf/simulated/floor/tiled,
@@ -12779,7 +12779,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Corridor Camera 6";
 	dir = 4
 	},
@@ -12901,7 +12901,7 @@
 	dir = 4
 	},
 /obj/structure/disposalpipe/segment,
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Corridor Camera 7";
 	dir = 8
 	},
@@ -12917,7 +12917,7 @@
 	pixel_x = -22;
 	pixel_y = 0
 	},
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Corridor Camera 8";
 	dir = 4
 	},
@@ -12999,7 +12999,7 @@
 /turf/simulated/floor/beach/water/pool,
 /area/crew_quarters/fitness)
 "xR" = (
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Corridor Camera 7";
 	dir = 8
 	},
@@ -13341,7 +13341,7 @@
 /area/crew_quarters/fitness)
 "yz" = (
 /obj/structure/window/reinforced,
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Fitness Corridor";
 	dir = 1;
 	pixel_y = 6
@@ -13886,7 +13886,7 @@
 	icon_state = "tube1";
 	dir = 1
 	},
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Corridor Camera 5"
 	},
 /turf/simulated/floor/tiled,
@@ -14076,7 +14076,7 @@
 /obj/item/device/radio/intercom{
 	pixel_x = -32
 	},
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Locker Rooms Washing";
 	dir = 4
 	},
@@ -14319,7 +14319,7 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Lifeguard";
 	pixel_y = 0
 	},
@@ -14672,7 +14672,7 @@
 	name = "south bump";
 	pixel_y = -24
 	},
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Locker Rooms Aft";
 	dir = 1
 	},
@@ -14805,7 +14805,7 @@
 "Be" = (
 /obj/structure/bed/padded,
 /obj/item/weapon/bedsheet/mime,
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Dormitories Fore";
 	pixel_y = 0
 	},
@@ -14929,7 +14929,7 @@
 	d2 = 2;
 	icon_state = "0-2"
 	},
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Auxiliary Tool Storage"
 	},
 /turf/simulated/floor/tiled,
@@ -15012,7 +15012,7 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Restrooms";
 	dir = 8
 	},
@@ -15330,7 +15330,7 @@
 	name = "east bump";
 	pixel_x = 24
 	},
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Holodeck Storage";
 	dir = 8
 	},
@@ -15395,7 +15395,7 @@
 	dir = 8
 	},
 /obj/structure/disposalpipe/segment,
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Corridor Camera 4";
 	dir = 4
 	},
@@ -15756,7 +15756,7 @@
 "Dk" = (
 /obj/structure/bed/padded,
 /obj/item/weapon/bedsheet/mime,
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Dormitories Aft";
 	dir = 1
 	},
@@ -15846,7 +15846,7 @@
 	icon_state = "tube1";
 	dir = 4
 	},
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Corridor Camera 3";
 	dir = 8
 	},
@@ -15993,7 +15993,7 @@
 "DJ" = (
 /obj/effect/decal/cleanable/generic,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Custodial Closet"
 	},
 /turf/simulated/floor/plating,
@@ -16006,7 +16006,7 @@
 /area/hallway/secondary/entry/aft)
 "DL" = (
 /obj/structure/disposalpipe/segment,
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Corridor Camera 9";
 	dir = 4
 	},
@@ -16394,7 +16394,7 @@
 /turf/simulated/floor/plating,
 /area/quartermaster/loading)
 "Ez" = (
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/supply{
 	c_tag = "Cargo - Loading Bay 2";
 	dir = 4
 	},
@@ -16593,7 +16593,7 @@
 /area/quartermaster/loading)
 "EY" = (
 /obj/machinery/vending/snack,
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/supply{
 	c_tag = "Cargo - Auxilliary Entrance";
 	dir = 4
 	},
@@ -17261,7 +17261,7 @@
 /area/hallway/secondary/entry/aft)
 "FY" = (
 /obj/machinery/light,
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Corridor Camera 1";
 	dir = 1
 	},
@@ -17365,7 +17365,7 @@
 	pixel_x = 25;
 	pixel_y = 0
 	},
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/supply{
 	c_tag = "Cargo - Equipment Storage";
 	dir = 8
 	},
@@ -17725,7 +17725,7 @@
 /turf/simulated/floor/tiled,
 /area/quartermaster/loading)
 "GS" = (
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/supply{
 	c_tag = "Cargo - Loading Bay 1";
 	dir = 8
 	},
@@ -17809,7 +17809,7 @@
 /area/quartermaster/qm)
 "GZ" = (
 /obj/structure/disposalpipe/segment,
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/supply{
 	c_tag = "Cargo - Quartermaster's Office";
 	dir = 8
 	},
@@ -18623,7 +18623,7 @@
 /turf/simulated/wall,
 /area/quartermaster/loading)
 "Ip" = (
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/supply{
 	c_tag = "Cargo - Mail Room";
 	dir = 4
 	},
diff --git a/maps/aurora/aurora-7_roof.dmm b/maps/aurora/aurora-7_roof.dmm
index fd83eefe6ae..1477e82a658 100644
--- a/maps/aurora/aurora-7_roof.dmm
+++ b/maps/aurora/aurora-7_roof.dmm
@@ -1425,7 +1425,7 @@
 	icon_state = "tube1";
 	pixel_y = 0
 	},
-/obj/machinery/camera/network/civilian_east{
+/obj/machinery/camera/network/civilian_surface{
 	c_tag = "Surface - Arrivals Terminal Flight Tower";
 	dir = 4;
 	pixel_y = 0
diff --git a/maps/aurora/code/aurora.dm b/maps/aurora/code/aurora.dm
index 543533bf78f..c7bb75f6f81 100644
--- a/maps/aurora/code/aurora.dm
+++ b/maps/aurora/code/aurora.dm
@@ -36,8 +36,8 @@
 	command_spawn_message = "Welcome to the Odin! Simply proceed down and to the right to board the shuttle to your workplace!"
 
 	station_networks = list(
-		NETWORK_CIVILIAN_EAST,
-		NETWORK_CIVILIAN_WEST,
+		NETWORK_CIVILIAN_MAIN,
+		NETWORK_CIVILIAN_SURFACE,
 		NETWORK_COMMAND,
 		NETWORK_ENGINE,
 		NETWORK_ENGINEERING,
@@ -49,7 +49,9 @@
 		NETWORK_RESEARCH_OUTPOST,
 		NETWORK_ROBOTS,
 		NETWORK_PRISON,
-		NETWORK_SECURITY
+		NETWORK_SECURITY,
+		NETWORK_SERVICE,
+		NETWORK_SUPPLY
 	)
 
 	shuttle_docked_message = "The scheduled Crew Transfer Shuttle to %dock% has docked with the station. It will depart in approximately %ETA% minutes."