From 9366781cef0f2fc31427c7aa2e11f5bdbd3ddf22 Mon Sep 17 00:00:00 2001
From: CaelAislinn <cael_aislinn@yahoo.com.au>
Date: Wed, 1 Feb 2012 18:00:55 +1000
Subject: [PATCH] security camera circuits and outpost camera circuits are no
 longer researchable. new research item: camera monitor circuits. can be set
 to produce monitoring computer for any hardcoded camera network, with
 appropriate approval levels (sec for station, mining for outpost etc).

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
---
 baystation12.dme                              |  9 ++++-
 .../game/machinery/computer/buildandrepair.dm | 36 ++++++++++++-------
 code/modules/research/designs.dm              | 10 +++---
 3 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/baystation12.dme b/baystation12.dme
index 53018bce954..c4de44dca40 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -174,6 +174,7 @@
 #define FILE_DIR "icons/vending_icons"
 #define FILE_DIR "interface"
 #define FILE_DIR "maps"
+#define FILE_DIR "maps/backup"
 #define FILE_DIR "sound"
 #define FILE_DIR "sound/ambience"
 #define FILE_DIR "sound/announcer"
@@ -450,6 +451,7 @@
 #include "code\game\machinery\autolathe.dm"
 #include "code\game\machinery\biogenerator.dm"
 #include "code\game\machinery\camera.dm"
+#include "code\game\machinery\camera_monitor.dm"
 #include "code\game\machinery\cell_charger.dm"
 #include "code\game\machinery\cloning.dm"
 #include "code\game\machinery\constructable_frame.dm"
@@ -497,7 +499,6 @@
 #include "code\game\machinery\bots\ed209bot.dm"
 #include "code\game\machinery\bots\floorbot.dm"
 #include "code\game\machinery\bots\medbot.dm"
-#include "code\game\machinery\bots\mulebot.dm"
 #include "code\game\machinery\bots\secbot.dm"
 #include "code\game\machinery\computer\AIcore.dm"
 #include "code\game\machinery\computer\aifixer.dm"
@@ -1014,6 +1015,12 @@
 #include "code\WorkInProgress\buildmode.dm"
 #include "code\WorkInProgress\detective_work.dm"
 #include "code\WorkInProgress\explosion_particles.dm"
+#include "code\WorkInProgress\Cael_Aislinn\elevator.dm"
+#include "code\WorkInProgress\Cael_Aislinn\mulebot_new.dm"
+#include "code\WorkInProgress\Cael_Aislinn\MultiZ.dm"
+#include "code\WorkInProgress\Cael_Aislinn\planet.dm"
+#include "code\WorkInProgress\Cael_Aislinn\rnd_shuttle.dm"
+#include "code\WorkInProgress\Cael_Aislinn\xenobio_safari.dm"
 #include "code\WorkInProgress\mapload\dmm_suite.dm"
 #include "code\WorkInProgress\mapload\reader.dm"
 #include "code\WorkInProgress\Mini\atmos_control.dm"
diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
index 8a58fac9973..a148023983a 100644
--- a/code/game/machinery/computer/buildandrepair.dm
+++ b/code/game/machinery/computer/buildandrepair.dm
@@ -28,9 +28,6 @@
 		frame_desc = null
 		contain_parts = 1
 
-/obj/item/weapon/circuitboard/security
-	name = "Circuit board (Security)"
-	build_path = "/obj/machinery/computer/security"
 /obj/item/weapon/circuitboard/aicore
 	name = "Circuit board (AI core)"
 	origin_tech = "programming=4;biotech=2"
@@ -154,10 +151,22 @@
 	name = "Circuit board (Operating Computer)"
 	build_path = "/obj/machinery/computer/operating"
 	origin_tech = "programming=2;biotech=2"
-/obj/item/weapon/circuitboard/mining
-	name = "Circuit board (Outpost Status Display)"
-	build_path = "/obj/machinery/computer/security/mining"
+/obj/item/weapon/circuitboard/camera
+	name = "Circuit board (Camera)"
 	origin_tech = "programming=2"
+	build_path = ""		//build path has to be manually set
+/obj/item/weapon/circuitboard/security
+	name = "Circuit board (Security Monitoring)"
+	origin_tech = ""	//unresearchable
+	build_path = "/obj/machinery/computer/security"
+/obj/item/weapon/circuitboard/security/engineering
+	name = "Circuit board (Engineering Monitoring)"
+	origin_tech = ""	//unresearchable
+	build_path = "/obj/machinery/computer/security/engineering"
+/obj/item/weapon/circuitboard/security/mining
+	name = "Circuit board (Mining Outpost Monitoring)"
+	origin_tech = ""	//unresearchable
+	build_path = "/obj/machinery/computer/security/mining"
 /obj/item/weapon/circuitboard/comm_monitor
 	name = "Circuit board (Telecommunications Monitor)"
 	build_path = "/obj/machinery/computer/telecomms/monitor"
@@ -204,12 +213,15 @@
 			if(istype(P, /obj/item/weapon/circuitboard) && !circuit)
 				var/obj/item/weapon/circuitboard/B = P
 				if(B.board_type == "computer")
-					playsound(src.loc, 'Deconstruct.ogg', 50, 1)
-					user << "\blue You place the circuit board inside the frame."
-					src.icon_state = "1"
-					src.circuit = P
-					user.drop_item()
-					P.loc = src
+					if(B.build_path != "")
+						playsound(src.loc, 'Deconstruct.ogg', 50, 1)
+						user << "\blue You place the circuit board inside the frame."
+						src.icon_state = "1"
+						src.circuit = P
+						user.drop_item()
+						P.loc = src
+					else
+						user << "\red That circuit board requires additional modifications before it can be used."
 				else
 					user << "\red This frame does not accept circuit boards of this type!"
 			if(istype(P, /obj/item/weapon/screwdriver) && circuit)
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index 5990b1b604c..dd36cedae5b 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -67,14 +67,14 @@ datum
 
 ///////////////////Computer Boards///////////////////////////////////
 
-		seccamera
-			name = "Circuit Design (Security)"
-			desc = "Allows for the construction of circuit boards used to build security camera computers."
-			id = "seccamera"
+		camera
+			name = "Circuit Design (Camera)"
+			desc = "Allows for the construction of circuit boards used to build camera network computers."
+			id = "camera"
 			req_tech = list("programming" = 2)
 			build_type = IMPRINTER
 			materials = list("$glass" = 2000, "acid" = 20)
-			build_path = "/obj/item/weapon/circuitboard/security"
+			build_path = "/obj/item/weapon/circuitboard/camera"
 
 		aicore
 			name = "Circuit Design (AI Core)"