diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 2413c0adb7..afa5664e6d 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -251,6 +251,28 @@ obj/item/weapon/circuitboard/rdserver "/obj/item/weapon/stock_parts/manipulator" = 2, "/obj/item/weapon/stock_parts/scanning_module/adv" = 1) +/obj/item/weapon/circuitboard/telecomms/hub + name = "Circuit Board (Hub Mainframe)" + build_path = "/obj/machinery/telecomms/hub" + board_type = "machine" + origin_tech = "programming=4;engineering=4" + frame_desc = "Requires 2 Manipulators, 2 Cable Coil and 2 Hyperwave Filter." + req_components = list( + "/obj/item/weapon/stock_parts/manipulator" = 2, + "/obj/item/weapon/cable_coil" = 2, + "/obj/item/weapon/stock_parts/subspace/filter" = 2) + +/obj/item/weapon/circuitboard/telecomms/relay + name = "Circuit Board (Relay Mainframe)" + build_path = "/obj/machinery/telecomms/relay" + board_type = "machine" + origin_tech = "programming=3;engineering=4;bluespace=3" + frame_desc = "Requires 2 Manipulators, 2 Cable Coil and 2 Subspace Amplifier." + req_components = list( + "/obj/item/weapon/stock_parts/manipulator" = 2, + "/obj/item/weapon/cable_coil" = 2, + "/obj/item/weapon/stock_parts/subspace/amplifier" = 2) + /obj/item/weapon/circuitboard/telecomms/bus name = "Circuit Board (Bus Mainframe)" build_path = "/obj/machinery/telecomms/bus" @@ -267,9 +289,9 @@ obj/item/weapon/circuitboard/rdserver build_path = "/obj/machinery/telecomms/processor" board_type = "machine" origin_tech = "programming=4;engineering=4" - frame_desc = "Requires 5 Manipulators, 1 Hyperwave Filter, 2 Treatment Disks, 1 Wavelength Analyzer, 2 Cable Coils and 1 Subspace Amplifier." + frame_desc = "Requires 3 Manipulators, 1 Hyperwave Filter, 2 Treatment Disks, 1 Wavelength Analyzer, 2 Cable Coils and 1 Subspace Amplifier." req_components = list( - "/obj/item/weapon/stock_parts/manipulator" = 5, + "/obj/item/weapon/stock_parts/manipulator" = 3, "/obj/item/weapon/stock_parts/subspace/filter" = 1, "/obj/item/weapon/stock_parts/subspace/treatment" = 2, "/obj/item/weapon/stock_parts/subspace/analyzer" = 1, @@ -292,7 +314,7 @@ obj/item/weapon/circuitboard/rdserver build_path = "/obj/machinery/telecomms/broadcaster" board_type = "machine" origin_tech = "programming=4;engineering=4;bluespace=2" - frame_desc = "Requires 2 Manipulators, 1 Cable Coil, 1 Hyperwave Filter, 1 Ansible Crystal, 1 Subspace Transmitter, 1 Subspace Amplifier and 4 High-Powered Micro-Lasers. " + frame_desc = "Requires 2 Manipulators, 1 Cable Coil, 1 Hyperwave Filter, 1 Ansible Crystal, 1 Subspace Transmitter, 1 Subspace Amplifier and 2 High-Powered Micro-Lasers. " req_components = list( "/obj/item/weapon/stock_parts/manipulator" = 2, "/obj/item/weapon/cable_coil" = 1, @@ -300,7 +322,7 @@ obj/item/weapon/circuitboard/rdserver "/obj/item/weapon/stock_parts/subspace/crystal" = 1, "/obj/item/weapon/stock_parts/subspace/transmitter" = 1, "/obj/item/weapon/stock_parts/subspace/amplifier" = 1, - "/obj/item/weapon/stock_parts/micro_laser/high" = 4) + "/obj/item/weapon/stock_parts/micro_laser/high" = 2) diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index d80edb08e7..74c3c8e784 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -128,7 +128,7 @@ var/i = 0 for(var/obj/machinery/telecomms/T in links) i++ - if(T.hide) + if(T.hide && !src.hide) continue dat += "
  • \ref[T] [T.name] ([T.id]) \[X\]
    • " dat += "" diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index b76e015a1f..e7bc9601e9 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -34,7 +34,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() var/heating_power = 40000 var/long_range_link = 0 var/circuitboard = null // string pointing to a circuitboard type - var/hide // Is it a hidden machine? + var/hide = 0 // Is it a hidden machine? /obj/machinery/telecomms/proc/relay_information(datum/signal/signal, filter, copysig, amount) @@ -576,6 +576,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() /obj/machinery/telecomms/relay/preset/ruskie id = "Ruskie Relay" hide = 1 + toggled = 0 autolinkers = list("r_relay", "r_receiverA", "r_receiverB", "r_broadcasterA", "r_broadcasterB") //HUB @@ -583,7 +584,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() /obj/machinery/telecomms/hub/preset id = "Hub" network = "tcommsat" - autolinkers = list("hub", "relay", "s_relay", "m_relay", "science", "medical", + autolinkers = list("hub", "relay", "s_relay", "m_relay", "r_relay", "science", "medical", "cargo", "mining", "common", "command", "engineering", "security") //Receivers @@ -626,11 +627,13 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() id = "Ruskie Receiver A" autolinkers = list("r_receiverA") toggled = 0 + hide = 1 /obj/machinery/telecomms/receiver/preset_right/ruskie id = "Ruskie Receiver B" autolinkers = list("r_receiverB") toggled = 0 + hide = 1 //Buses @@ -763,12 +766,13 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() id = "Ruskie Broadcaster A" autolinkers = list("r_broadcasterA") toggled = 0 + hide = 1 /obj/machinery/telecomms/broadcaster/preset_right/ruskie id = "Ruskie Broadcaster B" autolinkers = list("r_broadcasterB") toggled = 0 - + hide = 1 diff --git a/code/game/machinery/telecomms/telemonitor.dm b/code/game/machinery/telecomms/telemonitor.dm index 378bd6daf8..64f934369f 100644 --- a/code/game/machinery/telecomms/telemonitor.dm +++ b/code/game/machinery/telecomms/telemonitor.dm @@ -52,7 +52,8 @@ dat += "Selected Network Entity: [SelectedMachine.name] ([SelectedMachine.id])
    " dat += "Linked Entities:
      " for(var/obj/machinery/telecomms/T in SelectedMachine.links) - dat += "
    1. \ref[T.id] [T.name] ([T.id])
      2. " + if(!T.hide) + dat += "
    2. \ref[T.id] [T.name] ([T.id])
      3. " dat += "
    " diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index 22410fba22..bf113e8deb 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -519,6 +519,24 @@ datum materials = list("$glass" = 2000, "acid" = 20) build_path = "/obj/item/weapon/circuitboard/telecomms/bus" + telecomms_hub + name = "Circuit Design (Hub Mainframe)" + desc = "Allows for the construction of Telecommunications Hub Mainframes." + id = "s-hub" + req_tech = list("programming" = 4, "engineering" = 4) + build_type = IMPRINTER + materials = list("$glass" = 2000, "acid" = 20) + build_path = "/obj/item/weapon/circuitboard/telecomms/hub" + + telecomms_relay + name = "Circuit Design (Relay Mainframe)" + desc = "Allows for the construction of Telecommunications Relay Mainframes." + id = "s-relay" + req_tech = list("programming" = 3, "engineering" = 4, "bluespace" = 3) + build_type = IMPRINTER + materials = list("$glass" = 2000, "acid" = 20) + build_path = "/obj/item/weapon/circuitboard/telecomms/relay" + telecomms_processor name = "Circuit Design (Processor Unit)" desc = "Allows for the construction of Telecommunications Processor equipment."