Corrects names of computers, code formatting, updated computer descriptions.

Everything in game/machinery/computers/ and modules/shuttles should now have properly (de)capitalized names. Computer, board and research names should now be coherent, too. Adds a research for employment records circuit board.

code/game/machinery/computer/HolodeckControl.dm

@@ -16,7 +16,7 @@ var/global/list/holodeck_programs = list(
 	)
 
 /obj/machinery/computer/HolodeckControl
-	name = "Holodeck Control Computer"
+	name = "holodeck control console"
 	desc = "A computer used to control a nearby holodeck."
 	icon_state = "holocontrol"
 	

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 = "Patient Monitor Console"
+	name = "patient monitoring console"
 	density = 1
 	anchored = 1.0
 	icon_state = "operating"

code/game/machinery/computer/RCON_Console.dm

@@ -1,5 +1,5 @@
 /obj/machinery/computer/rcon
-	name = "RCON Console"
+	name = "\improper RCON remote control console"
 	desc = "Console used to remotely control machinery on the station."
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "ai-fixer"

code/game/machinery/computer/ai_core.dm

@@ -1,7 +1,7 @@
 /obj/structure/AIcore
 	density = 1
 	anchored = 0
-	name = "AI core"
+	name = "\improper AI core"
 	icon = 'icons/mob/AI.dmi'
 	icon_state = "0"
 	var/state = 0
@@ -175,7 +175,7 @@
 				del(src)
 
 /obj/structure/AIcore/deactivated
-	name = "Inactive AI"
+	name = "inactive AI"
 	icon = 'icons/mob/AI.dmi'
 	icon_state = "ai-empty"
 	anchored = 1

code/game/machinery/computer/aifixer.dm

@@ -1,5 +1,5 @@
 /obj/machinery/computer/aifixer
-	name = "AI System Integrity Restorer"
+	name = "\improper AI system integrity restorer"
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "ai-fixer"
 	circuit = /obj/item/weapon/circuitboard/aifixer

code/game/machinery/computer/atmos_alert.dm

@@ -2,7 +2,7 @@
 
 
 /obj/machinery/computer/atmos_alert
-	name = "Atmospheric Alert Computer"
+	name = "atmospheric alert computer"
 	desc = "Used to access the station's atmospheric sensors."
 	circuit = "/obj/item/weapon/circuitboard/atmos_alert"
 	icon_state = "alert:0"

code/game/machinery/computer/buildandrepair.dm

@@ -116,7 +116,7 @@
 	build_path = /obj/machinery/computer/scan_consolenew
 	origin_tech = "programming=2;biotech=2"
 /obj/item/weapon/circuitboard/communications
-	name = T_BOARD("communications console")
+	name = T_BOARD("command and communications console")
 	build_path = /obj/machinery/computer/communications
 	origin_tech = "programming=2;magnets=2"
 /obj/item/weapon/circuitboard/card
@@ -126,7 +126,7 @@
 	name = T_BOARD("CentCom ID card modification console")
 	build_path = /obj/machinery/computer/card/centcom
 //obj/item/weapon/circuitboard/shield
-//	name = T_BOARD("Shield Control")
+//	name = T_BOARD("shield control console")
 //	build_path = "/obj/machinery/computer/stationshield"
 /obj/item/weapon/circuitboard/teleporter
 	name = T_BOARD("teleporter control console")
@@ -142,7 +142,7 @@
 	name = T_BOARD("station alert console")
 	build_path = /obj/machinery/computer/station_alert
 ///obj/item/weapon/circuitboard/atmospheresiphonswitch
-//	name = T_BOARD("Atmosphere Siphon Control")
+//	name = T_BOARD("atmosphere siphon control console")
 //	build_path = /obj/machinery/computer/atmosphere/siphonswitch
 /obj/item/weapon/circuitboard/air_management
 	name = T_BOARD("atmosphere monitoring console")
@@ -295,7 +295,7 @@
 	build_path = /obj/machinery/computer/area_atmos
 	origin_tech = "programming=2"
 /obj/item/weapon/circuitboard/prison_shuttle
-	name = T_BOARD("prison shuttle console")
+	name = T_BOARD("prison shuttle control console")
 	build_path = /obj/machinery/computer/prison_shuttle
 	origin_tech = "programming=2"
 /obj/item/weapon/circuitboard/rcon_console

code/game/machinery/computer/camera.dm

@@ -2,7 +2,7 @@
 
 
 /obj/machinery/computer/security
-	name = "Security Cameras"
+	name = "security camera monitor"
 	desc = "Used to access the various cameras on the station."
 	icon_state = "cameras"
 	var/obj/machinery/camera/current = null
@@ -151,28 +151,28 @@
 	circuit = null
 
 /obj/machinery/computer/security/wooden_tv
-	name = "Security Cameras"
+	name = "security camera monitor"
 	desc = "An old TV hooked into the stations camera network."
 	icon_state = "security_det"
 	circuit = null
 
 
 /obj/machinery/computer/security/mining
-	name = "Outpost Cameras"
+	name = "outpost camera monitor"
 	desc = "Used to access the various cameras on the outpost."
 	icon_state = "miningcameras"
 	network = list("MINE")
 	circuit = /obj/item/weapon/circuitboard/security/mining
 
 /obj/machinery/computer/security/engineering
-	name = "Engineering Cameras"
+	name = "engineering camera monitor"
 	desc = "Used to monitor fires and breaches."
 	icon_state = "engineeringcameras"
 	network = list("Engineering","Power Alarms","Atmosphere Alarms","Fire Alarms")
 	circuit = /obj/item/weapon/circuitboard/security/engineering
 
 /obj/machinery/computer/security/nuclear
-	name = "Mission Monitor"
+	name = "head mounted camera monitor"
 	desc = "Used to access the built-in cameras in helmets."
 	icon_state = "syndicam"
 	network = list("NUKE")

code/game/machinery/computer/card.dm

@@ -1,7 +1,7 @@
 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
 
 /obj/machinery/computer/card
-	name = "Identification Computer"
+	name = "\improper ID card modification console"
 	desc = "Terminal for programming NanoTrasen employee ID cards to access parts of the station."
 	icon_state = "id"
 	req_access = list(access_change_ids)
@@ -282,7 +282,7 @@
 	return 1
 
 /obj/machinery/computer/card/centcom
-	name = "CentCom Identification Computer"
+	name = "\improper CentCom ID card modification console"
 	circuit = "/obj/item/weapon/circuitboard/card/centcom"
 	req_access = list(access_cent_captain)
 

code/game/machinery/computer/cloning.dm

@@ -1,5 +1,5 @@
 /obj/machinery/computer/cloning
-	name = "Cloning Control Console"
+	name = "cloning control console"
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "dna"
 	circuit = "/obj/item/weapon/circuitboard/cloning"

code/game/machinery/computer/communications.dm

@@ -2,8 +2,8 @@
 
 // The communications computer
 /obj/machinery/computer/communications
-	name = "Communications Console"
+	name = "command and communications console"
-	desc = "This can be used for various important functions. Still under developement."
+	desc = "Used to command and control the station. Can relay long-range communications."
 	icon_state = "comm"
 	req_access = list(access_heads)
 	circuit = "/obj/item/weapon/circuitboard/communications"

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

code/game/machinery/computer/hologram.dm

@@ -1,7 +1,7 @@
 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
 
 /obj/machinery/computer/hologram_comp
-	name = "Hologram Computer"
+	name = "hologram computer"
 	desc = "Rumoured to control holograms."
 	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "holo_console0"

code/game/machinery/computer/law.dm

@@ -1,7 +1,7 @@
 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
 
 /obj/machinery/computer/aiupload
-	name = "AI Upload"
+	name = "\improper AI upload console"
 	desc = "Used to upload laws to the AI."
 	icon_state = "command"
 	circuit = "/obj/item/weapon/circuitboard/aiupload"
@@ -54,7 +54,7 @@
 
 
 /obj/machinery/computer/borgupload
-	name = "Cyborg Upload"
+	name = "cyborg upload console"
 	desc = "Used to upload laws to Cyborgs."
 	icon_state = "command"
 	circuit = "/obj/item/weapon/circuitboard/borgupload"

code/game/machinery/computer/lockdown.dm

@@ -3,7 +3,7 @@
 
 /obj/machinery/computer/lockdown
 	//for reference
-	/*name = "Lockdown Control"
+	/*name = "lockdown control"
 	desc = "Used to control blast doors."
 	icon_state = "lockdown"
 	circuit = "/obj/item/weapon/circuitboard/lockdown"

code/game/machinery/computer/medical.dm

@@ -1,8 +1,8 @@
 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
 
 /obj/machinery/computer/med_data//TODO:SANITY
-	name = "Medical Records"
+	name = "medical records console"
-	desc = "This can be used to check medical records."
+	desc = "This can be used to view, edit and maintain medical records."
 	icon_state = "medcomp"
 	req_one_access = list(access_medical, access_forensics_lockers)
 	circuit = "/obj/item/weapon/circuitboard/med_data"
@@ -551,4 +551,4 @@
 /obj/machinery/computer/med_data/laptop
 	name = "Medical Laptop"
 	desc = "Cheap Nanotrasen Laptop."
-	icon_state = "medlaptop"
+	icon_state = "medlaptop"

code/game/machinery/computer/message.dm

@@ -1,12 +1,8 @@
-
 // Allows you to monitor messages that passes the server.
 
-
-
-
 /obj/machinery/computer/message_monitor
-	name = "Message Monitor Console"
+	name = "messaging monitor console"
-	desc = "Used to Monitor the crew's messages, that are sent via PDA. Can also be used to view Request Console messages."
+	desc = "Used to access and maintain data on messaging servers. Allows you to view PDA and request console messages."
 	icon_state = "comm_logs"
 	var/hack_icon = "comm_logsc"
 	var/normal_icon = "comm_logs"

code/game/machinery/computer/pod.dm

@@ -1,8 +1,8 @@
 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
 
 /obj/machinery/computer/pod
-	name = "Pod Launch Control"
+	name = "pod launch control console"
-	desc = "A controll for launching pods. Some people prefer firing Mechas."
+	desc = "A control console for launching pods. Some people prefer firing Mechas."
 	icon_state = "computer_generic"
 	circuit = /obj/item/weapon/circuitboard/pod
 	var/id = 1.0

code/game/machinery/computer/prisoner.dm

@@ -1,7 +1,7 @@
 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
 
 /obj/machinery/computer/prisoner
-	name = "Prisoner Management"
+	name = "prisoner management console"
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "explosive"
 	req_access = list(access_armory)
@@ -100,5 +100,3 @@
 			src.add_fingerprint(usr)
 		src.updateUsrDialog()
 		return
-
-

code/game/machinery/computer/prisonshuttle.dm

@@ -11,7 +11,7 @@ var/prison_shuttle_time = 0
 var/prison_shuttle_timeleft = 0
 
 /obj/machinery/computer/prison_shuttle
-	name = "Prison Shuttle Console"
+	name = "prison shuttle control console"
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "shuttle"
 	req_access = list(access_security)

code/game/machinery/computer/robot.dm

@@ -1,9 +1,8 @@
 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
 
-
 /obj/machinery/computer/robotics
-	name = "Robotics Control"
+	name = "robotics control console"
-	desc = "Used to remotely lockdown or detonate linked Cyborgs."
+	desc = "Used to remotely lockdown or detonate linked cyborgs."
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "robot"
 	req_access = list(access_robotics)

code/game/machinery/computer/security.dm

@@ -1,8 +1,8 @@
 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
 
 /obj/machinery/computer/secure_data//TODO:SANITY
-	name = "Security Records"
+	name = "security records console"
-	desc = "Used to view and edit personnel's security records"
+	desc = "Used to view, edit and maintain security records"
 	icon_state = "security"
 	req_one_access = list(access_security, access_forensics_lockers)
 	circuit = "/obj/item/weapon/circuitboard/secure_data"

code/game/machinery/computer/skills.dm

@@ -1,8 +1,8 @@
 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
 
 /obj/machinery/computer/skills//TODO:SANITY
-	name = "Employment Records"
+	name = "employment records console"
-	desc = "Used to view personnel's employment records"
+	desc = "Used to view, edit and maintain employment records."
 	icon_state = "medlaptop"
 	req_one_access = list(access_heads)
 	circuit = "/obj/item/weapon/circuitboard/skills"

code/game/machinery/computer/specops_shuttle.dm

@@ -12,7 +12,7 @@ var/specops_shuttle_time = 0
 var/specops_shuttle_timeleft = 0
 
 /obj/machinery/computer/specops_shuttle
-	name = "Spec. Ops. Shuttle Console"
+	name = "special operations shuttle control console"
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "shuttle"
 	req_access = list(access_cent_specops)

code/game/machinery/computer/syndicate_specops_shuttle.dm

@@ -11,7 +11,7 @@ var/syndicate_elite_shuttle_time = 0
 var/syndicate_elite_shuttle_timeleft = 0
 
 /obj/machinery/computer/syndicate_elite_shuttle
-	name = "Elite Syndicate Squad Shuttle Console"
+	name = "elite syndicate squad shuttle control console"
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "syndishuttle"
 	req_access = list(access_cent_specops)

code/modules/power/smes_construction.dm

@@ -2,8 +2,8 @@
 
 //Construction Items
 /obj/item/weapon/smes_coil
-	name = "Superconductive Magnetic Coil"
+	name = "superconductive magnetic coil"
-	desc = "Heavy duty superconducting magnetic coil, mainly used in construction of SMES units."
+	desc = "Heavy duty superconductive 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!
 	w_class = 4.0 						// It's LARGE (backpack size)

code/modules/research/designs.dm

@@ -77,8 +77,8 @@ datum/design/New()
 
 ///////////////////Computer Boards///////////////////////////////////
 datum/design/circuit
-	req_tech = list("programming" = 2)
 	build_type = IMPRINTER
+	req_tech = list("programming" = 2)
 	materials = list("$glass" = 2000, "sacid" = 20)
 
 datum/design/circuit/AssembleDesignInfo()
@@ -109,11 +109,6 @@ datum/design/circuit/borgupload
 	req_tech = list("programming" = 4)
 	build_path = /obj/item/weapon/circuitboard/borgupload
 
-datum/design/circuit/med_data
-	name = "medical records console"
-	id = "med_data"
-	build_path = /obj/item/weapon/circuitboard/med_data
-
 datum/design/circuit/operating
 	name = "patient monitoring console"
 	id = "operating"
@@ -150,9 +145,19 @@ datum/design/circuit/teleconsole
 	id = "teleconsole"
 	req_tech = list("programming" = 3, "bluespace" = 2)
 
+datum/design/circuit/emp_data
+	name = "employment records console"
+	id = "emp_data"
+	build_path = /obj/item/weapon/circuitboard/skills
+
+datum/design/circuit/med_data
+	name = "medical records console"
+	id = "med_data"
+	build_path = /obj/item/weapon/circuitboard/med_data
+
 datum/design/circuit/secdata
 	name = "security records console"
-	id = "secdata"
+	id = "sec_data"
 	build_path = /obj/item/weapon/circuitboard/secure_data
 
 datum/design/circuit/atmosalerts
@@ -281,6 +286,29 @@ datum/design/circuit/aifixer
 	req_tech = list("programming" = 3, "biotech" = 2)
 	build_path = /obj/item/weapon/circuitboard/aifixer
 
+///////////////////////////////////
+/////////Shield Generators/////////
+///////////////////////////////////
+datum/design/shield
+	req_tech = list("bluespace" = 4, "phorontech" = 3)
+	materials = list("$glass" = 2000, "sacid" = 20, "$phoron" = 10000, "$diamond" = 5000, "$gold" = 10000)
+
+datum/design/shield/bubble
+	name = "bubble shield generator"
+	id = "shield_gen"
+	build_path = "/obj/machinery/shield_gen/external"
+
+datum/design/shield/hull
+	name = "hull shield generator"
+	id = "shield_gen_ex"
+	build_path = "/obj/machinery/shield_gen/external"
+
+datum/design/shield/capacitor
+	name = "shield capacitor"
+	id = "shield_cap"
+	req_tech = list("magnets" = 3, "powerstorage" = 4)
+	build_path = "/obj/machinery/shield_gen/external"
+
 ///////////////////////////////////
 //////////AI Module Disks//////////
 ///////////////////////////////////

code/modules/research/rdconsole.dm

@@ -32,7 +32,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 */
 
 /obj/machinery/computer/rdconsole
-	name = "R&D Console"
+	name = "R&D control console"
 	icon_state = "rdcomp"
 	circuit = /obj/item/weapon/circuitboard/rdconsole
 	var/datum/research/files							//Stores all the collected research data.

code/modules/shuttles/antagonist.dm

@@ -4,6 +4,6 @@
 	shuttle_tag = "Vox Skipjack"
 
 /obj/machinery/computer/shuttle_control/multi/syndicate
-	name = "Syndicate control console"
+	name = "mercenary shuttle control console"
 	req_access = list(access_syndicate)
-	shuttle_tag = "Mercenary"
+	shuttle_tag = "Mercenary"

code/modules/shuttles/departmental.dm

@@ -1,17 +1,17 @@
 /obj/machinery/computer/shuttle_control/mining
-	name = "mining shuttle console"
+	name = "mining shuttle control console"
 	shuttle_tag = "Mining"
 	//req_access = list(access_mining)
 	circuit = /obj/item/weapon/circuitboard/mining_shuttle
 
 /obj/machinery/computer/shuttle_control/engineering
-	name = "engineering shuttle console"
+	name = "engineering shuttle control console"
 	shuttle_tag = "Engineering"
 	//req_one_access_txt = "11;24"
 	circuit = /obj/item/weapon/circuitboard/engineering_shuttle
 
 /obj/machinery/computer/shuttle_control/research
-	name = "research shuttle console"
+	name = "research shuttle control console"
 	shuttle_tag = "Research"
 	//req_access = list(access_research)
-	circuit = /obj/item/weapon/circuitboard/research_shuttle
+	circuit = /obj/item/weapon/circuitboard/research_shuttle

code/modules/shuttles/shuttle.dm

@@ -126,4 +126,4 @@
 
 //returns 1 if the shuttle has a valid arrive time
 /datum/shuttle/proc/has_arrive_time()
-	return (moving_status == SHUTTLE_INTRANSIT)
+	return (moving_status == SHUTTLE_INTRANSIT)

code/modules/shuttles/shuttle_emergency.dm

@@ -1,4 +1,3 @@
-
 /datum/shuttle/ferry/emergency
 	//pass
 

code/modules/shuttles/shuttle_ferry.dm

@@ -1,4 +1,3 @@
-
 #define DOCK_ATTEMPT_TIMEOUT 200	//how long in ticks we wait before assuming the docking controller is broken or blown up.
 
 /datum/shuttle/ferry

code/modules/shuttles/shuttle_supply.dm

@@ -1,8 +1,3 @@
-
-
-
-
-
 /datum/shuttle/ferry/supply
 	var/away_location = 1	//the location to hide at while pretending to be in-transit
 	var/late_chance = 80
@@ -76,4 +71,4 @@
 //returns the ETA in minutes
 /datum/shuttle/ferry/supply/proc/eta_minutes()
 	var/ticksleft = arrive_time - world.time
-	return round(ticksleft/600,1)
+	return round(ticksleft/600,1)

code/modules/shuttles/shuttles_multi.dm

@@ -140,4 +140,4 @@
 		MS.short_jump(MS.last_departed, MS.destinations[choice])
 		MS.last_departed = MS.destinations[choice]
 
-	updateUsrDialog()
+	updateUsrDialog()