Merge pull request #8805 from PsiOmegaDelta/Engineering

Area/Camera network refactor - Part 3

code/game/area/Space Station 13 areas.dm

@@ -873,27 +873,27 @@ area/space/atmosalert()
 	music = null
 
 /area/crew_quarters/captain
-	name = "\improper Captain's Office"
+	name = "\improper Command - Captain's Office"
 	icon_state = "captain"
 
 /area/crew_quarters/heads/hop
-	name = "\improper Head of Personnel's Office"
+	name = "\improper Command - HoP's Office"
 	icon_state = "head_quarters"
 
 /area/crew_quarters/heads/hor
-	name = "\improper Research Director's Office"
+	name = "\improper Research - RD's Office"
 	icon_state = "head_quarters"
 
 /area/crew_quarters/heads/chief
-	name = "\improper Chief Engineer's Office"
+	name = "\improper Engineering - CE's Office"
 	icon_state = "head_quarters"
 
 /area/crew_quarters/heads/hos
-	name = "\improper Head of Security's Office"
+	name = "\improper Security - HoS' Office"
 	icon_state = "head_quarters"
 
 /area/crew_quarters/heads/cmo
-	name = "\improper Chief Medical Officer's Office"
+	name = "\improper Medbay - CMO's Office"
 	icon_state = "head_quarters"
 
 /area/crew_quarters/courtroom
@@ -1085,7 +1085,7 @@ area/space/atmosalert()
 	icon_state = "atmos_storage"
 
 /area/engineering/drone_fabrication
-	name = "\improper Drone Fabrication"
+	name = "\improper Engineering Drone Fabrication"
 	icon_state = "drone_fab"
 
 /area/engineering/engine_smes
@@ -1171,23 +1171,23 @@ area/space/atmosalert()
 		icon_state = "panelsP"
 
 /area/maintenance/auxsolarport
-	name = "Fore Port Solar Maintenance"
+	name = "Solar Maintenance - Fore Port"
 	icon_state = "SolarcontrolP"
 
 /area/maintenance/starboardsolar
-	name = "Aft Starboard Solar Maintenance"
+	name = "Solar Maintenance - Aft Starboard"
 	icon_state = "SolarcontrolS"
 
 /area/maintenance/portsolar
-	name = "Aft Port Solar Maintenance"
+	name = "Solar Maintenance - Aft Port"
 	icon_state = "SolarcontrolP"
 
 /area/maintenance/auxsolarstarboard
-	name = "Fore Starboard Solar Maintenance"
+	name = "Solar Maintenance - Fore Starboard"
 	icon_state = "SolarcontrolS"
 
 /area/maintenance/foresolar
-	name = "Fore Solar Maintenance"
+	name = "Solar Maintenance - Fore"
 	icon_state = "SolarcontrolA"
 
 /area/assembly/chargebay

code/game/machinery/camera/presets.dm

@@ -1,14 +1,49 @@
 // PRESETS
-var/global/list/station_networks = list("SS13","Civilian West","Engineering Outpost","MINE","Research Outpost","Prison","Security")
+#define NETWORK_CIVILIAN_WEST "Civilian West"
+#define NETWORK_ENGINE "Engine"
+#define NETWORK_ENGINEERING "Engineering"
+#define NETWORK_ENGINEERING_OUTPOST "Engineering Outpost"
+#define NETWORK_MINE "MINE"
+#define NETWORK_RESEARCH_OUTPOST "Research Outpost"
+#define NETWORK_PRISON "Prison"
+#define NETWORK_SECURITY "Security"
+
+var/global/list/station_networks = list(
+										"SS13",
+										NETWORK_CIVILIAN_WEST,
+										NETWORK_ENGINE,
+										NETWORK_ENGINEERING,
+										NETWORK_ENGINEERING_OUTPOST,
+										NETWORK_MINE,
+										NETWORK_RESEARCH_OUTPOST,
+										NETWORK_PRISON,
+										NETWORK_SECURITY
+										)
+var/global/list/engineering_networks = list(
+										NETWORK_ENGINE,
+										NETWORK_ENGINEERING,
+										NETWORK_ENGINEERING_OUTPOST,
+										"Atmosphere Alarms",
+										"Fire Alarms",
+										"Power Alarms")
 
 /obj/machinery/camera/network/civilian_west
-	network = list("Civilian West")
+	network = list(NETWORK_CIVILIAN_WEST)
+
+/obj/machinery/camera/network/engine
+	network = list(NETWORK_ENGINE)
+
+/obj/machinery/camera/network/engineering
+	network = list(NETWORK_ENGINEERING)
+
+/obj/machinery/camera/network/engineering_outpost
+	network = list(NETWORK_ENGINEERING_OUTPOST)
 
 /obj/machinery/camera/network/prison
-	network = list("Prison")
+	network = list(NETWORK_PRISON)
 
 /obj/machinery/camera/network/security
-	network = list("Security")
+	network = list(NETWORK_SECURITY)
 
 // EMP
 
@@ -42,19 +77,25 @@ var/global/list/station_networks = list("SS13","Civilian West","Engineering Outp
 // AUTONAME
 
 /obj/machinery/camera/autoname/civilian_west
-	network = list("Civilian West")
+	network = list(NETWORK_CIVILIAN_WEST)
+
+/obj/machinery/camera/autoname/engine
+	network = list(NETWORK_ENGINE)
+
+/obj/machinery/camera/autoname/engineering
+	network = list(NETWORK_ENGINEERING)
 
 /obj/machinery/camera/autoname/engineering_outpost
-	network = list("Engineering Outpost")
+	network = list(NETWORK_ENGINEERING_OUTPOST)
 
 /obj/machinery/camera/autoname/mining_outpost
-	network = list("MINE")
+	network = list(NETWORK_MINE)
 
 /obj/machinery/camera/autoname/research_outpost
-	network = list("Research Outpost")
+	network = list(NETWORK_RESEARCH_OUTPOST)
 
 /obj/machinery/camera/autoname/security
-	network = list("Security")
+	network = list(NETWORK_SECURITY)
 
 /obj/machinery/camera/autoname
 	var/number = 0 //camera number in area
@@ -73,6 +114,7 @@ var/global/list/station_networks = list("SS13","Civilian West","Engineering Outp
 					if(C.number)
 						number = max(number, C.number+1)
 			c_tag = "[A.name] #[number]"
+		invalidateCameraCache()
 
 
 // CHECKS
@@ -113,3 +155,12 @@ var/global/list/station_networks = list("SS13","Civilian West","Engineering Outp
 	if (isMotion())
 		mult++
 	active_power_usage = mult*initial(active_power_usage)
+
+#undef NETWORK_CIVILIAN_WEST
+#undef NETWORK_ENGINE
+#undef NETWORK_ENGINEERING
+#undef NETWORK_ENGINEERING_OUTPOST
+#undef NETWORK_MINE
+#undef NETWORK_RESEARCH_OUTPOST
+#undef NETWORK_PRISON
+#undef NETWORK_SECURITY

code/game/machinery/computer/camera.dm

@@ -240,9 +240,13 @@
 	name = "engineering camera monitor"
 	desc = "Used to monitor fires and breaches."
 	icon_state = "engineeringcameras"
-	network = list("Engineering","Engineering Outpost","Power Alarms","Atmosphere Alarms","Fire Alarms")
 	circuit = /obj/item/weapon/circuitboard/security/engineering
 
+/obj/machinery/computer/security/engineering/New()
+	if(!network)
+		network = engineering_networks
+	..()
+
 /obj/machinery/computer/security/nuclear
 	name = "head mounted camera monitor"
 	desc = "Used to access the built-in cameras in helmets."

code/game/machinery/computer/station_alert.dm

@@ -4,13 +4,17 @@
 	desc = "Used to access the station's automated alert system."
 	icon_state = "alert:0"
 	circuit = "/obj/item/weapon/circuitboard/stationalert"
-	var/alarms = list("Fire"=list(), "Atmosphere"=list(), "Power"=list())
+	var/obj/nano_module/alarm_monitor/alarm_monitor
-	var/obj/nano_module/alarm_monitor/engineering/alarm_monitor
+	var/monitor_type = /obj/nano_module/alarm_monitor/engineering
+
+/obj/machinery/computer/station_alert/security
+	name = "Security Alert Console"
+	monitor_type = /obj/nano_module/alarm_monitor/security
 
 /obj/machinery/computer/station_alert/New()
-	alarm_monitor = new(src)
-	alarm_monitor.register(src, /obj/machinery/computer/station_alert/update_icon)
 	..()
+	alarm_monitor = new monitor_type(src)
+	alarm_monitor.register(src, /obj/machinery/computer/station_alert/update_icon)
 
 /obj/machinery/computer/station_alert/Del()
 	alarm_monitor.unregister(src)

code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm

@@ -5,17 +5,24 @@
 /obj/item/weapon/circuitboard/security
 	name = T_BOARD("security camera monitor")
 	build_path = /obj/machinery/computer/security
-	var/network = list("SS13")
 	req_access = list(access_security)
+	var/list/network
 	var/locked = 1
 	var/emagged = 0
 	
+/obj/item/weapon/circuitboard/security/New()
+	..()
+	network = station_networks
+
 /obj/item/weapon/circuitboard/security/engineering
 	name = T_BOARD("engineering camera monitor")
 	build_path = /obj/machinery/computer/security/engineering
-	network = list("Engineering","Power Alarms","Atmosphere Alarms","Fire Alarms")
 	req_access = list()
 	
+/obj/item/weapon/circuitboard/security/engineering/New()
+	..()
+	network = engineering_networks
+
 /obj/item/weapon/circuitboard/security/mining
 	name = T_BOARD("mining camera monitor")
 	build_path = /obj/machinery/computer/security/mining

maps/exodus-5.dmm

@@ -1578,7 +1578,7 @@
 "Er" = (/obj/structure/cable/blue{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/machinery/camera/autoname/engineering_outpost,/obj/machinery/status_display{pixel_y = 32},/turf/simulated/floor/wood,/area/outpost/engineering/meeting)
 "Es" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/sign/vacuum{pixel_x = 32},/turf/simulated/floor,/area/outpost/engineering/hallway)
 "Et" = (/obj/structure/sign/electricshock,/turf/simulated/wall,/area/outpost/engineering/hallway)
-"Eu" = (/obj/machinery/light/small{dir = 4},/obj/machinery/camera/autoname/engineering_outpost{dir = 8},/turf/simulated/floor/airless{dir = 5; icon_state = "asteroidfloor"},/area/mine/explored)
+"Eu" = (/obj/machinery/light/small{dir = 4},/obj/machinery/camera/network/engineering_outpost{c_tag = "Engineering Outpost Airlock"; dir = 8},/turf/simulated/floor/airless{dir = 5; icon_state = "asteroidfloor"},/area/mine/explored)
 "Ev" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor{dir = 10; icon_state = "warning"},/area/outpost/engineering/hallway)
 "Ew" = (/obj/structure/table/rack,/obj/item/clothing/head/helmet/space/void/engineering,/obj/item/clothing/suit/space/void/engineering,/obj/item/clothing/shoes/magboots,/obj/item/clothing/gloves/yellow,/obj/machinery/camera/autoname/engineering_outpost{dir = 1},/obj/machinery/firealarm{dir = 4; layer = 3.3; pixel_x = 26},/obj/item/weapon/storage/briefcase/inflatable,/turf/simulated/floor,/area/outpost/engineering/storage)
 "Ex" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/camera/autoname/engineering_outpost{dir = 1},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 82.1472; oxygen = 21.8366; temperature = 293.15},/area/outpost/engineering/telecomms)