From 40c3008637941a13d5927a96d3cf38f6174ec3f7 Mon Sep 17 00:00:00 2001 From: quotefox <49098813+quotefox@users.noreply.github.com> Date: Wed, 18 Dec 2019 18:53:50 +0000 Subject: [PATCH] Revert "Revert "Merge pull request #123 from SynnGraffkin/Advanced-Cams"" This reverts commit 6ac8540d7e4e3edf79b4895a264a8b60204b5225. --- code/game/machinery/computer/camera_advanced.dm | 1 + .../objects/items/circuitboards/computer_circuitboards.dm | 4 ++++ .../designs/comp_board_designs/comp_board_designs_sec.dm | 8 ++++++++ code/modules/research/techweb/all_nodes.dm | 2 +- 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index 43582e39..ad563635 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -31,6 +31,7 @@ /obj/machinery/computer/camera_advanced/syndie icon_keyboard = "syndie_key" + circuit = /obj/item/circuitboard/computer/advanced_camera /obj/machinery/computer/camera_advanced/proc/CreateEye() eyeobj = new() diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm index 7d2ffe0a..afbf2630 100644 --- a/code/game/objects/items/circuitboards/computer_circuitboards.dm +++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm @@ -14,6 +14,10 @@ name = "Security Cameras (Computer Board)" build_path = /obj/machinery/computer/security +/obj/item/circuitboard/computer/advanced_camera + name = "Advanced Camera Console (Computer Board)" + build_path = /obj/machinery/computer/camera_advanced/syndie + /obj/item/circuitboard/computer/xenobiology name = "circuit board (Xenobiology Console)" build_path = /obj/machinery/computer/camera_advanced/xenobio diff --git a/code/modules/research/designs/comp_board_designs/comp_board_designs_sec.dm b/code/modules/research/designs/comp_board_designs/comp_board_designs_sec.dm index 0e93481f..29321886 100644 --- a/code/modules/research/designs/comp_board_designs/comp_board_designs_sec.dm +++ b/code/modules/research/designs/comp_board_designs/comp_board_designs_sec.dm @@ -41,3 +41,11 @@ build_path = /obj/item/circuitboard/computer/card category = list("Computer Boards") departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_ENGINEERING //Honestly should have a bridge techfab for this sometime. + +/datum/design/board/advanced_camera + name = "Computer Design (Advanced Camera Console)" + desc = "Allows for the construction of circuit boards used to build advanced camera consoles." + id = "advanced_camera" + build_path = /obj/item/circuitboard/computer/advanced_camera + category = list("Computer Boards") + departmental_flags = DEPARTMENTAL_FLAG_SECURITY diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index f49c07d0..afede110 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -1053,7 +1053,7 @@ display_name = "Illegal Technology" description = "Dangerous research used to create dangerous objects." prereq_ids = list("adv_engi", "adv_weaponry", "explosive_weapons") - design_ids = list("decloner", "borg_syndicate_module", "suppressor", "largecrossbow", "donksofttoyvendor") + design_ids = list("decloner", "borg_syndicate_module", "suppressor", "largecrossbow", "donksofttoyvendor", "advanced_camera") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 10000) export_price = 5000 hidden = TRUE