Merge pull request #6548 from Citadel-Station-13/upstream-merge-37483

[MIRROR] Fixes obj descs and adds missing ones

code/game/machinery/computer/Operating.dm

@@ -1,6 +1,6 @@
 /obj/machinery/computer/operating
 	name = "operating computer"
-	desc = "Used to monitor the vitals of a patient during surgery."
+	desc = "Monitors patient vitals and displays surgery steps. Can be loaded with surgery disks to perform experimental procedures."
 	icon_screen = "crew"
 	icon_keyboard = "med_key"
 	circuit = /obj/item/circuitboard/computer/operating

code/game/machinery/doors/shutters.dm

@@ -1,7 +1,7 @@
 /obj/machinery/door/poddoor/shutters
 	gender = PLURAL
 	name = "shutters"
-	desc = "Heavy duty metal shutters that opens mechanically."
+	desc = "Heavy duty metal shutters that open mechanically."
 	icon = 'icons/obj/doors/shutters.dmi'
 	layer = SHUTTER_LAYER
 	closingLayer = SHUTTER_LAYER

code/game/machinery/rechargestation.dm

@@ -1,5 +1,6 @@
 /obj/machinery/recharge_station
 	name = "cyborg recharging station"
+	desc = "This device recharges cyborgs and resupplies them with materials."
 	icon = 'icons/obj/objects.dmi'
 	icon_state = "borgcharger0"
 	density = FALSE

code/game/mecha/mech_bay.dm

@@ -1,5 +1,6 @@
 /turf/open/floor/mech_bay_recharge_floor               //        Whos idea it was
 	name = "mech bay recharge station"                      //        Recharging turfs
+	desc = "Parking a mech on this station will recharge its internal power cell."
 	icon = 'icons/turf/floors.dmi'                          //		  That are set in stone to check the west turf for recharge port
 	icon_state = "recharge_floor"                           //        Some people just want to watch the world burn i guess
 
@@ -12,6 +13,7 @@
 
 /obj/machinery/mech_bay_recharge_port
 	name = "mech bay power port"
+	desc = "This port recharges a mech's internal power cell."
 	density = TRUE
 	anchored = TRUE
 	dir = EAST
@@ -71,7 +73,7 @@
 
 /obj/machinery/computer/mech_bay_power_console
 	name = "mech bay power control console"
-	desc = "Used to control mechbay power ports."
+	desc = "Displays the status of mechs connected to the recharge station."
 	icon_screen = "recharge_comp"
 	icon_keyboard = "rd_key"
 	circuit = /obj/item/circuitboard/computer/mech_bay_power_console

code/modules/modular_computers/computers/machinery/console_presets.dm

@@ -30,6 +30,7 @@
 // ===== ENGINEERING CONSOLE =====
 /obj/machinery/modular_computer/console/preset/engineering
 	 console_department = "Engineering"
+	 name = "engineering console"
 	 desc = "A stationary computer. This one comes preloaded with engineering programs."
 
 /obj/machinery/modular_computer/console/preset/engineering/install_programs()
@@ -41,6 +42,7 @@
 // ===== RESEARCH CONSOLE =====
 /obj/machinery/modular_computer/console/preset/research
 	 console_department = "Research"
+	 name = "research director's console"
 	 desc = "A stationary computer. This one comes preloaded with research programs."
 	 _has_ai = 1
 
@@ -59,6 +61,7 @@
 // ===== COMMAND CONSOLE =====
 /obj/machinery/modular_computer/console/preset/command
 	 console_department = "Command"
+	 name = "command console"
 	 desc = "A stationary computer. This one comes preloaded with command programs."
 	 _has_id_slot = 1
 	 _has_printer = 1
@@ -75,6 +78,7 @@
 // ===== CIVILIAN CONSOLE =====
 /obj/machinery/modular_computer/console/preset/civilian
 	 console_department = "Civilian"
+	 name = "civilian console"
 	 desc = "A stationary computer. This one comes preloaded with generic programs."
 
 /obj/machinery/modular_computer/console/preset/civilian/install_programs()

code/modules/power/apc.dm

@@ -40,7 +40,7 @@
 
 /obj/machinery/power/apc
 	name = "area power controller"
-	desc = "A control terminal for the area electrical systems."
+	desc = "A control terminal for the area's electrical systems."
 
 	icon_state = "apc0"
 	anchored = TRUE

code/modules/research/machinery/departmental_circuit_imprinter.dm

@@ -1,6 +1,6 @@
 /obj/machinery/rnd/production/circuit_imprinter/department
-	name = "Department Circuit Imprinter"
+	name = "department circuit imprinter"
-	desc = "A special circuit imprinter with a built in interface meant for departmental usage, with built in ExoSync recievers allowing it to print designs researched that match its ROM-encoded department type. Features a bluespace materials reciever for recieving materials without the hassle of running to mining!"
+	desc = "A special circuit imprinter with a built in interface meant for departmental usage, with built in ExoSync recievers allowing it to print designs researched that match its ROM-encoded department type."
 	icon_state = "circuit_imprinter"
 	container_type = OPENCONTAINER
 	circuit = /obj/item/circuitboard/machine/circuit_imprinter/department
@@ -8,6 +8,6 @@
 	consoleless_interface = TRUE
 
 /obj/machinery/rnd/production/circuit_imprinter/department/science
-	name = "department protolathe (Science)"
+	name = "department circuit imprinter (Science)"
 	allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_SCIENCE
 	department_tag = "Science"

code/modules/research/machinery/departmental_protolathe.dm

@@ -1,6 +1,6 @@
 /obj/machinery/rnd/production/protolathe/department
 	name = "department protolathe"
-	desc = "A special protolathe with a built in interface meant for departmental usage, with built in ExoSync recievers allowing it to print designs researched that match its ROM-encoded department type. Features a bluespace materials reciever for recieving materials without the hassle of running to mining!"
+	desc = "A special protolathe with a built in interface meant for departmental usage, with built in ExoSync recievers allowing it to print designs researched that match its ROM-encoded department type."
 	icon_state = "protolathe"
 	container_type = OPENCONTAINER
 	circuit = /obj/item/circuitboard/machine/protolathe/department

code/modules/stock_market/computer.dm

@@ -1,5 +1,6 @@
 /obj/machinery/computer/stockexchange
 	name = "stock exchange computer"
+	desc = "A console that connects to the galactic stock market. Stocks trading involves substantial risk of loss and is not suitable for every cargo technician."
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "oldcomp"
 	icon_screen = "stock_computer"