From d5a8e2f13bf722b3e0d242c155206aeea8d10b23 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Wed, 22 Nov 2017 20:10:41 -0500 Subject: [PATCH] Update telecomms_designs.dm --- code/modules/research/designs/telecomms_designs.dm | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/code/modules/research/designs/telecomms_designs.dm b/code/modules/research/designs/telecomms_designs.dm index f333e97e41..5822c5b808 100644 --- a/code/modules/research/designs/telecomms_designs.dm +++ b/code/modules/research/designs/telecomms_designs.dm @@ -10,17 +10,6 @@ build_path = /obj/item/circuitboard/machine/telecomms/receiver category = list("Subspace Telecomms") -<<<<<<< HEAD -/datum/design/board/exonet_node - name = "Machine Design (Exonet Node)" - desc = "Allows for the construction of Exonet Node." - id = "e-node" - req_tech = list("programming" = 2, "engineering" = 3, "bluespace" = 1) - build_path = /obj/item/circuitboard/machine/exonet_node - category = list("Subspace Telecomms") - -======= ->>>>>>> 92632ec... Merge pull request #32914 from kevinz000/NTNet /datum/design/board/telecomms_bus name = "Machine Design (Bus Mainframe)" desc = "Allows for the construction of Telecommunications Bus Mainframes."