shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6294 from Citadel-Station-13/upstream-merge-36627

Browse Source 
[MIRROR]  fixes #34388 by adding cam
This commit is contained in:
deathride58
2018-04-07 00:46:51 +00:00
committed by GitHub
parent 756ca1ff17 419bab7551
commit 475fba9bd9
4 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/camera.dm
+6
View File
@@ -193,3 +193,9 @@
icon_keyboard = "mining_key"
network = list("mine")
circuit = /obj/item/circuitboard/computer/mining
/obj/machinery/computer/security/research
name = "research camera console"
desc = "Used to access the various cameras in science."
network = list("rd")
circuit = /obj/item/circuitboard/computer/research
code/game/objects/items/circuitboards/computer_circuitboards.dm
+4
View File
@@ -236,6 +236,10 @@
name = "Outpost Status Display (Computer Board)"
build_path = /obj/machinery/computer/security/mining
/obj/item/circuitboard/computer/research
name = "Research Monitor (Computer Board)"
build_path = /obj/machinery/computer/security/research
/obj/item/circuitboard/computer/comm_monitor
name = "Telecommunications Monitor (Computer Board)"
build_path = /obj/machinery/computer/telecomms/monitor
code/modules/research/designs/comp_board_designs.dm
+8
View File
@@ -30,6 +30,14 @@
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
/datum/design/board/rdcamera
name = "Computer Design (Research Monitor)"
desc = "Allows for the construction of circuit boards used to build research camera computers."
id = "rdcamera"
build_path = /obj/item/circuitboard/computer/research
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
/datum/design/board/xenobiocamera
name = "Computer Design (Xenobiology Console)"
desc = "Allows for the construction of circuit boards used to build xenobiology camera computers."
code/modules/research/techweb/all_nodes.dm
+1 -1
View File
@@ -320,7 +320,7 @@
display_name = "Computer Consoles"
description = "Computers and how they work."
prereq_ids = list("datatheory")
design_ids = list("cargo", "cargorequest", "stockexchange", "libraryconsole", "mining", "crewconsole", "comconsole", "idcardconsole", "seccamera")
design_ids = list("cargo", "cargorequest", "stockexchange", "libraryconsole", "mining", "crewconsole", "rdcamera", "comconsole", "idcardconsole", "seccamera")
research_cost = 2000
export_price = 5000