From 1e769b4314d7310247e8e6fe8013bd48dfcdaa48 Mon Sep 17 00:00:00 2001 From: Amunak Date: Wed, 10 Dec 2014 20:37:18 +0100 Subject: [PATCH] Attempt to normalize computer and circuit board names and their research names. Also moved RCON console board and SMES board where they belong. Formatted some board code and fixed some typos, too. Cloning console renamed to Cloning Control Console. The teleporter console is now called Teleporter Control Console. The power monitor is now called Power Monitoring Console. SMES board glass and acid construction price normalized (though other resources are still required; is that a good thing? It would be better to just introduce a new expensive part that is used to build it (if the coils aren't enough) rather than have a single board with atypical price. --- .../overmap/ships/computers/engine_control.dm | 2 +- code/game/machinery/computer/Operating.dm | 2 +- code/game/machinery/computer/RCON_Console.dm | 9 -- .../game/machinery/computer/buildandrepair.dm | 80 ++++++------ code/game/machinery/computer/cloning.dm | 2 +- code/game/machinery/computer/crew.dm | 2 +- code/game/machinery/computer/station_alert.dm | 2 +- code/game/machinery/constructable_frame.dm | 13 +- code/game/machinery/teleporter.dm | 2 +- code/game/mecha/mecha_parts.dm | 55 +++----- code/game/supplyshuttle.dm | 4 +- .../power/sensors/sensor_monitoring.dm | 2 +- code/modules/power/smes_construction.dm | 21 +-- code/modules/research/designs.dm | 120 +++++++++--------- 14 files changed, 139 insertions(+), 177 deletions(-) diff --git a/code/WorkInProgress/Chinsky/overmap/ships/computers/engine_control.dm b/code/WorkInProgress/Chinsky/overmap/ships/computers/engine_control.dm index 41f2c4cdf9..2a27a63019 100644 --- a/code/WorkInProgress/Chinsky/overmap/ships/computers/engine_control.dm +++ b/code/WorkInProgress/Chinsky/overmap/ships/computers/engine_control.dm @@ -1,7 +1,7 @@ //Engine control and monitoring console /obj/machinery/computer/engines - name = "engines control console" + name = "Engine Control Console" icon_state = "id" var/state = "status" var/list/engines = list() diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index f1a1f02db7..1601347a31 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -1,7 +1,7 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31 /obj/machinery/computer/operating - name = "Operating Computer" + name = "Patient Monitor Console" density = 1 anchored = 1.0 icon_state = "operating" diff --git a/code/game/machinery/computer/RCON_Console.dm b/code/game/machinery/computer/RCON_Console.dm index b57266b7fa..6e0eab2e55 100644 --- a/code/game/machinery/computer/RCON_Console.dm +++ b/code/game/machinery/computer/RCON_Console.dm @@ -1,8 +1,3 @@ -/obj/item/weapon/circuitboard/rcon_console - name = "\improper RCON Remote Control Console circuit board" - build_path = /obj/machinery/computer/rcon - origin_tech = "programming=4;engineering=3;powerstorage=5" - /obj/machinery/computer/rcon name = "RCON Console" desc = "Console used to remotely control machinery on the station." @@ -48,10 +43,6 @@ ))) data["breaker_info"] = breakerlist - - - - // update the ui if it exists, returns null if no ui is passed/found ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 3c30ffa198..b496cdc7ee 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -3,7 +3,7 @@ /obj/structure/computerframe density = 1 anchored = 0 - name = "Computer-frame" + name = "Computer frame" icon = 'icons/obj/stock_parts.dmi' icon_state = "0" var/state = 0 @@ -51,7 +51,7 @@ */ /obj/item/weapon/circuitboard/message_monitor - name = "Circuit board (Message Monitor)" + name = "Circuit board (Message Monitor Console)" build_path = /obj/machinery/computer/message_monitor origin_tech = "programming=3" @@ -87,15 +87,15 @@ origin_tech = "programming=4;biotech=2" board_type = "other" /obj/item/weapon/circuitboard/aiupload - name = "Circuit board (AI Upload)" + name = "Circuit board (AI Upload Console)" build_path = /obj/machinery/computer/aiupload origin_tech = "programming=4" /obj/item/weapon/circuitboard/borgupload - name = "Circuit board (Cyborg Upload)" + name = "Circuit board (Cyborg Upload Console)" build_path = /obj/machinery/computer/borgupload origin_tech = "programming=4" /obj/item/weapon/circuitboard/med_data - name = "Circuit board (Medical Records)" + name = "Circuit board (Medical Records Console)" build_path = /obj/machinery/computer/med_data /obj/item/weapon/circuitboard/pandemic name = "Circuit board (PanD.E.M.I.C. 2200)" @@ -106,36 +106,36 @@ build_path = /obj/machinery/computer/scan_consolenew origin_tech = "programming=2;biotech=2" /obj/item/weapon/circuitboard/communications - name = "Circuit board (Communications)" + name = "Circuit board (Communications Console)" build_path = /obj/machinery/computer/communications origin_tech = "programming=2;magnets=2" /obj/item/weapon/circuitboard/card - name = "Circuit board (ID Computer)" + name = "Circuit board (ID Card Modification Console)" build_path = /obj/machinery/computer/card /obj/item/weapon/circuitboard/card/centcom - name = "Circuit board (CentCom ID Computer)" + name = "Circuit board (CentCom ID Card Modification Console)" build_path = /obj/machinery/computer/card/centcom //obj/item/weapon/circuitboard/shield // name = "Circuit board (Shield Control)" // build_path = "/obj/machinery/computer/stationshield" /obj/item/weapon/circuitboard/teleporter - name = "Circuit board (Teleporter)" + name = "Circuit board (Teleporter Control Console)" build_path = /obj/machinery/computer/teleporter origin_tech = "programming=2;bluespace=2" /obj/item/weapon/circuitboard/secure_data - name = "Circuit board (Security Records)" + name = "Circuit board (Security Records Console)" build_path = /obj/machinery/computer/secure_data /obj/item/weapon/circuitboard/skills - name = "Circuit board (Employment Records)" + name = "Circuit board (Employment Records Console)" build_path = /obj/machinery/computer/skills /obj/item/weapon/circuitboard/stationalert - name = "Circuit board (Station Alerts)" + name = "Circuit board (Station Alert Console)" build_path = /obj/machinery/computer/station_alert ///obj/item/weapon/circuitboard/atmospheresiphonswitch // name = "Circuit board (Atmosphere Siphon Control)" // build_path = /obj/machinery/computer/atmosphere/siphonswitch /obj/item/weapon/circuitboard/air_management - name = "Circuit board (Atmospheric Monitor)" + name = "Circuit board (Atmosphere Monitoring Console)" build_path = /obj/machinery/computer/general_air_control var/frequency = 1439 /obj/item/weapon/circuitboard/air_management/tank_control @@ -159,36 +159,36 @@ frequency = C.frequency /obj/item/weapon/circuitboard/atmos_alert - name = "Circuit board (Atmospheric Alert)" + name = "Circuit board (Atmospheric Alert Console)" build_path = /obj/machinery/computer/atmos_alert /obj/item/weapon/circuitboard/pod name = "Circuit board (Massdriver control)" build_path = /obj/machinery/computer/pod /obj/item/weapon/circuitboard/robotics - name = "Circuit board (Robotics Control)" + name = "Circuit board (Robotics Control Console)" build_path = /obj/machinery/computer/robotics origin_tech = "programming=3" /obj/item/weapon/circuitboard/drone_control - name = "Circuit board (Drone Control)" + name = "Circuit board (Drone Control Console)" build_path = /obj/machinery/computer/drone_control origin_tech = "programming=3" /obj/item/weapon/circuitboard/cloning - name = "Circuit board (Cloning)" + name = "Circuit board (Cloning Control Console)" build_path = /obj/machinery/computer/cloning origin_tech = "programming=3;biotech=3" /obj/item/weapon/circuitboard/arcade - name = "Circuit board (Arcade)" + name = "Circuit board (Arcade Machine)" build_path = /obj/machinery/computer/arcade origin_tech = "programming=1" /obj/item/weapon/circuitboard/turbine_control - name = "Circuit board (Turbine control)" + name = "Circuit board (Turbine Control Console)" build_path = /obj/machinery/computer/turbine_computer /obj/item/weapon/circuitboard/solar_control - name = "Circuit board (Solar Control)" + name = "Circuit board (Solar Control Console)" build_path = /obj/machinery/power/solar_control origin_tech = "programming=2;powerstorage=2" /obj/item/weapon/circuitboard/powermonitor - name = "Circuit board (Power Monitor)" + name = "Circuit board (Power Monitoring Console)" build_path = /obj/machinery/computer/power_monitor /obj/item/weapon/circuitboard/olddoor name = "Circuit board (DoorMex)" @@ -200,19 +200,19 @@ name = "Circuit board (Magix)" build_path = /obj/machinery/computer/pod/old/swf /obj/item/weapon/circuitboard/prisoner - name = "Circuit board (Prisoner Management)" + name = "Circuit board (Prisoner Management Console)" build_path = /obj/machinery/computer/prisoner /obj/item/weapon/circuitboard/rdconsole - name = "Circuit Board (RD Console)" + name = "Circuit Board (R&D Control Console)" build_path = /obj/machinery/computer/rdconsole/core /obj/item/weapon/circuitboard/mecha_control name = "Circuit Board (Exosuit Control Console)" build_path = /obj/machinery/computer/mecha /obj/item/weapon/circuitboard/rdservercontrol - name = "Circuit Board (R&D Server Control)" + name = "Circuit Board (R&D Server Control Console)" build_path = /obj/machinery/computer/rdservercontrol /obj/item/weapon/circuitboard/crew - name = "Circuit board (Crew monitoring computer)" + name = "Circuit board (Crew Monitoring Console)" build_path = /obj/machinery/computer/crew origin_tech = "programming=3;biotech=2;magnets=2" /obj/item/weapon/circuitboard/mech_bay_power_console @@ -220,12 +220,11 @@ build_path = /obj/machinery/computer/mech_bay_power_console origin_tech = "programming=2;powerstorage=3" /obj/item/weapon/circuitboard/ordercomp - name = "Circuit board (Supply ordering console)" + name = "Circuit board (Supply Ordering Console)" build_path = /obj/machinery/computer/ordercomp origin_tech = "programming=2" - /obj/item/weapon/circuitboard/supplycomp - name = "Circuit board (Supply shuttle console)" + name = "Circuit board (Supply Shuttle Console)" build_path = /obj/machinery/computer/supplycomp origin_tech = "programming=3" var/contraband_enabled = 0 @@ -239,19 +238,19 @@ contraband_enabled = SC.can_order_contraband /obj/item/weapon/circuitboard/operating - name = "Circuit board (Operating Computer)" + name = "Circuit board (Patient Monitoring Console)" build_path = /obj/machinery/computer/operating origin_tech = "programming=2;biotech=2" /obj/item/weapon/circuitboard/comm_monitor - name = "Circuit board (Telecommunications Monitor)" + name = "Circuit board (Telecommunications Monitor Console)" build_path = /obj/machinery/computer/telecomms/monitor origin_tech = "programming=3" /obj/item/weapon/circuitboard/comm_server - name = "Circuit board (Telecommunications Server Monitor)" + name = "Circuit board (Telecommunications Server Monitor Console)" build_path = /obj/machinery/computer/telecomms/server origin_tech = "programming=3" /obj/item/weapon/circuitboard/comm_traffic - name = "Circuitboard (Telecommunications Traffic Control)" + name = "Circuitboard (Telecommunications Traffic Control Console)" build_path = /obj/machinery/computer/telecomms/traffic origin_tech = "programming=3" @@ -262,19 +261,19 @@ name = "Circuit board (Disease Splicer)" build_path = /obj/machinery/computer/diseasesplicer /obj/item/weapon/circuitboard/mining_shuttle - name = "Circuit board (Mining Shuttle)" + name = "Circuit board (Mining Shuttle Console)" build_path = /obj/machinery/computer/shuttle_control/mining origin_tech = "programming=2" /obj/item/weapon/circuitboard/engineering_shuttle - name = "Circuit board (Engineering Shuttle)" + name = "Circuit board (Engineering Shuttle Console)" build_path = /obj/machinery/computer/shuttle_control/engineering origin_tech = "programming=2" /obj/item/weapon/circuitboard/research_shuttle - name = "Circuit board (Research Shuttle)" + name = "Circuit board (Research Shuttle Console)" build_path = /obj/machinery/computer/shuttle_control/research origin_tech = "programming=2" /obj/item/weapon/circuitboard/HolodeckControl // Not going to let people get this, but it's just here for future - name = "Circuit board (Holodeck Control)" + name = "Circuit board (Holodeck Control Console)" build_path = /obj/machinery/computer/HolodeckControl origin_tech = "programming=4" /obj/item/weapon/circuitboard/aifixer @@ -282,14 +281,17 @@ build_path = /obj/machinery/computer/aifixer origin_tech = "programming=3;biotech=2" /obj/item/weapon/circuitboard/area_atmos - name = "Circuit board (Area Air Control)" + name = "Circuit board (Area Air Control Console)" build_path = /obj/machinery/computer/area_atmos origin_tech = "programming=2" /obj/item/weapon/circuitboard/prison_shuttle - name = "Circuit board (Prison Shuttle)" + name = "Circuit board (Prison Shuttle Console)" build_path = /obj/machinery/computer/prison_shuttle origin_tech = "programming=2" - +/obj/item/weapon/circuitboard/rcon_console + name = "Circuit board (RCON Remote Control Console)" + build_path = /obj/machinery/computer/rcon + origin_tech = "programming=4;engineering=3;powerstorage=5" /obj/item/weapon/circuitboard/supplycomp/attackby(obj/item/I as obj, mob/user as mob) if(istype(I,/obj/item/device/multitool)) diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index dadda5cfd7..402f7bb91b 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/cloning - name = "Cloning console" + name = "Cloning Control Console" icon = 'icons/obj/computer.dmi' icon_state = "dna" circuit = "/obj/item/weapon/circuitboard/cloning" diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index 760de399a8..1c7352f416 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/crew - name = "Crew monitoring computer" + name = "Crew Monitoring Computer" desc = "Used to monitor active health sensors built into most of the crew's uniforms." icon_state = "crew" use_power = 1 diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index 35e80f54e7..028be6e3a3 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -1,6 +1,6 @@ /obj/machinery/computer/station_alert - name = "Station Alert Computer" + name = "Station Alert Console" desc = "Used to access the station's automated alert system." icon_state = "alert:0" circuit = "/obj/item/weapon/circuitboard/stationalert" diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 148abdb51d..e1d096808e 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -308,8 +308,15 @@ obj/item/weapon/circuitboard/rdserver "/obj/item/weapon/stock_parts/capacitor" = 2, "/obj/item/weapon/stock_parts/manipulator" = 1) -// Telecomms circuit boards: +/obj/item/weapon/circuitboard/smes + name = "Circuit Board (Superconductive Magnetic Energy Storage)" + build_path = "/obj/machinery/power/smes/buildable" + board_type = "machine" + origin_tech = "powerstorage=6;engineering=4" + frame_desc = "Requires 1 superconducting magnetic coil and 30 wires." + req_components = list("/obj/item/weapon/smes_component/coil" = 1, "/obj/item/stack/cable_coil" = 30) +// Telecomms circuit boards: /obj/item/weapon/circuitboard/telecomms/receiver name = "Circuit Board (Subspace Receiver)" build_path = "/obj/machinery/telecomms/receiver" @@ -392,7 +399,3 @@ obj/item/weapon/circuitboard/rdserver "/obj/item/weapon/stock_parts/subspace/filter" = 1, "/obj/item/weapon/stock_parts/subspace/crystal" = 1, "/obj/item/weapon/stock_parts/micro_laser/high" = 2) - - - - diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index b014ece92a..04b8c5644a 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -1,5 +1,5 @@ /obj/machinery/computer/teleporter - name = "Teleporter" + name = "Teleporter Control Console" desc = "Used to control a linked teleportation Hub and Station." icon_state = "teleport" circuit = "/obj/item/weapon/circuitboard/teleporter" diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm index 479c8f7d09..ddff723806 100644 --- a/code/game/mecha/mecha_parts.dm +++ b/code/game/mecha/mecha_parts.dm @@ -364,73 +364,54 @@ throw_speed = 3 throw_range = 15 - ripley +/obj/item/weapon/circuitboard/mecha/ripley origin_tech = "programming=3" - - ripley/peripherals +/obj/item/weapon/circuitboard/mecha/ripley/peripherals name = "Circuit board (Ripley Peripherals Control module)" icon_state = "mcontroller" - - ripley/main +/obj/item/weapon/circuitboard/mecha/ripley/main name = "Circuit board (Ripley Central Control module)" icon_state = "mainboard" - - gygax +/obj/item/weapon/circuitboard/mecha/gygax origin_tech = "programming=4" - - gygax/peripherals +/obj/item/weapon/circuitboard/mecha/gygax/peripherals name = "Circuit board (Gygax Peripherals Control module)" icon_state = "mcontroller" - - gygax/targeting +/obj/item/weapon/circuitboard/mecha/gygax/targeting name = "Circuit board (Gygax Weapon Control and Targeting module)" icon_state = "mcontroller" origin_tech = "programming=4;combat=4" - - gygax/main +/obj/item/weapon/circuitboard/mecha/gygax/main name = "Circuit board (Gygax Central Control module)" icon_state = "mainboard" - - durand +/obj/item/weapon/circuitboard/mecha/durand origin_tech = "programming=4" - - durand/peripherals +/obj/item/weapon/circuitboard/mecha/durand/peripherals name = "Circuit board (Durand Peripherals Control module)" icon_state = "mcontroller" - - durand/targeting +/obj/item/weapon/circuitboard/mecha/durand/targeting name = "Circuit board (Durand Weapon Control and Targeting module)" icon_state = "mcontroller" origin_tech = "programming=4;combat=4" - - durand/main +/obj/item/weapon/circuitboard/mecha/durand/main name = "Circuit board (Durand Central Control module)" icon_state = "mainboard" - - honker +/obj/item/weapon/circuitboard/mecha/honker origin_tech = "programming=4" - - honker/peripherals +/obj/item/weapon/circuitboard/mecha/honker/peripherals name = "Circuit board (H.O.N.K Peripherals Control module)" icon_state = "mcontroller" - - honker/targeting +/obj/item/weapon/circuitboard/mecha/honker/targeting name = "Circuit board (H.O.N.K Weapon Control and Targeting module)" icon_state = "mcontroller" - - honker/main +/obj/item/weapon/circuitboard/mecha/honker/main name = "Circuit board (H.O.N.K Central Control module)" icon_state = "mainboard" - - odysseus +/obj/item/weapon/circuitboard/mecha/odysseus origin_tech = "programming=3" - - odysseus/peripherals +/obj/item/weapon/circuitboard/mecha/odysseus/peripherals name = "Circuit board (Odysseus Peripherals Control module)" icon_state = "mcontroller" - - odysseus/main +/obj/item/weapon/circuitboard/mecha/odysseus/main name = "Circuit board (Odysseus Central Control module)" icon_state = "mainboard" - - diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 349be88f5d..0564cde442 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -92,7 +92,7 @@ var/list/mechtoys = list( ..() /obj/machinery/computer/supplycomp - name = "Supply shuttle console" + name = "Supply Shuttle Console" icon = 'icons/obj/computer.dmi' icon_state = "supply" req_access = list(access_cargo) @@ -104,7 +104,7 @@ var/list/mechtoys = list( var/last_viewed_group = "categories" /obj/machinery/computer/ordercomp - name = "Supply ordering console" + name = "Supply Ordering Console" icon = 'icons/obj/computer.dmi' icon_state = "request" circuit = "/obj/item/weapon/circuitboard/ordercomp" diff --git a/code/modules/power/sensors/sensor_monitoring.dm b/code/modules/power/sensors/sensor_monitoring.dm index e3f39ede6d..353eb76115 100644 --- a/code/modules/power/sensors/sensor_monitoring.dm +++ b/code/modules/power/sensors/sensor_monitoring.dm @@ -5,7 +5,7 @@ */ /obj/machinery/computer/power_monitor - name = "Power Monitor" + name = "Power Monitoring Console" desc = "Computer designed to remotely monitor power levels around the station" icon = 'icons/obj/computer.dmi' icon_state = "power" diff --git a/code/modules/power/smes_construction.dm b/code/modules/power/smes_construction.dm index 72687dfcf6..1c15c046a0 100644 --- a/code/modules/power/smes_construction.dm +++ b/code/modules/power/smes_construction.dm @@ -1,20 +1,8 @@ -// Constructable SMES version. Based on Coils. Each SMES can hold 6 Coils by default. -// Each coil adds 250kW I/O and 5M capacity. -// This is second version, now subtype of regular SMES. +// Constructable SMES version (based on SMES Coils) - -//Board -/obj/item/weapon/circuitboard/smes - name = "Circuit board (SMES Cell)" - build_path = "/obj/machinery/power/smes/buildable" - board_type = "machine" - origin_tech = "powerstorage=6;engineering=4" // Board itself is high tech. Coils have to be ordered from cargo or salvaged from existing SMESs. - frame_desc = "Requires 1 superconducting magnetic coil and 30 wires." - req_components = list("/obj/item/weapon/smes_coil" = 1, "/obj/item/stack/cable_coil" = 30) - -//Construction Item +//Construction Items /obj/item/weapon/smes_coil - name = "Superconducting Magnetic Coil" + name = "Superconductive Magnetic Coil" desc = "Heavy duty superconducting magnetic coil, mainly used in construction of SMES units." icon = 'icons/obj/stock_parts.dmi' icon_state = "smes_coil" // Just few icons patched together. If someone wants to make better icon, feel free to do so! @@ -22,9 +10,6 @@ var/ChargeCapacity = 5000000 var/IOCapacity = 250000 - - - // SMES itself /obj/machinery/power/smes/buildable var/max_coils = 6 //30M capacity, 1.5MW input/output when fully upgraded /w default coils diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index f52ca5cb16..eaa1474cf5 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -68,8 +68,8 @@ datum/design/proc/CalcReliability(var/list/temp_techs) ///////////////////Computer Boards/////////////////////////////////// datum/design/seccamera - name = "Circuit Design (Security)" - desc = "Allows for the construction of circuit boards used to build security camera computers." + name = "Circuit Design (Security Camera Monitor)" + desc = "Allows for the construction of circuit boards used to build a Security Camera Monitor." id = "seccamera" req_tech = list("programming" = 2) build_type = IMPRINTER @@ -78,7 +78,7 @@ datum/design/seccamera datum/design/aicore name = "Circuit Design (AI Core)" - desc = "Allows for the construction of circuit boards used to build new AI cores." + desc = "Allows for the construction of circuit boards used to build AI cores." id = "aicore" req_tech = list("programming" = 4, "biotech" = 3) build_type = IMPRINTER @@ -87,7 +87,7 @@ datum/design/aicore datum/design/aiupload name = "Circuit Design (AI Upload)" - desc = "Allows for the construction of circuit boards used to build an AI Upload Console." + desc = "Allows for the construction of circuit boards used to build an AI Upload console." id = "aiupload" req_tech = list("programming" = 4) build_type = IMPRINTER @@ -96,7 +96,7 @@ datum/design/aiupload datum/design/borgupload name = "Circuit Design (Cyborg Upload)" - desc = "Allows for the construction of circuit boards used to build a Cyborg Upload Console." + desc = "Allows for the construction of circuit boards used to build a Cyborg Upload console." id = "borgupload" req_tech = list("programming" = 4) build_type = IMPRINTER @@ -105,7 +105,7 @@ datum/design/borgupload datum/design/med_data name = "Circuit Design (Medical Records)" - desc = "Allows for the construction of circuit boards used to build a medical records console." + desc = "Allows for the construction of circuit boards used to build a Medical Records console." id = "med_data" req_tech = list("programming" = 2) build_type = IMPRINTER @@ -113,8 +113,8 @@ datum/design/med_data build_path = /obj/item/weapon/circuitboard/med_data datum/design/operating - name = "Circuit Design (Operating Computer)" - desc = "Allows for the construction of circuit boards used to build an operating computer console." + name = "Circuit Design (Patient Monitoring)" + desc = "Allows for the construction of circuit boards used to build a Patient Monitoring console." id = "operating" req_tech = list("programming" = 2, "biotech" = 2) build_type = IMPRINTER @@ -132,7 +132,7 @@ datum/design/pandemic datum/design/scan_console name = "Circuit Design (DNA Machine)" - desc = "Allows for the construction of circuit boards used to build a new DNA scanning console." + desc = "Allows for the construction of circuit boards used to build a DNA scanning console." id = "scan_console" req_tech = list("programming" = 2, "biotech" = 3) build_type = IMPRINTER @@ -149,8 +149,8 @@ datum/design/comconsole build_path = /obj/item/weapon/circuitboard/communications datum/design/idcardconsole - name = "Circuit Design (ID Computer)" - desc = "Allows for the construction of circuit boards used to build an ID computer." + name = "Circuit Design (ID Card Modification)" + desc = "Allows for the construction of circuit boards used to build an ID Card Modification console." id = "idcardconsole" req_tech = list("programming" = 2) build_type = IMPRINTER @@ -158,8 +158,8 @@ datum/design/idcardconsole build_path = /obj/item/weapon/circuitboard/card datum/design/crewconsole - name = "Circuit Design (Crew monitoring computer)" - desc = "Allows for the construction of circuit boards used to build a Crew monitoring computer." + name = "Circuit Design (Crew Monitoring)" + desc = "Allows for the construction of circuit boards used to build a Crew Monitoring console." id = "crewconsole" req_tech = list("programming" = 3, "magnets" = 2, "biotech" = 2) build_type = IMPRINTER @@ -167,8 +167,8 @@ datum/design/crewconsole build_path = /obj/item/weapon/circuitboard/crew datum/design/teleconsole - name = "Circuit Design (Teleporter Console)" - desc = "Allows for the construction of circuit boards used to build a teleporter control console." + name = "Circuit Design (Teleporter Control)" + desc = "Allows for the construction of circuit boards used to build a Teleporter Control console." id = "teleconsole" req_tech = list("programming" = 3, "bluespace" = 2) build_type = IMPRINTER @@ -176,8 +176,8 @@ datum/design/teleconsole build_path = /obj/item/weapon/circuitboard/teleporter datum/design/secdata - name = "Circuit Design (Security Records Console)" - desc = "Allows for the construction of circuit boards used to build a security records console." + name = "Circuit Design (Security Records)" + desc = "Allows for the construction of circuit boards used to build a Security Records console." id = "secdata" req_tech = list("programming" = 2) build_type = IMPRINTER @@ -186,7 +186,7 @@ datum/design/secdata datum/design/atmosalerts name = "Circuit Design (Atmosphere Alert)" - desc = "Allows for the construction of circuit boards used to build an atmosphere alert console.." + desc = "Allows for the construction of circuit boards used to build an Atmosphere Alert console." id = "atmosalerts" req_tech = list("programming" = 2) build_type = IMPRINTER @@ -194,8 +194,8 @@ datum/design/atmosalerts build_path = /obj/item/weapon/circuitboard/atmos_alert datum/design/air_management - name = "Circuit Design (Atmospheric Monitor)" - desc = "Allows for the construction of circuit boards used to build an Atmospheric Monitor." + name = "Circuit Design (Atmosphere Monitoring)" + desc = "Allows for the construction of circuit boards used to build an Atmosphere Monitoring console." id = "air_management" req_tech = list("programming" = 2) build_type = IMPRINTER @@ -203,17 +203,17 @@ datum/design/air_management build_path = /obj/item/weapon/circuitboard/air_management datum/design/rcon_console - name = "Circuit Design (RCON Console)" - desc = "Allows for the construction of circuit boards used to build an RCON Remote Control Console." + name = "Circuit Design (RCON Remote Control)" + desc = "Allows for the construction of circuit boards used to build a RCON Remote Control console." id = "rcon_console" - req_tech = list("programming" = 4, "engineering" = 3, "powerstorage" = 5) + req_tech = list("programming" = 3, "engineering" = 3, "powerstorage" = 2, "bluespace" = 1) build_type = IMPRINTER materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/rcon_console /* Uncomment if someone makes these buildable datum/design/general_alert - name = "Circuit Design (General Alert Console)" + name = "Circuit Design (General Alert)" desc = "Allows for the construction of circuit boards used to build a General Alert console." id = "general_alert" req_tech = list("programming" = 2) @@ -223,7 +223,7 @@ datum/design/general_alert */ datum/design/robocontrol - name = "Circuit Design (Robotics Control Console)" + name = "Circuit Design (Robotics Control)" desc = "Allows for the construction of circuit boards used to build a Robotics Control console." id = "robocontrol" req_tech = list("programming" = 4) @@ -232,7 +232,7 @@ datum/design/robocontrol build_path = /obj/item/weapon/circuitboard/robotics datum/design/dronecontrol - name = "Circuit Design (Drone Control Console)" + name = "Circuit Design (Drone Control)" desc = "Allows for the construction of circuit boards used to build a Drone Control console." id = "dronecontrol" req_tech = list("programming" = 4) @@ -241,8 +241,8 @@ datum/design/dronecontrol build_path = /obj/item/weapon/circuitboard/drone_control datum/design/clonecontrol - name = "Circuit Design (Cloning Machine Console)" - desc = "Allows for the construction of circuit boards used to build a new Cloning Machine console." + name = "Circuit Design (Cloning Control)" + desc = "Allows for the construction of circuit boards used to build a Cloning Control console." id = "clonecontrol" req_tech = list("programming" = 3, "biotech" = 3) build_type = IMPRINTER @@ -251,7 +251,7 @@ datum/design/clonecontrol datum/design/clonepod name = "Circuit Design (Clone Pod)" - desc = "Allows for the construction of circuit boards used to build a Cloning Pod." + desc = "Allows for the construction of circuit boards used to build a Clone Pod." id = "clonepod" req_tech = list("programming" = 3, "biotech" = 3) build_type = IMPRINTER @@ -269,7 +269,7 @@ datum/design/clonescanner datum/design/arcademachine name = "Circuit Design (Arcade Machine)" - desc = "Allows for the construction of circuit boards used to build a new arcade machine." + desc = "Allows for the construction of circuit boards used to build an Arcade Machine." id = "arcademachine" req_tech = list("programming" = 1) build_type = IMPRINTER @@ -277,8 +277,8 @@ datum/design/arcademachine build_path = /obj/item/weapon/circuitboard/arcade datum/design/powermonitor - name = "Circuit Design (Power Monitor)" - desc = "Allows for the construction of circuit boards used to build a new power monitor" + name = "Circuit Design (Power Monitoring)" + desc = "Allows for the construction of circuit boards used to build a Power Monitoring console" id = "powermonitor" req_tech = list("programming" = 2) build_type = IMPRINTER @@ -287,7 +287,7 @@ datum/design/powermonitor datum/design/solarcontrol name = "Circuit Design (Solar Control)" - desc = "Allows for the construction of circuit boards used to build a solar control console" + desc = "Allows for the construction of circuit boards used to build a Solar Control console" id = "solarcontrol" req_tech = list("programming" = 2, "powerstorage" = 2) build_type = IMPRINTER @@ -295,8 +295,8 @@ datum/design/solarcontrol build_path = /obj/item/weapon/circuitboard/solar_control datum/design/prisonmanage - name = "Circuit Design (Prisoner Management Console)" - desc = "Allows for the construction of circuit boards used to build a prisoner management console." + name = "Circuit Design (Prisoner Management)" + desc = "Allows for the construction of circuit boards used to build a Prisoner Management console." id = "prisonmanage" req_tech = list("programming" = 2) build_type = IMPRINTER @@ -304,8 +304,8 @@ datum/design/prisonmanage build_path = /obj/item/weapon/circuitboard/prisoner datum/design/mechacontrol - name = "Circuit Design (Exosuit Control Console)" - desc = "Allows for the construction of circuit boards used to build an exosuit control console." + name = "Circuit Design (Exosuit Control)" + desc = "Allows for the construction of circuit boards used to build an Exosuit Control console." id = "mechacontrol" req_tech = list("programming" = 3) build_type = IMPRINTER @@ -313,8 +313,8 @@ datum/design/mechacontrol build_path = /obj/item/weapon/circuitboard/mecha_control datum/design/mechapower - name = "Circuit Design (Mech Bay Power Control Console)" - desc = "Allows for the construction of circuit boards used to build a mech bay power control console." + name = "Circuit Design (Mech Bay Power Control)" + desc = "Allows for the construction of circuit boards used to build a Mech Bay Power Control console." id = "mechapower" req_tech = list("programming" = 2, "powerstorage" = 3) build_type = IMPRINTER @@ -322,8 +322,8 @@ datum/design/mechapower build_path = /obj/item/weapon/circuitboard/mech_bay_power_console datum/design/rdconsole - name = "Circuit Design (R&D Console)" - desc = "Allows for the construction of circuit boards used to build a new R&D console." + name = "Circuit Design (R&D Control)" + desc = "Allows for the construction of circuit boards used to build a R&D Control console." id = "rdconsole" req_tech = list("programming" = 4) build_type = IMPRINTER @@ -331,8 +331,8 @@ datum/design/rdconsole build_path = /obj/item/weapon/circuitboard/rdconsole datum/design/ordercomp - name = "Circuit Design (Supply ordering console)" - desc = "Allows for the construction of circuit boards used to build a Supply ordering console." + name = "Circuit Design (Supply Ordering)" + desc = "Allows for the construction of circuit boards used to build a Supply Ordering console." id = "ordercomp" req_tech = list("programming" = 2) build_type = IMPRINTER @@ -340,8 +340,8 @@ datum/design/ordercomp build_path = /obj/item/weapon/circuitboard/ordercomp datum/design/supplycomp - name = "Circuit Design (Supply shuttle console)" - desc = "Allows for the construction of circuit boards used to build a Supply shuttle console." + name = "Circuit Design (Supply Shuttle)" + desc = "Allows for the construction of circuit boards used to build a Supply Shuttle console." id = "supplycomp" req_tech = list("programming" = 3) build_type = IMPRINTER @@ -349,8 +349,8 @@ datum/design/supplycomp build_path = /obj/item/weapon/circuitboard/supplycomp datum/design/comm_monitor - name = "Circuit Design (Telecommunications Monitoring Console)" - desc = "Allows for the construction of circuit boards used to build a telecommunications monitor." + name = "Circuit Design (Telecommunications Monitoring)" + desc = "Allows for the construction of circuit boards used to build a Telecommunications Monitor console." id = "comm_monitor" req_tech = list("programming" = 3) build_type = IMPRINTER @@ -358,8 +358,8 @@ datum/design/comm_monitor build_path = /obj/item/weapon/circuitboard/comm_monitor datum/design/comm_server - name = "Circuit Design (Telecommunications Server Monitoring Console)" - desc = "Allows for the construction of circuit boards used to build a telecommunication server browser and monitor." + name = "Circuit Design (Telecommunications Server Monitoring)" + desc = "Allows for the construction of circuit boards used to build a Telecommunication Server Monitoring console." id = "comm_server" req_tech = list("programming" = 3) build_type = IMPRINTER @@ -384,16 +384,6 @@ datum/design/aifixer materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/aifixer -// VERY VERY EXPENSIVE (needs diamonds and stuff) -datum/design/smes_cell - name = "Circuit Design (SMES Cell)" - desc = "Allows for the construction of circuit boards used to build an SMES Cell." - id = "smes_cell" - req_tech = list("powerstorage" = 7, "engineering" = 5) // Higher than obtained by deconstructing existing boards. Needs more RnD effor to make - build_type = IMPRINTER - materials = list("$glass" = 4000, "sacid" = 40, "$gold" = 1000, "$silver" = 1000, "$diamond" = 500) - build_path = /obj/item/weapon/circuitboard/smes - /////////////////////////////////// //////////AI Module Disks////////// /////////////////////////////////// @@ -1077,7 +1067,9 @@ datum/design/super_matter_bin reliability_base = 75 build_path = /obj/item/weapon/stock_parts/matter_bin/super - +///////////////////////////////////////// +//////////Tcommsat Stock Parts/////////// +///////////////////////////////////////// datum/design/subspace_ansible name = "Subspace Ansible" @@ -1334,6 +1326,14 @@ datum/design/batteryrack materials = list("$glass" = 2000, "sacid" = 20) build_path = /obj/item/weapon/circuitboard/batteryrack +datum/design/smes_cell + name = "Circuit Design (Superconductive Magnetic Energy Storage)" + desc = "Allows for the construction of circuit boards used to build a SMES." + id = "smes_cell" + req_tech = list("powerstorage" = 7, "engineering" = 5) + build_type = IMPRINTER + materials = list("$glass" = 2000, "sacid" = 20, "$gold" = 1000, "$silver" = 1000, "$diamond" = 500) + build_path = /obj/item/weapon/circuitboard/smes ///////////////////////////////////////// ////////////Medical Tools////////////////