From aeb15a85bea48742441c248035d651e38d58190b Mon Sep 17 00:00:00 2001
From: PsiOmega <git@psiomega.se>
Date: Tue, 7 Jul 2015 17:24:10 +0200
Subject: [PATCH] Adds missing R&D screens. Fixes the employee computer by
 cheating.

---
 code/game/machinery/computer/skills.dm |  4 +++-
 code/game/mecha/mech_bay.dm            | 30 ++++----------------------
 code/modules/research/rdconsole.dm     |  9 ++++----
 code/modules/research/server.dm        |  7 +++---
 4 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm
index 939e1b228b..7fdbff61f9 100644
--- a/code/game/machinery/computer/skills.dm
+++ b/code/game/machinery/computer/skills.dm
@@ -5,7 +5,6 @@
 	desc = "Used to view, edit and maintain employment records."
 	icon_keyboard = "laptop_key"
 	icon_screen = "medlaptop"
-	icon_state = "laptop"
 	light_color = "#00b000"
 	req_one_access = list(access_heads)
 	circuit = /obj/item/weapon/circuitboard/skills
@@ -24,6 +23,9 @@
 	var/sortBy = "name"
 	var/order = 1 // -1 = Descending - 1 = Ascending
 
+/obj/machinery/computer/skills/New()
+	..()
+	icon_state = "laptop"
 
 /obj/machinery/computer/skills/attackby(obj/item/O as obj, user as mob)
 	if(istype(O, /obj/item/weapon/card/id) && !scan)
diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm
index bb7f1e3529..7dc6f561ee 100644
--- a/code/game/mecha/mech_bay.dm
+++ b/code/game/mecha/mech_bay.dm
@@ -83,7 +83,7 @@
 
 /obj/machinery/mech_bay_recharge_port/proc/stop_charge()
 	if(recharge_console && !recharge_console.stat)
-		recharge_console.icon_state = initial(recharge_console.icon_state)
+		recharge_console.icon_screen = initial(recharge_console.icon_screen)
 	pr_recharger.stop()
 	return
 
@@ -137,8 +137,8 @@
 	name = "Mech Bay Power Control Console"
 	density = 1
 	anchored = 1
-	icon = 'icons/obj/computer.dmi'
-	icon_state = "recharge_comp"
+	icon_keyboard = "tech_key"
+	icon_screen = "recharge_comp"
 	light_color = "#a97faa"
 	circuit = /obj/item/weapon/circuitboard/mech_bay_power_console
 	var/autostart = 1
@@ -154,7 +154,7 @@
 		var/answer = recharge_port.start_charge(mecha)
 		if(answer)
 			recharge_port.set_voltage(voltage)
-			src.icon_state = initial(src.icon_state)+"_on"
+			src.icon_screen = initial(src.icon_screen)+"_on"
 	return
 
 /obj/machinery/computer/mech_bay_power_console/proc/mecha_out()
@@ -162,28 +162,6 @@
 		recharge_port.stop_charge()
 	return
 
-
-/obj/machinery/computer/mech_bay_power_console/power_change()
-	if(stat & BROKEN)
-		icon_state = initial(icon_state)+"_broken"
-		if(recharge_port)
-			recharge_port.stop_charge()
-	else if(powered())
-		icon_state = initial(icon_state)
-		stat &= ~NOPOWER
-	else
-		spawn(rand(0, 15))
-			icon_state = initial(icon_state)+"_nopower"
-			stat |= NOPOWER
-			if(recharge_port)
-				recharge_port.stop_charge()
-
-/obj/machinery/computer/mech_bay_power_console/set_broken()
-	icon_state = initial(icon_state)+"_broken"
-	stat |= BROKEN
-	if(recharge_port)
-		recharge_port.stop_charge()
-
 /obj/machinery/computer/mech_bay_power_console/attack_hand(mob/user as mob)
 	if(..())
 		return
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index 6311470641..da1eda9d48 100644
--- a/code/modules/research/rdconsole.dm
+++ b/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
diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm
index 893ef3383f..6553820f5b 100644
--- a/code/modules/research/server.dm
+++ b/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