Added macro for computer boards to assemble their name.

Adds the ability to change it from a single place. Also makes arguably cleaner code. Capitalization of nouns fixed.

code/game/machinery/computer/buildandrepair.dm

@@ -1,9 +1,14 @@
 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
 
+#ifdef T_BOARD
+#error T_BOARD already defined elsewhere, we can't use it.
+#endif
+#define T_BOARD(name)	"circuit board (" + (name) + ")"
+
 /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
@@ -56,13 +61,13 @@
 */
 
 /obj/item/weapon/circuitboard/message_monitor
-	name = "Circuit board (Message Monitor Console)"
+	name = T_BOARD("message monitor console")
 	build_path = /obj/machinery/computer/message_monitor
 	origin_tech = "programming=3"
 
 //TODO: Move these into computer/camera.dm
 /obj/item/weapon/circuitboard/security
-	name = "Circuit board (Security Camera Monitor)"
+	name = T_BOARD("security camera monitor")
 	build_path = /obj/machinery/computer/security
 	var/network = list("SS13")
 	req_access = list(access_security)
@@ -78,81 +83,81 @@
 		network = C.network
 
 /obj/item/weapon/circuitboard/security/engineering
-	name = "Circuit board (Engineering Camera Monitor)"
+	name = T_BOARD("engineering camera monitor")
 	build_path = /obj/machinery/computer/security/engineering
 	network = list("Engineering","Power Alarms","Atmosphere Alarms","Fire Alarms")
 	req_access = list()
 /obj/item/weapon/circuitboard/security/mining
-	name = "Circuit board (Mining Camera Monitor)"
+	name = T_BOARD("mining camera monitor")
 	build_path = /obj/machinery/computer/security/mining
 	network = list("MINE")
 	req_access = list()
 /obj/item/weapon/circuitboard/aicore
-	name = "Circuit board (AI Core)"
+	name = T_BOARD("AI core")
 	origin_tech = "programming=4;biotech=2"
 	board_type = "other"
 /obj/item/weapon/circuitboard/aiupload
-	name = "Circuit board (AI Upload Console)"
+	name = T_BOARD("AI upload console")
 	build_path = /obj/machinery/computer/aiupload
 	origin_tech = "programming=4"
 /obj/item/weapon/circuitboard/borgupload
-	name = "Circuit board (Cyborg Upload Console)"
+	name = T_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 Console)"
+	name = T_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)"
+	name = T_BOARD("PanD.E.M.I.C. 2200")
 	build_path = /obj/machinery/computer/pandemic
 	origin_tech = "programming=2;biotech=2"
 /obj/item/weapon/circuitboard/scan_consolenew
-	name = "Circuit board (DNA Machine)"
+	name = T_BOARD("DNA machine")
 	build_path = /obj/machinery/computer/scan_consolenew
 	origin_tech = "programming=2;biotech=2"
 /obj/item/weapon/circuitboard/communications
-	name = "Circuit board (Communications Console)"
+	name = T_BOARD("communications console")
 	build_path = /obj/machinery/computer/communications
 	origin_tech = "programming=2;magnets=2"
 /obj/item/weapon/circuitboard/card
-	name = "Circuit board (ID Card Modification Console)"
+	name = T_BOARD("ID card modification console")
 	build_path = /obj/machinery/computer/card
 /obj/item/weapon/circuitboard/card/centcom
-	name = "Circuit board (CentCom ID Card Modification Console)"
+	name = T_BOARD("CentCom ID card modification console")
 	build_path = /obj/machinery/computer/card/centcom
 //obj/item/weapon/circuitboard/shield
-//	name = "Circuit board (Shield Control)"
+//	name = T_BOARD("Shield Control")
 //	build_path = "/obj/machinery/computer/stationshield"
 /obj/item/weapon/circuitboard/teleporter
-	name = "Circuit board (Teleporter Control Console)"
+	name = T_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 Console)"
+	name = T_BOARD("security records console")
 	build_path = /obj/machinery/computer/secure_data
 /obj/item/weapon/circuitboard/skills
-	name = "Circuit board (Employment Records Console)"
+	name = T_BOARD("employment records console")
 	build_path = /obj/machinery/computer/skills
 /obj/item/weapon/circuitboard/stationalert
-	name = "Circuit board (Station Alert Console)"
+	name = T_BOARD("station alert console")
 	build_path = /obj/machinery/computer/station_alert
 ///obj/item/weapon/circuitboard/atmospheresiphonswitch
-//	name = "Circuit board (Atmosphere Siphon Control)"
+//	name = T_BOARD("Atmosphere Siphon Control")
 //	build_path = /obj/machinery/computer/atmosphere/siphonswitch
 /obj/item/weapon/circuitboard/air_management
-	name = "Circuit board (Atmosphere Monitoring Console)"
+	name = T_BOARD("atmosphere monitoring console")
 	build_path = /obj/machinery/computer/general_air_control
 	var/frequency = 1439
 /obj/item/weapon/circuitboard/air_management/tank_control
-	name = "Circuit board (Tank Control)"
+	name = T_BOARD("tank control")
 	build_path = /obj/machinery/computer/general_air_control/large_tank_control
 	frequency = 1441
 /obj/item/weapon/circuitboard/air_management/supermatter_core
-	name = "Circuit board (Core Control)"
+	name = T_BOARD("core control")
 	build_path = /obj/machinery/computer/general_air_control/supermatter_core
 	frequency = 1438
 /obj/item/weapon/circuitboard/air_management/injector_control
-	name = "Circuit board (Injector Control)"
+	name = T_BOARD("injector control")
 	build_path = /obj/machinery/computer/general_air_control/fuel_injection
 
 /obj/item/weapon/circuitboard/air_management/construct(var/obj/machinery/computer/general_air_control/C)
@@ -164,72 +169,72 @@
 		frequency = C.frequency
 
 /obj/item/weapon/circuitboard/atmos_alert
-	name = "Circuit board (Atmospheric Alert Console)"
+	name = T_BOARD("atmospheric alert console")
 	build_path = /obj/machinery/computer/atmos_alert
 /obj/item/weapon/circuitboard/pod
-	name = "Circuit board (Massdriver control)"
+	name = T_BOARD("massdriver control")
 	build_path = /obj/machinery/computer/pod
 /obj/item/weapon/circuitboard/robotics
-	name = "Circuit board (Robotics Control Console)"
+	name = T_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 Console)"
+	name = T_BOARD("drone control console")
 	build_path = /obj/machinery/computer/drone_control
 	origin_tech = "programming=3"
 /obj/item/weapon/circuitboard/cloning
-	name = "Circuit board (Cloning Control Console)"
+	name = T_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 Machine)"
+	name = T_BOARD("arcade machine")
 	build_path = /obj/machinery/computer/arcade
 	origin_tech = "programming=1"
 /obj/item/weapon/circuitboard/turbine_control
-	name = "Circuit board (Turbine Control Console)"
+	name = T_BOARD("turbine control console")
 	build_path = /obj/machinery/computer/turbine_computer
 /obj/item/weapon/circuitboard/solar_control
-	name = "Circuit board (Solar Control Console)"
+	name = T_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 Monitoring Console)"
+	name = T_BOARD("power monitoring console")
 	build_path = /obj/machinery/computer/power_monitor
 /obj/item/weapon/circuitboard/olddoor
-	name = "Circuit board (DoorMex)"
+	name = T_BOARD("DoorMex")
 	build_path = /obj/machinery/computer/pod/old
 /obj/item/weapon/circuitboard/syndicatedoor
-	name = "Circuit board (ProComp Executive)"
+	name = T_BOARD("ProComp Executive")
 	build_path = /obj/machinery/computer/pod/old/syndicate
 /obj/item/weapon/circuitboard/swfdoor
-	name = "Circuit board (Magix)"
+	name = T_BOARD("Magix")
 	build_path = /obj/machinery/computer/pod/old/swf
 /obj/item/weapon/circuitboard/prisoner
-	name = "Circuit board (Prisoner Management Console)"
+	name = T_BOARD("prisoner management console")
 	build_path = /obj/machinery/computer/prisoner
 /obj/item/weapon/circuitboard/rdconsole
-	name = "Circuit Board (R&D Control Console)"
+	name = T_BOARD("R&D control console")
 	build_path = /obj/machinery/computer/rdconsole/core
 /obj/item/weapon/circuitboard/mecha_control
-	name = "Circuit Board (Exosuit Control Console)"
+	name = T_BOARD("exosuit control console")
 	build_path = /obj/machinery/computer/mecha
 /obj/item/weapon/circuitboard/rdservercontrol
-	name = "Circuit Board (R&D Server Control Console)"
+	name = T_BOARD("R&D server control console")
 	build_path = /obj/machinery/computer/rdservercontrol
 /obj/item/weapon/circuitboard/crew
-	name = "Circuit board (Crew Monitoring Console)"
+	name = T_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
-	name = "Circuit board (Mech Bay Power Control Console)"
+	name = T_BOARD("mech bay power control console")
 	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 = T_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 = T_BOARD("supply shuttle console")
 	build_path = /obj/machinery/computer/supplycomp
 	origin_tech = "programming=3"
 	var/contraband_enabled = 0
@@ -243,58 +248,58 @@
 		contraband_enabled = SC.can_order_contraband
 
 /obj/item/weapon/circuitboard/operating
-	name = "Circuit board (Patient Monitoring Console)"
+	name = T_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 Console)"
+	name = T_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 Console)"
+	name = T_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 Console)"
+	name = T_BOARD("telecommunications traffic control console")
 	build_path = /obj/machinery/computer/telecomms/traffic
 	origin_tech = "programming=3"
 
 /obj/item/weapon/circuitboard/curefab
-	name = "Circuit board (Cure fab)"
+	name = T_BOARD("cure fabricator")
 	build_path = /obj/machinery/computer/curer
 /obj/item/weapon/circuitboard/splicer
-	name = "Circuit board (Disease Splicer)"
+	name = T_BOARD("disease splicer")
 	build_path = /obj/machinery/computer/diseasesplicer
 /obj/item/weapon/circuitboard/mining_shuttle
-	name = "Circuit board (Mining Shuttle Console)"
+	name = T_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 Console)"
+	name = T_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 Console)"
+	name = T_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 Console)"
+	name = T_BOARD("holodeck control console")
 	build_path = /obj/machinery/computer/HolodeckControl
 	origin_tech = "programming=4"
 /obj/item/weapon/circuitboard/aifixer
-	name = "Circuit board (AI Integrity Restorer)"
+	name = T_BOARD("AI integrity restorer")
 	build_path = /obj/machinery/computer/aifixer
 	origin_tech = "programming=3;biotech=2"
 /obj/item/weapon/circuitboard/area_atmos
-	name = "Circuit board (Area Air Control Console)"
+	name = T_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 Console)"
+	name = T_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)"
+	name = T_BOARD("RCON remote control console")
 	build_path = /obj/machinery/computer/rcon
 	origin_tech = "programming=4;engineering=3;powerstorage=5"
 
@@ -358,11 +363,11 @@
 	if(istype(I,/obj/item/weapon/screwdriver))
 		user.visible_message("\blue \the [user] adjusts the jumper on the [src]'s access protocol pins.", "\blue You adjust the jumper on the access protocol pins.")
 		if(src.build_path == /obj/machinery/computer/rdconsole/core)
-			src.name = "Circuit Board (RD Console - Robotics)"
+			src.name = T_BOARD("RD Console - Robotics")
 			src.build_path = /obj/machinery/computer/rdconsole/robotics
 			user << "\blue Access protocols set to robotics."
 		else
-			src.name = "Circuit Board (RD Console)"
+			src.name = T_BOARD("RD Console")
 			src.build_path = /obj/machinery/computer/rdconsole/core
 			user << "\blue Access protocols set to default."
 	return
@@ -469,3 +474,5 @@
 				var/B = new src.circuit.build_path ( src.loc )
 				src.circuit.construct(B)
 				del(src)
+
+#undef T_BOARD