Merge branch 'dev' into ofMechfabAndPanic

code/modules/research/rdconsole.dm

@@ -29,7 +29,8 @@ 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"
-	icon_state = "rdcomp"
+	icon_keyboard = "rd_key"
+	icon_screen = "rdcomp"
 	light_color = "#a97faa"
 	circuit = /obj/item/weapon/circuitboard/rdconsole
 	var/datum/research/files							//Stores all the collected research data.
@@ -151,7 +152,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 
 	src.updateUsrDialog()
 	return
-	
+
 /obj/machinery/computer/rdconsole/emp_act(var/remaining_charges, var/mob/user)
 	if(!emagged)
 		playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
@@ -259,9 +260,9 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 						linked_destroy.loaded_item = null
 						for(var/obj/I in linked_destroy.contents)
 							for(var/mob/M in I.contents)
-								M.death()
+								M.death()
 							if(istype(I,/obj/item/stack/material))//Only deconsturcts one sheet at a time instead of the entire stack
-								var/obj/item/stack/material/S = I
+								var/obj/item/stack/material/S = I
 								if(S.get_amount() > 1)
 									S.use(1)
 									linked_destroy.loaded_item = S
@@ -361,25 +362,24 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 	else if(href_list["lathe_ejectsheet"] && linked_lathe) //Causes the protolathe to eject a sheet of material
 		var/desired_num_sheets = text2num(href_list["amount"])
 		var/res_amount, type
-		var/material/M = name_to_material[href_list["lathe_ejectsheet"]]
+		var/material/M = get_material_by_name(href_list["lathe_ejectsheet"])
 		if(istype(M))
 			type = M.stack_type
-
-		switch(name_to_material[href_list["lathe_ejectsheet"]])
-			if(DEFAULT_WALL_MATERIAL)
-				res_amount = "m_amount"
-			if("glass")
-				res_amount = "g_amount"
-			if("gold")
-				res_amount = "gold_amount"
-			if("silver")
-				res_amount = "silver_amount"
-			if("phoron")
-				res_amount = "phoron_amount"
-			if("uranium")
-				res_amount = "uranium_amount"
-			if("diamond")
-				res_amount = "diamond_amount"
+			switch(M.name)
+				if(DEFAULT_WALL_MATERIAL)
+					res_amount = "m_amount"
+				if("glass")
+					res_amount = "g_amount"
+				if("gold")
+					res_amount = "gold_amount"
+				if("silver")
+					res_amount = "silver_amount"
+				if("phoron")
+					res_amount = "phoron_amount"
+				if("uranium")
+					res_amount = "uranium_amount"
+				if("diamond")
+					res_amount = "diamond_amount"
 
 		if(ispath(type) && hasvar(linked_lathe, res_amount))
 			var/obj/item/stack/material/sheet = new type(linked_lathe.loc)

code/modules/research/server.dm

@@ -119,8 +119,8 @@
 	if(default_deconstruction_screwdriver(user, O))
 		return
 	if(default_deconstruction_crowbar(user, O))
-		return
-	if(default_part_replacement(user, O))
+		return
+	if(default_part_replacement(user, O))
 		return
 
 /obj/machinery/r_n_d/server/centcom
@@ -155,7 +155,8 @@
 
 /obj/machinery/computer/rdservercontrol
 	name = "R&D Server Controller"
-	icon_state = "rdcomp"
+	icon_keyboard = "rd_key"
+	icon_screen = "rdcomp"
 	light_color = "#a97faa"
 	circuit = /obj/item/weapon/circuitboard/rdservercontrol
 	var/screen = 0