From 170863cfd7a1bf2bfde1a1a4d7fb274042e6621a Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sun, 1 Aug 2021 12:42:08 +0200 Subject: [PATCH] [MIRROR] Circuit component descriptions and module names are now visible to the naked eye. (#7290) * Circuit component descriptions and module names are now visible to the naked eye. (#60545) * Circuit component descriptions and module names are now visible to the naked eye. Co-authored-by: Gurkenglas --- code/game/machinery/computer/crew.dm | 2 +- code/game/machinery/computer/launchpad_control.dm | 2 +- code/game/machinery/computer/security.dm | 4 ++-- .../machinery/components/binary_devices/valve.dm | 2 +- code/modules/research/designs/wiremod_designs.dm | 2 +- code/modules/wiremod/component.dm | 3 --- code/modules/wiremod/components/abstract/module.dm | 7 ++++--- code/modules/wiremod/components/action/light.dm | 2 +- code/modules/wiremod/components/action/mmi.dm | 2 +- code/modules/wiremod/components/action/pathfind.dm | 2 +- code/modules/wiremod/components/action/pull.dm | 2 +- code/modules/wiremod/components/action/radio.dm | 2 +- code/modules/wiremod/components/action/soundemitter.dm | 2 +- code/modules/wiremod/components/action/speech.dm | 2 +- code/modules/wiremod/components/atom/direction.dm | 2 +- code/modules/wiremod/components/atom/gps.dm | 2 +- code/modules/wiremod/components/atom/health.dm | 2 +- code/modules/wiremod/components/atom/hear.dm | 2 +- code/modules/wiremod/components/atom/self.dm | 2 +- code/modules/wiremod/components/atom/species.dm | 2 +- code/modules/wiremod/components/list/concat.dm | 2 +- code/modules/wiremod/components/list/get_column.dm | 2 +- code/modules/wiremod/components/list/index.dm | 2 +- code/modules/wiremod/components/list/index_table.dm | 2 +- code/modules/wiremod/components/list/select.dm | 2 +- code/modules/wiremod/components/list/split.dm | 2 +- code/modules/wiremod/components/math/arithmetic.dm | 2 +- code/modules/wiremod/components/math/comparison.dm | 2 +- code/modules/wiremod/components/math/length.dm | 2 +- code/modules/wiremod/components/math/logic.dm | 2 +- code/modules/wiremod/components/math/not.dm | 2 +- code/modules/wiremod/components/math/random.dm | 2 +- code/modules/wiremod/components/sensors/pressuresensor.dm | 2 +- code/modules/wiremod/components/sensors/tempsensor.dm | 2 +- code/modules/wiremod/components/string/concat.dm | 2 +- code/modules/wiremod/components/string/contains.dm | 2 +- code/modules/wiremod/components/string/textcase.dm | 2 +- code/modules/wiremod/components/string/tonumber.dm | 2 +- code/modules/wiremod/components/string/tostring.dm | 2 +- code/modules/wiremod/components/utility/clock.dm | 2 +- code/modules/wiremod/components/utility/combiner.dm | 2 +- code/modules/wiremod/components/utility/delay.dm | 2 +- code/modules/wiremod/components/utility/multiplexer.dm | 2 +- code/modules/wiremod/components/utility/ram.dm | 2 +- code/modules/wiremod/components/utility/typecheck.dm | 2 +- code/modules/wiremod/integrated_circuit.dm | 3 ++- code/modules/wiremod/shell/airlock.dm | 2 +- code/modules/wiremod/shell/bot.dm | 2 +- code/modules/wiremod/shell/brain_computer_interface.dm | 6 +++--- code/modules/wiremod/shell/compact_remote.dm | 2 +- code/modules/wiremod/shell/controller.dm | 2 +- code/modules/wiremod/shell/drone.dm | 2 +- code/modules/wiremod/shell/moneybot.dm | 4 ++-- code/modules/wiremod/shell/scanner.dm | 2 +- 54 files changed, 61 insertions(+), 62 deletions(-) diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index aa87aa3de9e..08e136fd490 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -22,7 +22,7 @@ /obj/item/circuit_component/medical_console_data display_name = "Crew Monitoring Data" - display_desc = "Outputs the medical statuses of people on the crew monitoring computer, where it can then be filtered with a Select Query component." + desc = "Outputs the medical statuses of people on the crew monitoring computer, where it can then be filtered with a Select Query component." circuit_flags = CIRCUIT_FLAG_INPUT_SIGNAL|CIRCUIT_FLAG_OUTPUT_SIGNAL /// The records retrieved diff --git a/code/game/machinery/computer/launchpad_control.dm b/code/game/machinery/computer/launchpad_control.dm index d2e2f30ed86..dd4d9034855 100644 --- a/code/game/machinery/computer/launchpad_control.dm +++ b/code/game/machinery/computer/launchpad_control.dm @@ -18,7 +18,7 @@ /obj/item/circuit_component/bluespace_launchpad display_name = "Bluespace Launchpad Console" - display_desc = "Teleports anything to and from any location on the station. Doesn't use actual GPS coordinates, but rather offsets from the launchpad itself. Can only go as far as the launchpad can go, which depends on its parts." + desc = "Teleports anything to and from any location on the station. Doesn't use actual GPS coordinates, but rather offsets from the launchpad itself. Can only go as far as the launchpad can go, which depends on its parts." var/datum/port/input/launchpad_id var/datum/port/input/x_pos diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 1de7ec2283c..3946c5fa655 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -28,7 +28,7 @@ /obj/item/circuit_component/arrest_console_data display_name = "Security Records Data" - display_desc = "Outputs the security records data, where it can then be filtered with a Select Query component" + desc = "Outputs the security records data, where it can then be filtered with a Select Query component" circuit_flags = CIRCUIT_FLAG_INPUT_SIGNAL|CIRCUIT_FLAG_OUTPUT_SIGNAL /// The records retrieved @@ -101,7 +101,7 @@ /obj/item/circuit_component/arrest_console_arrest display_name = "Security Records Set Status" - display_desc = "Receives a table to use to set people's arrest status. Table should be from the security records data component. If New Status port isn't set, the status will be decided by the options." + desc = "Receives a table to use to set people's arrest status. Table should be from the security records data component. If New Status port isn't set, the status will be decided by the options." circuit_flags = CIRCUIT_FLAG_INPUT_SIGNAL|CIRCUIT_FLAG_OUTPUT_SIGNAL /// The targets to set the status of. diff --git a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm index 4651447d833..50931894026 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm @@ -88,7 +88,7 @@ It's like a regular ol' straight pipe, but you can turn it on and off. /obj/item/circuit_component/digital_valve display_name = "Digital Valve" - display_desc = "The interface for communicating with a digital valve." + desc = "The interface for communicating with a digital valve." var/obj/machinery/atmospherics/components/binary/valve/digital/attached_valve diff --git a/code/modules/research/designs/wiremod_designs.dm b/code/modules/research/designs/wiremod_designs.dm index a8200913a3d..3b5fb12c639 100644 --- a/code/modules/research/designs/wiremod_designs.dm +++ b/code/modules/research/designs/wiremod_designs.dm @@ -41,7 +41,7 @@ . = ..() if(build_path) var/obj/item/circuit_component/component_path = build_path - desc = initial(component_path.display_desc) + desc = initial(component_path.desc) /datum/design/component/arithmetic name = "Arithmetic Component" diff --git a/code/modules/wiremod/component.dm b/code/modules/wiremod/component.dm index 95e2af3dc15..376a7efa004 100644 --- a/code/modules/wiremod/component.dm +++ b/code/modules/wiremod/component.dm @@ -16,9 +16,6 @@ /// The name of the component shown on the UI var/display_name = "Generic" - /// The description of the component shown on the UI - var/display_desc = "A generic component" - /// The integrated_circuit that this component is attached to. var/obj/item/integrated_circuit/parent diff --git a/code/modules/wiremod/components/abstract/module.dm b/code/modules/wiremod/components/abstract/module.dm index a7da816e6b1..6d200ae717a 100644 --- a/code/modules/wiremod/components/abstract/module.dm +++ b/code/modules/wiremod/components/abstract/module.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/module display_name = "Module" - display_desc = "A component that has other components within it, acting like a function. Use it in your hand to control the amount of input and output ports it has, as well as being able to access the integrated circuit contained inside." + desc = "A component that has other components within it, acting like a function. Use it in your hand to control the amount of input and output ports it has, as well as being able to access the integrated circuit contained inside." var/obj/item/integrated_circuit/module/internal_circuit @@ -28,6 +28,7 @@ /obj/item/integrated_circuit/module/set_display_name(new_name) . = ..() attached_module.display_name = new_name + attached_module.name = "module ([new_name])" /obj/item/integrated_circuit/module/load_component(type) if(!attached_module) @@ -47,7 +48,7 @@ /obj/item/circuit_component/module_input display_name = "Input" - display_desc = "A component that receives data from the module it is attached to" + desc = "A component that receives data from the module it is attached to" removable = FALSE @@ -60,7 +61,7 @@ /obj/item/circuit_component/module_output display_name = "Output" - display_desc = "A component that outputs data to the module it is attached to." + desc = "A component that outputs data to the module it is attached to." removable = FALSE diff --git a/code/modules/wiremod/components/action/light.dm b/code/modules/wiremod/components/action/light.dm index d0591a92ceb..501026abf85 100644 --- a/code/modules/wiremod/components/action/light.dm +++ b/code/modules/wiremod/components/action/light.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/light display_name = "Light" - display_desc = "A component that emits a light of a specific brightness and colour. Requires a shell." + desc = "A component that emits a light of a specific brightness and colour. Requires a shell." /// The colours of the light var/datum/port/input/red diff --git a/code/modules/wiremod/components/action/mmi.dm b/code/modules/wiremod/components/action/mmi.dm index d2795c4dec6..50ce5ce7f64 100644 --- a/code/modules/wiremod/components/action/mmi.dm +++ b/code/modules/wiremod/components/action/mmi.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/mmi display_name = "Man-Machine Interface" - display_desc = "A component that allows MMI to enter shells to send output signals." + desc = "A component that allows MMI to enter shells to send output signals." /// The message to send to the MMI in the shell. var/datum/port/input/message diff --git a/code/modules/wiremod/components/action/pathfind.dm b/code/modules/wiremod/components/action/pathfind.dm index a0ca4a78fce..ff0e9b0d823 100644 --- a/code/modules/wiremod/components/action/pathfind.dm +++ b/code/modules/wiremod/components/action/pathfind.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/pathfind display_name = "Pathfinder" - display_desc = "When triggered, the next step to the target's location as an entity. This can be used with the direction component and the drone shell to make it move on its own. The Id Card input port is for considering ID access when pathing, it does not give the shell actual access." + desc = "When triggered, the next step to the target's location as an entity. This can be used with the direction component and the drone shell to make it move on its own. The Id Card input port is for considering ID access when pathing, it does not give the shell actual access." circuit_flags = CIRCUIT_FLAG_INPUT_SIGNAL|CIRCUIT_FLAG_OUTPUT_SIGNAL var/datum/port/input/input_X diff --git a/code/modules/wiremod/components/action/pull.dm b/code/modules/wiremod/components/action/pull.dm index 439f042860c..fa8d4d52dad 100644 --- a/code/modules/wiremod/components/action/pull.dm +++ b/code/modules/wiremod/components/action/pull.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/pull display_name = "Start Pulling" - display_desc = "A component that can force the shell to pull entities. Only works for drone shells." + desc = "A component that can force the shell to pull entities. Only works for drone shells." /// Frequency input var/datum/port/input/target diff --git a/code/modules/wiremod/components/action/radio.dm b/code/modules/wiremod/components/action/radio.dm index 4be209c8ccd..0347d414b58 100644 --- a/code/modules/wiremod/components/action/radio.dm +++ b/code/modules/wiremod/components/action/radio.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/radio display_name = "Radio" - display_desc = "A component that can listen and send frequencies. If set to private, the component will only receive signals from other components attached to circuitboards with the same owner id." + desc = "A component that can listen and send frequencies. If set to private, the component will only receive signals from other components attached to circuitboards with the same owner id." /// Frequency input var/datum/port/input/freq diff --git a/code/modules/wiremod/components/action/soundemitter.dm b/code/modules/wiremod/components/action/soundemitter.dm index c0e48e9c916..ac644e15de6 100644 --- a/code/modules/wiremod/components/action/soundemitter.dm +++ b/code/modules/wiremod/components/action/soundemitter.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/soundemitter display_name = "Sound Emitter" - display_desc = "A component that emits a sound when it receives an input. The frequency is a multiplier which determines the speed at which the sound is played" + desc = "A component that emits a sound when it receives an input. The frequency is a multiplier which determines the speed at which the sound is played" circuit_flags = CIRCUIT_FLAG_INPUT_SIGNAL|CIRCUIT_FLAG_OUTPUT_SIGNAL /// Volume of the sound when played diff --git a/code/modules/wiremod/components/action/speech.dm b/code/modules/wiremod/components/action/speech.dm index 739b96f8c05..2abe93272ec 100644 --- a/code/modules/wiremod/components/action/speech.dm +++ b/code/modules/wiremod/components/action/speech.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/speech display_name = "Speech" - display_desc = "A component that sends a message. Requires a shell." + desc = "A component that sends a message. Requires a shell." circuit_flags = CIRCUIT_FLAG_INPUT_SIGNAL|CIRCUIT_FLAG_OUTPUT_SIGNAL /// The message to send diff --git a/code/modules/wiremod/components/atom/direction.dm b/code/modules/wiremod/components/atom/direction.dm index 85ddb9524f0..eb89c96c4a1 100644 --- a/code/modules/wiremod/components/atom/direction.dm +++ b/code/modules/wiremod/components/atom/direction.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/direction display_name = "Get Direction" - display_desc = "A component that returns the direction of itself and an entity." + desc = "A component that returns the direction of itself and an entity." /// The input port var/datum/port/input/input_port diff --git a/code/modules/wiremod/components/atom/gps.dm b/code/modules/wiremod/components/atom/gps.dm index 2729d65c5b2..cdf61385a0e 100644 --- a/code/modules/wiremod/components/atom/gps.dm +++ b/code/modules/wiremod/components/atom/gps.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/gps display_name = "Internal GPS" - display_desc = "A component that returns the xyz co-ordinates of itself." + desc = "A component that returns the xyz co-ordinates of itself." /// The result from the output var/datum/port/output/x_pos diff --git a/code/modules/wiremod/components/atom/health.dm b/code/modules/wiremod/components/atom/health.dm index b4f28be4fb9..d4d575102a0 100644 --- a/code/modules/wiremod/components/atom/health.dm +++ b/code/modules/wiremod/components/atom/health.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/health display_name = "Get Health" - display_desc = "A component that returns the health of an organism." + desc = "A component that returns the health of an organism." /// The input port var/datum/port/input/input_port diff --git a/code/modules/wiremod/components/atom/hear.dm b/code/modules/wiremod/components/atom/hear.dm index f7d49846fcb..23fbba1e0a9 100644 --- a/code/modules/wiremod/components/atom/hear.dm +++ b/code/modules/wiremod/components/atom/hear.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/hear display_name = "Voice Activator" - display_desc = "A component that listens for messages. Requires a shell." + desc = "A component that listens for messages. Requires a shell." /// The message heard var/datum/port/output/message_port diff --git a/code/modules/wiremod/components/atom/self.dm b/code/modules/wiremod/components/atom/self.dm index 2739d8f9a08..7389a19f692 100644 --- a/code/modules/wiremod/components/atom/self.dm +++ b/code/modules/wiremod/components/atom/self.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/self display_name = "Self" - display_desc = "A component that returns the current shell." + desc = "A component that returns the current shell." /// The shell this component is attached to. var/datum/port/output/output diff --git a/code/modules/wiremod/components/atom/species.dm b/code/modules/wiremod/components/atom/species.dm index 4810218cc62..533b9ad8d9a 100644 --- a/code/modules/wiremod/components/atom/species.dm +++ b/code/modules/wiremod/components/atom/species.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/species display_name = "Get Species" - display_desc = "A component that returns the species of its input." + desc = "A component that returns the species of its input." /// The input port var/datum/port/input/input_port diff --git a/code/modules/wiremod/components/list/concat.dm b/code/modules/wiremod/components/list/concat.dm index c8018742ed3..5a197d2f9e9 100644 --- a/code/modules/wiremod/components/list/concat.dm +++ b/code/modules/wiremod/components/list/concat.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/concat_list display_name = "Concatenate List" - display_desc = "A component that joins up a list with a separator into a single string." + desc = "A component that joins up a list with a separator into a single string." /// The input port var/datum/port/input/list_port diff --git a/code/modules/wiremod/components/list/get_column.dm b/code/modules/wiremod/components/list/get_column.dm index 0fb07b50c34..46015eab246 100644 --- a/code/modules/wiremod/components/list/get_column.dm +++ b/code/modules/wiremod/components/list/get_column.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/get_column display_name = "Get Column" - display_desc = "Gets the column of a table and returns it as a regular list." + desc = "Gets the column of a table and returns it as a regular list." circuit_flags = CIRCUIT_FLAG_INPUT_SIGNAL|CIRCUIT_FLAG_OUTPUT_SIGNAL /// The list to perform the filter on diff --git a/code/modules/wiremod/components/list/index.dm b/code/modules/wiremod/components/list/index.dm index 66c672375c3..fbd02f0cff4 100644 --- a/code/modules/wiremod/components/list/index.dm +++ b/code/modules/wiremod/components/list/index.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/index display_name = "Index List" - display_desc = "A component that returns the value of a list at a given index." + desc = "A component that returns the value of a list at a given index." /// The input port var/datum/port/input/list_port diff --git a/code/modules/wiremod/components/list/index_table.dm b/code/modules/wiremod/components/list/index_table.dm index 582365397db..da5096dc1a0 100644 --- a/code/modules/wiremod/components/list/index_table.dm +++ b/code/modules/wiremod/components/list/index_table.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/index_table display_name = "Index Table" - display_desc = "Gets the row of a table using the index inputted. Will return no value if the index is invalid or a proper table is not returned." + desc = "Gets the row of a table using the index inputted. Will return no value if the index is invalid or a proper table is not returned." circuit_flags = CIRCUIT_FLAG_INPUT_SIGNAL|CIRCUIT_FLAG_OUTPUT_SIGNAL /// The list to perform the filter on diff --git a/code/modules/wiremod/components/list/select.dm b/code/modules/wiremod/components/list/select.dm index e0142ab1427..34bd15e2553 100644 --- a/code/modules/wiremod/components/list/select.dm +++ b/code/modules/wiremod/components/list/select.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/select display_name = "Select Query" - display_desc = "A component used with USB cables that can perform select queries on a list based on the column name selected. The values are then compared with the comparison input." + desc = "A component used with USB cables that can perform select queries on a list based on the column name selected. The values are then compared with the comparison input." circuit_flags = CIRCUIT_FLAG_INPUT_SIGNAL|CIRCUIT_FLAG_OUTPUT_SIGNAL /// The list to perform the filter on diff --git a/code/modules/wiremod/components/list/split.dm b/code/modules/wiremod/components/list/split.dm index 3bd372d7c75..928dc97ec68 100644 --- a/code/modules/wiremod/components/list/split.dm +++ b/code/modules/wiremod/components/list/split.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/split display_name = "Split" - display_desc = "Splits a string by the separator, turning it into a list" + desc = "Splits a string by the separator, turning it into a list" /// The input port var/datum/port/input/input_port diff --git a/code/modules/wiremod/components/math/arithmetic.dm b/code/modules/wiremod/components/math/arithmetic.dm index 283a6b7b73a..dd8ceb1ae7d 100644 --- a/code/modules/wiremod/components/math/arithmetic.dm +++ b/code/modules/wiremod/components/math/arithmetic.dm @@ -6,7 +6,7 @@ */ /obj/item/circuit_component/arithmetic display_name = "Arithmetic" - display_desc = "General arithmetic component with arithmetic capabilities." + desc = "General arithmetic component with arithmetic capabilities." /// The amount of input ports to have var/input_port_amount = 4 diff --git a/code/modules/wiremod/components/math/comparison.dm b/code/modules/wiremod/components/math/comparison.dm index af90d612179..6437d73135d 100644 --- a/code/modules/wiremod/components/math/comparison.dm +++ b/code/modules/wiremod/components/math/comparison.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/compare/comparison display_name = "Comparison" - display_desc = "A component that compares two objects." + desc = "A component that compares two objects." input_port_amount = 2 var/current_type = PORT_TYPE_ANY diff --git a/code/modules/wiremod/components/math/length.dm b/code/modules/wiremod/components/math/length.dm index c7414cacf23..ab3de917cff 100644 --- a/code/modules/wiremod/components/math/length.dm +++ b/code/modules/wiremod/components/math/length.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/length display_name = "Length" - display_desc = "A component that returns the length of its input." + desc = "A component that returns the length of its input." /// The input port var/datum/port/input/input_port diff --git a/code/modules/wiremod/components/math/logic.dm b/code/modules/wiremod/components/math/logic.dm index efb6b410b0e..e87669b8da9 100644 --- a/code/modules/wiremod/components/math/logic.dm +++ b/code/modules/wiremod/components/math/logic.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/compare/logic display_name = "Logic" - display_desc = "A component with 'and' and 'or' capabilities." + desc = "A component with 'and' and 'or' capabilities." /obj/item/circuit_component/compare/logic/populate_options() var/static/component_options = list( diff --git a/code/modules/wiremod/components/math/not.dm b/code/modules/wiremod/components/math/not.dm index 5e2f22bfcb7..03e8782333f 100644 --- a/code/modules/wiremod/components/math/not.dm +++ b/code/modules/wiremod/components/math/not.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/not display_name = "Not" - display_desc = "A component that inverts its input." + desc = "A component that inverts its input." /// The input port var/datum/port/input/input_port diff --git a/code/modules/wiremod/components/math/random.dm b/code/modules/wiremod/components/math/random.dm index 493ffe298b3..9784b082ea4 100644 --- a/code/modules/wiremod/components/math/random.dm +++ b/code/modules/wiremod/components/math/random.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/random display_name = "Random" - display_desc = "A component that returns random values." + desc = "A component that returns random values." /// The minimum value that the random number can be var/datum/port/input/minimum diff --git a/code/modules/wiremod/components/sensors/pressuresensor.dm b/code/modules/wiremod/components/sensors/pressuresensor.dm index 633fec36036..25f39b9c8e4 100644 --- a/code/modules/wiremod/components/sensors/pressuresensor.dm +++ b/code/modules/wiremod/components/sensors/pressuresensor.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/pressuresensor display_name = "Pressure Sensor" - display_desc = "Outputs the current pressure of the tile" + desc = "Outputs the current pressure of the tile" circuit_flags = CIRCUIT_FLAG_INPUT_SIGNAL|CIRCUIT_FLAG_OUTPUT_SIGNAL diff --git a/code/modules/wiremod/components/sensors/tempsensor.dm b/code/modules/wiremod/components/sensors/tempsensor.dm index 7c1dbfde93d..bb2410ce77d 100644 --- a/code/modules/wiremod/components/sensors/tempsensor.dm +++ b/code/modules/wiremod/components/sensors/tempsensor.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/tempsensor display_name = "Temperature Sensor" - display_desc = "Outputs the current temperature of the tile" + desc = "Outputs the current temperature of the tile" circuit_flags = CIRCUIT_FLAG_INPUT_SIGNAL|CIRCUIT_FLAG_OUTPUT_SIGNAL diff --git a/code/modules/wiremod/components/string/concat.dm b/code/modules/wiremod/components/string/concat.dm index e00b20d4faa..cfc725c71b4 100644 --- a/code/modules/wiremod/components/string/concat.dm +++ b/code/modules/wiremod/components/string/concat.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/concat display_name = "Concatenate" - display_desc = "A component that combines strings." + desc = "A component that combines strings." /// The amount of input ports to have var/input_port_amount = 4 diff --git a/code/modules/wiremod/components/string/contains.dm b/code/modules/wiremod/components/string/contains.dm index 61c48a476b2..9d385286f97 100644 --- a/code/modules/wiremod/components/string/contains.dm +++ b/code/modules/wiremod/components/string/contains.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/compare/contains display_name = "String Contains" - display_desc = "Checks if a string contains a word/letter" + desc = "Checks if a string contains a word/letter" input_port_amount = 0 diff --git a/code/modules/wiremod/components/string/textcase.dm b/code/modules/wiremod/components/string/textcase.dm index ba34c43177a..346d6f7dc74 100644 --- a/code/modules/wiremod/components/string/textcase.dm +++ b/code/modules/wiremod/components/string/textcase.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/textcase display_name = "Text Case" - display_desc = "A component that makes its input uppercase or lowercase." + desc = "A component that makes its input uppercase or lowercase." /// The input port var/datum/port/input/input_port diff --git a/code/modules/wiremod/components/string/tonumber.dm b/code/modules/wiremod/components/string/tonumber.dm index 068629d2666..7cafe9c13f4 100644 --- a/code/modules/wiremod/components/string/tonumber.dm +++ b/code/modules/wiremod/components/string/tonumber.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/tonumber display_name = "To Number" - display_desc = "A component that converts its input (a string) to a number. If there's text in the input, it'll only consider it if it starts with a number. It will take that number and ignore the rest." + desc = "A component that converts its input (a string) to a number. If there's text in the input, it'll only consider it if it starts with a number. It will take that number and ignore the rest." /// The input port var/datum/port/input/input_port diff --git a/code/modules/wiremod/components/string/tostring.dm b/code/modules/wiremod/components/string/tostring.dm index fb2e9708bb1..9d7c6450982 100644 --- a/code/modules/wiremod/components/string/tostring.dm +++ b/code/modules/wiremod/components/string/tostring.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/tostring display_name = "To String" - display_desc = "A component that converts its input to text." + desc = "A component that converts its input to text." /// The input port var/datum/port/input/input_port diff --git a/code/modules/wiremod/components/utility/clock.dm b/code/modules/wiremod/components/utility/clock.dm index 5298fb35d6e..0505b935fa6 100644 --- a/code/modules/wiremod/components/utility/clock.dm +++ b/code/modules/wiremod/components/utility/clock.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/clock display_name = "Clock" - display_desc = "A component that repeatedly fires." + desc = "A component that repeatedly fires." /// Whether the clock is on or not var/datum/port/input/on diff --git a/code/modules/wiremod/components/utility/combiner.dm b/code/modules/wiremod/components/utility/combiner.dm index af2bfc07486..d803dc3632d 100644 --- a/code/modules/wiremod/components/utility/combiner.dm +++ b/code/modules/wiremod/components/utility/combiner.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/combiner display_name = "Combiner" - display_desc = "A component that combines multiple inputs to provide 1 output." + desc = "A component that combines multiple inputs to provide 1 output." /// The amount of input ports to have var/input_port_amount = 4 diff --git a/code/modules/wiremod/components/utility/delay.dm b/code/modules/wiremod/components/utility/delay.dm index c90db7add4f..b8ee350490a 100644 --- a/code/modules/wiremod/components/utility/delay.dm +++ b/code/modules/wiremod/components/utility/delay.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/delay display_name = "Delay" - display_desc = "A component that delays a signal by a specified duration." + desc = "A component that delays a signal by a specified duration." /// Amount to delay by var/datum/port/input/delay_amount diff --git a/code/modules/wiremod/components/utility/multiplexer.dm b/code/modules/wiremod/components/utility/multiplexer.dm index 4f2ecf800ec..155a8a9bd49 100644 --- a/code/modules/wiremod/components/utility/multiplexer.dm +++ b/code/modules/wiremod/components/utility/multiplexer.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/multiplexer display_name = "Multiplexer" - display_desc = "A component that allows you to selectively choose which input port provides an output. The first port is the selector and takes a number between 1 and the maximum port amount." + desc = "A component that allows you to selectively choose which input port provides an output. The first port is the selector and takes a number between 1 and the maximum port amount." circuit_flags = CIRCUIT_FLAG_INPUT_SIGNAL|CIRCUIT_FLAG_OUTPUT_SIGNAL /// The port to select from, goes from 1 to input_port_amount diff --git a/code/modules/wiremod/components/utility/ram.dm b/code/modules/wiremod/components/utility/ram.dm index abceb5ead11..ce92154dad1 100644 --- a/code/modules/wiremod/components/utility/ram.dm +++ b/code/modules/wiremod/components/utility/ram.dm @@ -7,7 +7,7 @@ */ /obj/item/circuit_component/ram display_name = "RAM" - display_desc = "A component that retains a variable." + desc = "A component that retains a variable." circuit_flags = CIRCUIT_FLAG_OUTPUT_SIGNAL /// The input to store diff --git a/code/modules/wiremod/components/utility/typecheck.dm b/code/modules/wiremod/components/utility/typecheck.dm index faef753aca5..84392a44a26 100644 --- a/code/modules/wiremod/components/utility/typecheck.dm +++ b/code/modules/wiremod/components/utility/typecheck.dm @@ -5,7 +5,7 @@ */ /obj/item/circuit_component/compare/typecheck display_name = "Typecheck" - display_desc = "A component that checks the type of its input." + desc = "A component that checks the type of its input." input_port_amount = 1 diff --git a/code/modules/wiremod/integrated_circuit.dm b/code/modules/wiremod/integrated_circuit.dm index 37ec8397c1b..57dabd0ab24 100644 --- a/code/modules/wiremod/integrated_circuit.dm +++ b/code/modules/wiremod/integrated_circuit.dm @@ -7,6 +7,7 @@ */ /obj/item/integrated_circuit name = "integrated circuit" + desc = "By inserting components and a cell into this, wiring them up, and putting them into a shell, anyone can pretend to be a programmer." icon = 'icons/obj/module.dmi' icon_state = "integrated_circuit" inhand_icon_state = "electronic" @@ -266,7 +267,7 @@ examined = examined_component.resolve() .["examined_name"] = examined?.display_name - .["examined_desc"] = examined?.display_desc + .["examined_desc"] = examined?.desc .["examined_notices"] = examined?.get_ui_notices() .["examined_rel_x"] = examined_rel_x .["examined_rel_y"] = examined_rel_y diff --git a/code/modules/wiremod/shell/airlock.dm b/code/modules/wiremod/shell/airlock.dm index b31611187f0..b44bb40d02e 100644 --- a/code/modules/wiremod/shell/airlock.dm +++ b/code/modules/wiremod/shell/airlock.dm @@ -35,7 +35,7 @@ /obj/item/circuit_component/airlock display_name = "Airlock" - display_desc = "The general interface with an airlock. Includes general statuses of the airlock" + desc = "The general interface with an airlock. Includes general statuses of the airlock" /// Called when attack_hand is called on the shell. var/obj/machinery/door/airlock/attached_airlock diff --git a/code/modules/wiremod/shell/bot.dm b/code/modules/wiremod/shell/bot.dm index 752cb06af41..30da1f9a1fe 100644 --- a/code/modules/wiremod/shell/bot.dm +++ b/code/modules/wiremod/shell/bot.dm @@ -23,7 +23,7 @@ /obj/item/circuit_component/bot display_name = "Bot" - display_desc = "Triggers when someone interacts with the bot." + desc = "Triggers when someone interacts with the bot." /// Called when attack_hand is called on the shell. var/datum/port/output/signal diff --git a/code/modules/wiremod/shell/brain_computer_interface.dm b/code/modules/wiremod/shell/brain_computer_interface.dm index ece60342f90..e05720a420f 100644 --- a/code/modules/wiremod/shell/brain_computer_interface.dm +++ b/code/modules/wiremod/shell/brain_computer_interface.dm @@ -35,11 +35,11 @@ /obj/item/circuit_component/bci display_name = "Brain-Computer Interface" - display_desc = "Used to receive inputs for the brain-computer interface. User is presented with three buttons." + desc = "Used to receive inputs for the brain-computer interface. User is presented with three buttons." /obj/item/circuit_component/bci_action display_name = "BCI Action" - display_desc = "Represents an action the user can take when implanted with the brain-computer interface." + desc = "Represents an action the user can take when implanted with the brain-computer interface." /// The name to use for the button var/datum/port/input/button_name @@ -155,7 +155,7 @@ /obj/item/circuit_component/bci_core display_name = "BCI Core" - display_desc = "Controls the core operations of the BCI." + desc = "Controls the core operations of the BCI." /// A reference to the action button to look at charge/get info var/datum/action/innate/bci_charge_action/charge_action diff --git a/code/modules/wiremod/shell/compact_remote.dm b/code/modules/wiremod/shell/compact_remote.dm index 169e8e11939..c1f99e55251 100644 --- a/code/modules/wiremod/shell/compact_remote.dm +++ b/code/modules/wiremod/shell/compact_remote.dm @@ -22,7 +22,7 @@ /obj/item/circuit_component/compact_remote display_name = "Compact Remote" - display_desc = "Used to receive inputs from the compact remote shell. Use the shell in hand to trigger the output signal." + desc = "Used to receive inputs from the compact remote shell. Use the shell in hand to trigger the output signal." /// Called when attack_self is called on the shell. var/datum/port/output/signal diff --git a/code/modules/wiremod/shell/controller.dm b/code/modules/wiremod/shell/controller.dm index 6b9084bd33d..937160824b1 100644 --- a/code/modules/wiremod/shell/controller.dm +++ b/code/modules/wiremod/shell/controller.dm @@ -23,7 +23,7 @@ /obj/item/circuit_component/controller display_name = "Controller" - display_desc = "Used to receive inputs from the controller shell. Use the shell in hand to trigger the output signal. Alt-click for the alternate signal. Right click for the extra signal." + desc = "Used to receive inputs from the controller shell. Use the shell in hand to trigger the output signal. Alt-click for the alternate signal. Right click for the extra signal." /// The three separate buttons that are called in attack_hand on the shell. var/datum/port/output/signal diff --git a/code/modules/wiremod/shell/drone.dm b/code/modules/wiremod/shell/drone.dm index 73312bebd6f..d091f20b65f 100644 --- a/code/modules/wiremod/shell/drone.dm +++ b/code/modules/wiremod/shell/drone.dm @@ -27,7 +27,7 @@ /obj/item/circuit_component/bot_circuit display_name = "Drone" - display_desc = "Used to send movement output signals to the drone shell." + desc = "Used to send movement output signals to the drone shell." /// The inputs to allow for the drone to move var/datum/port/input/north diff --git a/code/modules/wiremod/shell/moneybot.dm b/code/modules/wiremod/shell/moneybot.dm index ab71a0e752a..205de700529 100644 --- a/code/modules/wiremod/shell/moneybot.dm +++ b/code/modules/wiremod/shell/moneybot.dm @@ -38,7 +38,7 @@ /obj/item/circuit_component/money_dispenser display_name = "Money Dispenser" - display_desc = "Used to dispense money from the money bot. Money is taken from the internal storage of money." + desc = "Used to dispense money from the money bot. Money is taken from the internal storage of money." circuit_flags = CIRCUIT_FLAG_INPUT_SIGNAL|CIRCUIT_FLAG_OUTPUT_SIGNAL /// The amount of money to dispense @@ -82,7 +82,7 @@ /obj/item/circuit_component/money_bot display_name = "Money Bot" var/obj/structure/money_bot/attached_bot - display_desc = "Used to receive input signals when money is inserted into the money bot shell and also keep track of the total money in the shell." + desc = "Used to receive input signals when money is inserted into the money bot shell and also keep track of the total money in the shell." /// Total money in the shell var/datum/port/output/total_money diff --git a/code/modules/wiremod/shell/scanner.dm b/code/modules/wiremod/shell/scanner.dm index 470ba238657..fd469109141 100644 --- a/code/modules/wiremod/shell/scanner.dm +++ b/code/modules/wiremod/shell/scanner.dm @@ -22,7 +22,7 @@ /obj/item/circuit_component/wiremod_scanner display_name = "Scanner" - display_desc = "Used to receive scanned entities from the scanner." + desc = "Used to receive scanned entities from the scanner." /// Called when afterattack is called on the shell. var/datum/port/output/signal