Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update

# Conflicts:
#	code/modules/mining/machine_stacking.dm
#       Resolved
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm #       Resolved mostly besides line 717 "plasteel: undefined var"
#       even though the only change in this line is removing the comment
#	icons/mob/widerobot_vr.dmi
#       Resolved
#	maps/tether/tether-07-station3.dmm
#       Resolved

code/modules/research/designs/circuits/circuits.dm

@@ -102,6 +102,13 @@ CIRCUITS BELOW
 	build_path = /obj/item/weapon/circuitboard/clonescanner
 	sort_string = "FAGAG"
 
+/datum/design/circuit/chem_master
+	name = "ChemMaster 3000"
+	id = "chemmaster"
+	req_tech = list(TECH_DATA = 3, TECH_MAGNET = 2)
+	build_path = /obj/item/weapon/circuitboard/chem_master
+	sort_string = "FAGAH"
+
 /datum/design/circuit/crewconsole
 	name = "crew monitoring console"
 	id = "crewconsole"
@@ -607,6 +614,13 @@ CIRCUITS BELOW
 	build_path = /obj/item/weapon/circuitboard/aicore
 	sort_string = "XAAAA"
 
+/datum/design/circuit/microwave/advanced
+	name = "deluxe microwave"
+	id = "deluxe microwave"
+	req_tech = list(TECH_DATA = 5, TECH_ENGINEERING = 5, TECH_BLUESPACE = 4)
+	build_path = /obj/item/weapon/circuitboard/microwave/advanced
+	sort_string = "MAAAC"
+
 
 /* I have no idea how this was even running before, but it doesn't seem to be necessary.
 ///////////////////////////////////

code/modules/research/message_server.dm

@@ -51,6 +51,7 @@ var/global/list/obj/machinery/message_server/message_servers = list()
 	icon = 'icons/obj/machines/research.dmi'
 	icon_state = "server"
 	name = "Messaging Server"
+	desc = "Facilitates both PDA messages and request console functions."
 	density = 1
 	anchored = 1.0
 	use_power = 1
@@ -80,6 +81,11 @@ var/global/list/obj/machinery/message_server/message_servers = list()
 	..()
 	return
 
+/obj/machinery/message_server/examine(mob/user, distance, infix, suffix)
+	if(..())
+		to_chat(user, "It appears to be [active ? "online" : "offline"].")
+	
+
 /obj/machinery/message_server/proc/GenerateKey()
 	//Feel free to move to Helpers.
 	var/newKey
@@ -231,6 +237,7 @@ var/obj/machinery/blackbox_recorder/blackbox
 	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "blackbox"
 	name = "Blackbox Recorder"
+	desc = "Records all radio communications, as well as various other information in case of the worst."
 	density = 1
 	anchored = 1.0
 	use_power = 1

code/modules/research/rdconsole.dm

@@ -29,6 +29,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 control console"
+	desc = "Science, in a computer! Experiment results not guaranteed."
 	icon_keyboard = "rd_key"
 	icon_screen = "rdcomp"
 	light_color = "#a97faa"
@@ -393,7 +394,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 			var/obj/item/weapon/paper/PR = new/obj/item/weapon/paper
 			PR.name = "list of researched technologies"
 			PR.info = "<center><b>[station_name()] Science Laboratories</b>"
-			PR.info += "<h2>[ (text2num(href_list["print"]) == 2) ? "Detailed" : ] Research Progress Report</h2>"
+			PR.info += "<h2>[ (text2num(href_list["print"]) == 2) ? "Detailed" : null] Research Progress Report</h2>"
 			PR.info += "<i>report prepared at [stationtime2text()] station time</i></center><br>"
 			if(text2num(href_list["print"]) == 2)
 				PR.info += GetResearchListInfo()

code/modules/research/server.dm

@@ -150,6 +150,7 @@
 
 /obj/machinery/computer/rdservercontrol
 	name = "R&D Server Controller"
+	desc = "Manage the research designs and servers. Can also modify upload/download permissions to R&D consoles."
 	icon_keyboard = "rd_key"
 	icon_screen = "rdcomp"
 	light_color = "#a97faa"