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

[MIRROR]  fixes #34388 by adding cam
This commit is contained in:
deathride58
2018-04-07 00:46:51 +00:00
committed by GitHub
4 changed files with 19 additions and 1 deletions
+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
@@ -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