Merge pull request #5049 from nivomi/master

Added examine descriptions to various objects

code/controllers/supply_shuttle.dm

@@ -76,6 +76,7 @@ var/global/datum/controller/supply_shuttle/supply_shuttle
 
 /obj/machinery/computer/supplycomp
 	name = "supply shuttle console"
+	desc = "Used to order supplies."
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "supply"
 	req_access = list(access_cargo)
@@ -89,6 +90,7 @@ var/global/datum/controller/supply_shuttle/supply_shuttle
 
 /obj/machinery/computer/ordercomp
 	name = "supply ordering console"
+	desc = "Used to order supplies from cargo staff."
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "request"
 	circuit = /obj/item/weapon/circuitboard/ordercomp

code/game/machinery/alarm.dm

@@ -46,6 +46,7 @@
 
 /obj/machinery/alarm
 	name = "alarm"
+	desc = "A machine that monitors atmosphere levels. Goes off if the area is dangerous."
 	icon = 'icons/obj/monitors.dmi'
 	icon_state = "alarm0"
 	anchored = 1

code/game/machinery/computer/Operating.dm

@@ -1,5 +1,6 @@
 /obj/machinery/computer/operating
 	name = "operating computer"
+	desc = "Used to monitor the vitals of a patient during surgery."
 	icon_state = "operating"
 	density = 1
 	anchored = 1.0

code/game/machinery/computer/aifixer.dm

@@ -1,5 +1,6 @@
 /obj/machinery/computer/aifixer
 	name = "\improper AI system integrity restorer"
+	desc = "Used with inteliCards containing nonfunctioning AIs to restore them to working order."
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "ai-fixer"
 	req_access = list(access_captain, access_robotics, access_heads)

code/game/machinery/computer/cloning.dm

@@ -1,6 +1,7 @@
 
 /obj/machinery/computer/cloning
 	name = "cloning console"
+	desc = "Used to clone people and manage DNA."
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "dna"
 	circuit = /obj/item/weapon/circuitboard/cloning

code/game/machinery/computer/prisoner.dm

@@ -1,5 +1,6 @@
 /obj/machinery/computer/prisoner
 	name = "prisoner management console"
+	desc = "Used to manage tracking implants placed inside criminals."
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "explosive"
 	req_access = list(access_brig)

code/game/machinery/status_display.dm

@@ -201,6 +201,7 @@
 
 /obj/machinery/ai_status_display
 	icon = 'icons/obj/status_display.dmi'
+	desc = "A small screen which the AI can use to present itself."
 	icon_state = "frame"
 	name = "\improper AI display"
 	anchored = 1

code/game/machinery/washing_machine.dm

@@ -1,5 +1,6 @@
 /obj/machinery/washing_machine
 	name = "washing machine"
+	desc = "Gets rid of those pesky bloodstains, or your money back!"
 	icon = 'icons/obj/machines/washing_machine.dmi'
 	icon_state = "wm_10"
 	density = 1

code/game/mecha/mech_bay.dm

@@ -78,6 +78,7 @@
 
 /obj/machinery/computer/mech_bay_power_console
 	name = "mech bay power control console"
+	desc = "Used to control mechbay power ports."
 	density = 1
 	anchored = 1
 	icon = 'icons/obj/computer.dmi'

code/game/mecha/mecha_control_console.dm

@@ -1,5 +1,6 @@
 /obj/machinery/computer/mecha
 	name = "exosuit control console"
+	desc = "Used to remotely locate or lockdown exosuits."
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "mecha"
 	req_access = list(access_robotics)

code/game/objects/items/devices/aicard.dm

@@ -1,5 +1,6 @@
 /obj/item/device/aicard
 	name = "inteliCard"
+	desc = "A storage device for AIs. Patent pending."
 	icon = 'icons/obj/aicards.dmi'
 	icon_state = "aicard" // aicard-full
 	item_state = "electronic"
@@ -56,7 +57,7 @@
 			dat += "<b>AI nonfunctional</b>"
 		else
 			if (!src.flush)
-				dat += {"<A href='byond://?src=\ref[src];choice=Wipe'>Wipe AI</A>"}
+				dat += {"<A href='byond://?src=\ref[src];choice=Wipe'>Wipe AI</A>"}
 			else
 				dat += "<b>Wipe in progress</b>"
 			dat += "<br>"

code/modules/food&drinks/kitchen machinery/microwave.dm

@@ -1,5 +1,6 @@
 /obj/machinery/microwave
 	name = "microwave"
+	desc = "Keeps hot things hot and cold things hot."
 	icon = 'icons/obj/kitchen.dmi'
 	icon_state = "mw"
 	layer = 2.9

code/modules/food&drinks/kitchen machinery/smartfridge.dm

@@ -3,6 +3,7 @@
 // -------------------------
 /obj/machinery/smartfridge
 	name = "smartfridge"
+	desc = "Keeps cold things cold and hot things cold."
 	icon = 'icons/obj/vending.dmi'
 	icon_state = "smartfridge"
 	layer = 2.9

code/modules/hydroponics/biogenerator.dm

@@ -1,6 +1,6 @@
 /obj/machinery/biogenerator
 	name = "Biogenerator"
-	desc = ""
+	desc = "Converts plants into biomass, which can be used to construct useful items."
 	icon = 'icons/obj/biogenerator.dmi'
 	icon_state = "biogen-empty"
 	density = 1
@@ -286,4 +286,4 @@
 	else if(href_list["menu"])
 		menustat = "menu"
 		updateUsrDialog()
-		
+

code/modules/mining/laborcamp/laborshuttle.dm

@@ -1,5 +1,6 @@
 /obj/machinery/computer/shuttle/labor
 	name = "labor shuttle console"
+	desc = "Used to call and send the labor camp shuttle."
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "shuttle"
 	circuit = /obj/item/weapon/circuitboard/labor_shuttle

code/modules/mining/mine_items.dm

@@ -43,6 +43,7 @@
 
 /obj/machinery/computer/shuttle/mining
 	name = "Mining Shuttle Console"
+	desc = "Used to call and send the mining shuttle."
 	req_access = list(access_mining)
 	circuit = /obj/item/weapon/circuitboard/mining_shuttle
 	id = "mining"

code/modules/paperwork/photocopier.dm

@@ -9,6 +9,7 @@
  */
 /obj/machinery/photocopier
 	name = "photocopier"
+	desc = "Used to copy important documents and anatomy studies."
 	icon = 'icons/obj/library.dmi'
 	icon_state = "bigscanner"
 	anchored = 1

code/modules/reagents/Chemistry-Machinery.dm

@@ -4,6 +4,7 @@
 
 /obj/machinery/chem_dispenser
 	name = "chem dispenser"
+	desc = "Creates and dispenses chemicals."
 	density = 1
 	anchored = 1
 	icon = 'icons/obj/chemical.dmi'
@@ -242,6 +243,7 @@
 
 /obj/machinery/chem_master
 	name = "ChemMaster 3000"
+	desc = "Used to bottle chemicals to create pills."
 	density = 1
 	anchored = 1
 	icon = 'icons/obj/chemical.dmi'
@@ -509,6 +511,7 @@
 
 /obj/machinery/chem_master/condimaster
 	name = "CondiMaster 3000"
+	desc = "Used to create condiments and other cooking supplies."
 	condi = 1
 
 ////////////////////////////////////////////////////////////////////////
@@ -516,6 +519,7 @@
 
 /obj/machinery/computer/pandemic
 	name = "PanD.E.M.I.C 2200"
+	desc = "Used to work with viruses."
 	density = 1
 	anchored = 1
 	icon = 'icons/obj/chemical.dmi'
@@ -805,6 +809,7 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
 /obj/machinery/reagentgrinder
 
 		name = "All-In-One Grinder"
+		desc = "Used to grind things up into raw materials."
 		icon = 'icons/obj/kitchen.dmi'
 		icon_state = "juicer1"
 		layer = 2.9

code/modules/research/circuitprinter.dm

@@ -6,6 +6,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
 */
 /obj/machinery/r_n_d/circuit_imprinter
 	name = "Circuit Imprinter"
+	desc = "Manufactures circuit boards for the construction of machines."
 	icon_state = "circuit_imprinter"
 	flags = OPENCONTAINER
 

code/modules/research/destructive_analyzer.dm

@@ -9,6 +9,7 @@ Note: Must be placed within 3 tiles of the R&D Console
 */
 /obj/machinery/r_n_d/destructive_analyzer
 	name = "Destructive Analyzer"
+	desc = "Learn science by destroying things!"
 	icon_state = "d_analyzer"
 	var/obj/item/weapon/loaded_item = null
 	var/decon_mod = 0

code/modules/research/protolathe.dm

@@ -9,6 +9,7 @@ Note: Must be placed west/left of and R&D console to function.
 */
 /obj/machinery/r_n_d/protolathe
 	name = "Protolathe"
+	desc = "Converts raw materials into useful objects."
 	icon_state = "protolathe"
 	flags = OPENCONTAINER
 

code/modules/research/rdconsole.dm

@@ -935,10 +935,12 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 
 /obj/machinery/computer/rdconsole/robotics
 	name = "Robotics R&D Console"
+	desc = "A console used to interface with R&D tools."
 	id = 2
 	req_access = null
 	req_access_txt = "29"
 
 /obj/machinery/computer/rdconsole/core
 	name = "Core R&D Console"
+	desc = "A console used to interface with R&D tools."
 	id = 1

code/modules/research/server.dm

@@ -176,6 +176,7 @@
 
 /obj/machinery/computer/rdservercontrol
 	name = "R&D Server Controller"
+	desc = "Used to manage access to research and manufacturing databases."
 	icon_state = "rdcomp"
 	var/screen = 0
 	var/obj/machinery/r_n_d/server/temp_server

html/changelogs/Nobalm-PR-5049.yml

@@ -0,0 +1,4 @@
+author: Nobalm
+delete-after: True
+changes:
+  - rscadd: Added examine descriptions to twenty eight objects.