From 69930a192d94a87323d37ebc43e453da68f811ff Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sun, 17 Dec 2017 17:51:28 -0600
Subject: [PATCH] Update networks.dm

---
 .../subsystem/processing/networks.dm          | 39 -------------------
 1 file changed, 39 deletions(-)

diff --git a/code/controllers/subsystem/processing/networks.dm b/code/controllers/subsystem/processing/networks.dm
index 05c7d17364..a3f01efd0c 100644
--- a/code/controllers/subsystem/processing/networks.dm
+++ b/code/controllers/subsystem/processing/networks.dm
@@ -1,41 +1,3 @@
-<<<<<<< HEAD
-PROCESSING_SUBSYSTEM_DEF(networks)
-	name = "Networks"
-	priority = 80
-	wait = 1
-	stat_tag = "NET"
-	flags = SS_KEEP_TIMING
-	init_order = INIT_ORDER_NETWORKS
-	var/datum/ntnet/station/station_network
-	var/assignment_hardware_id = HID_RESTRICTED_END
-	var/list/networks_by_id = list()				//id = network
-	var/list/interfaces_by_id = list()				//hardware id = component interface
-
-/datum/controller/subsystem/processing/networks/Initialize()
-	station_network = new
-	station_network.register_map_supremecy()
-	. = ..()
-
-/datum/controller/subsystem/processing/networks/proc/register_network(datum/ntnet/network)
-	if(!networks_by_id[network.network_id])
-		networks_by_id[network.network_id] = network
-		return TRUE
-	return FALSE
-
-/datum/controller/subsystem/processing/networks/proc/unregister_network(datum/ntnet/network)
-	networks_by_id -= network.network_id
-	return TRUE
-
-/datum/controller/subsystem/processing/networks/proc/register_interface(datum/component/ntnet_interface/D)
-	if(!interfaces_by_id[D.hardware_id])
-		interfaces_by_id[D.hardware_id] = D
-		return TRUE
-	return FALSE
-
-/datum/controller/subsystem/processing/networks/proc/unregister_interface(datum/component/ntnet_interface/D)
-	interfaces_by_id -= D.hardware_id
-	return TRUE
-=======
 PROCESSING_SUBSYSTEM_DEF(networks)
 	name = "Networks"
 	priority = FIRE_PRIORITY_NETWORKS
@@ -72,4 +34,3 @@ PROCESSING_SUBSYSTEM_DEF(networks)
 /datum/controller/subsystem/processing/networks/proc/unregister_interface(datum/component/ntnet_interface/D)
 	interfaces_by_id -= D.hardware_id
 	return TRUE
->>>>>>> 0244b61... Merge pull request #33537 from ninjanomnom/priority-defines