From c565ad8bb568eee952f130284a7870e73b41b86d Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Thu, 7 May 2020 10:30:02 -0400 Subject: [PATCH] Update telecomunications.dm --- code/game/machinery/telecomms/telecomunications.dm | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index 5339b0c9ab5..e89b9aa7263 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -349,18 +349,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() /obj/machinery/telecomms/hub/Initialize() . = ..() -<<<<<<< HEAD - component_parts = list() - component_parts += new /obj/item/weapon/stock_parts/subspace/sub_filter(src) - component_parts += new /obj/item/weapon/stock_parts/subspace/sub_filter(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/weapon/stock_parts/manipulator(src) - component_parts += new /obj/item/stack/cable_coil(src, 2) - RefreshParts() -======= - LAZYINITLIST(telecomms_map) default_apply_parts() ->>>>>>> fcbcb0a... Merge pull request #7055 from VOREStation/pol-defaultparts /obj/machinery/telecomms/hub/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) if(is_freq_listening(signal))