From da52e0d847c13f998d2b7b92f90e85badcaf4019 Mon Sep 17 00:00:00 2001
From: "giacomand@gmail.com"
 <giacomand@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Fri, 21 Dec 2012 20:55:49 +0000
Subject: [PATCH] -Didn't realize atmo_control.dm used a different attackby for
 a reason. Reverted the changes. -Bit more cleaning.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5371 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/game/machinery/atmo_control.dm           | 65 +++++++++++++++++++
 .../atmoalter/area_atmos_computer.dm          | 22 -------
 2 files changed, 65 insertions(+), 22 deletions(-)

diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm
index 5216cc08a37..f949cc5cc09 100644
--- a/code/game/machinery/atmo_control.dm
+++ b/code/game/machinery/atmo_control.dm
@@ -97,6 +97,39 @@ obj/machinery/computer/general_air_control
 		..()
 		src.updateDialog()
 
+	attackby(I as obj, user as mob)
+		if(istype(I, /obj/item/weapon/screwdriver))
+			playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
+			if(do_after(user, 20))
+				if (src.stat & BROKEN)
+					user << "\blue The broken glass falls out."
+					var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
+					new /obj/item/weapon/shard( src.loc )
+					var/obj/item/weapon/circuitboard/air_management/M = new /obj/item/weapon/circuitboard/air_management( A )
+					for (var/obj/C in src)
+						C.loc = src.loc
+					M.frequency = src.frequency
+					A.circuit = M
+					A.state = 3
+					A.icon_state = "3"
+					A.anchored = 1
+					del(src)
+				else
+					user << "\blue You disconnect the monitor."
+					var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
+					var/obj/item/weapon/circuitboard/air_management/M = new /obj/item/weapon/circuitboard/air_management( A )
+					for (var/obj/C in src)
+						C.loc = src.loc
+					M.frequency = src.frequency
+					A.circuit = M
+					A.state = 4
+					A.icon_state = "4"
+					A.anchored = 1
+					del(src)
+		else
+			src.attack_hand(user)
+		return
+
 	receive_signal(datum/signal/signal)
 		if(!signal || signal.encryption) return
 
@@ -263,6 +296,38 @@ Max Output Pressure: [output_pressure] kPa<BR>"}
 		var/cutoff_temperature = 2000
 		var/on_temperature = 1200
 
+		attackby(I as obj, user as mob)
+			if(istype(I, /obj/item/weapon/screwdriver))
+				playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
+				if(do_after(user, 20))
+					if (src.stat & BROKEN)
+						user << "\blue The broken glass falls out."
+						var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
+						new /obj/item/weapon/shard( src.loc )
+						var/obj/item/weapon/circuitboard/injector_control/M = new /obj/item/weapon/circuitboard/injector_control( A )
+						for (var/obj/C in src)
+							C.loc = src.loc
+						M.frequency = src.frequency
+						A.circuit = M
+						A.state = 3
+						A.icon_state = "3"
+						A.anchored = 1
+						del(src)
+					else
+						user << "\blue You disconnect the monitor."
+						var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
+						var/obj/item/weapon/circuitboard/injector_control/M = new /obj/item/weapon/circuitboard/injector_control( A )
+						for (var/obj/C in src)
+							C.loc = src.loc
+						M.frequency = src.frequency
+						A.circuit = M
+						A.state = 4
+						A.icon_state = "4"
+						A.anchored = 1
+						del(src)
+			else
+				src.attack_hand(user)
+			return
 
 		process()
 			if(automation)
diff --git a/code/game/machinery/atmoalter/area_atmos_computer.dm b/code/game/machinery/atmoalter/area_atmos_computer.dm
index 0f7678b0e85..10e0366123b 100644
--- a/code/game/machinery/atmoalter/area_atmos_computer.dm
+++ b/code/game/machinery/atmoalter/area_atmos_computer.dm
@@ -128,28 +128,6 @@
 
 		src.updateUsrDialog()
 
-	attackby(I as obj, user as mob)
-		if(istype(I, /obj/item/weapon/screwdriver))
-			playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
-			if(do_after(user, 20))
-				var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
-				var/obj/item/weapon/circuitboard/area_atmos/M = new /obj/item/weapon/circuitboard/area_atmos( A )
-				for (var/obj/C in src)
-					C.loc = src.loc
-				A.circuit = M
-				A.anchored = 1
-
-				if (src.stat & BROKEN)
-					user << "\blue The broken glass falls out."
-					new /obj/item/weapon/shard( src.loc )
-					A.state = 3
-					A.icon_state = "3"
-				else
-					user << "\blue You disconnect the monitor."
-					A.state = 4
-					A.icon_state = "4"
-
-				del(src)
 
 /obj/machinery/computer/area_atmos/area
 	zone = "This computer is working in a wired network limited to this area."