cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 04:28:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update telecomunications.dm

Browse Source
This commit is contained in:
Aronai Sieyes
2020-05-07 10:30:02 -04:00
committed by GitHub
parent 074055cd80
commit c565ad8bb5
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/telecomms/telecomunications.dm
-11
View File
@@ -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))