From 9c1fffc16a7e44d0787fecff0261ca0df63aca95 Mon Sep 17 00:00:00 2001
From: GinjaNinja32 <ginjaninja32@gmail.com>
Date: Wed, 10 Dec 2014 01:49:23 +0000
Subject: [PATCH] Change unary atmos machine construction to use constructing
 mob's dir

---
 code/game/machinery/constructable_frame.dm | 17 +----------------
 code/game/machinery/machinery.dm           |  7 +++++--
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
index 03fa91212f..148abdb51d 100644
--- a/code/game/machinery/constructable_frame.dm
+++ b/code/game/machinery/constructable_frame.dm
@@ -113,7 +113,7 @@
 								break
 						if(component_check)
 							playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
-							var/obj/machinery/new_machine = new src.circuit.build_path(src.loc)
+							var/obj/machinery/new_machine = new src.circuit.build_path(src.loc, src.dir)
 							new_machine.component_parts.Cut()
 							src.circuit.construct(new_machine)
 							for(var/obj/O in src)
@@ -278,24 +278,9 @@ obj/item/weapon/circuitboard/rdserver
 
 /obj/item/weapon/circuitboard/unary_atmos
 	board_type = "machine"
-	var/machine_dir = SOUTH
-	var/init_dirs = SOUTH
-
-/obj/item/weapon/circuitboard/unary_atmos/attackby(obj/item/I as obj, mob/user as mob)
-	if(istype(I,/obj/item/weapon/screwdriver))
-		machine_dir = turn(machine_dir, 90)
-		init_dirs = machine_dir
-		user.visible_message("\blue \The [user] adjusts the jumper on the [src]'s port configuration pins.", "\blue You adjust the jumper on the port configuration pins. Now set to [dir2text(machine_dir)].")
-	return
-
-/obj/item/weapon/circuitboard/unary_atmos/examine(mob/user)
-	..(user)
-	user << "The jumper is connecting the [dir2text(machine_dir)] pins."
 
 /obj/item/weapon/circuitboard/unary_atmos/construct(var/obj/machinery/atmospherics/unary/U)
 	//TODO: Move this stuff into the relevant constructor when pipe/construction.dm is cleaned up.
-	U.set_dir(src.machine_dir)
-	U.initialize_directions = src.init_dirs
 	U.initialize()
 	U.build_network()
 	if (U.node)
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index 519219e96e..62a24d714d 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -129,8 +129,10 @@ Class Procs:
 		return 0
 	return apc.drain_power()
 
-/obj/machinery/New()
-	..()
+/obj/machinery/New(l, d=0)
+	..(l)
+	if(d)
+		set_dir(d)
 	if(!machinery_sort_required && ticker)
 		dd_insertObjectList(machines, src)
 	else
@@ -335,6 +337,7 @@ Class Procs:
 /obj/machinery/proc/dismantle()
 	playsound(loc, 'sound/items/Crowbar.ogg', 50, 1)
 	var/obj/machinery/constructable_frame/machine_frame/M = new /obj/machinery/constructable_frame/machine_frame(loc)
+	M.set_dir(src.dir)
 	M.state = 2
 	M.icon_state = "box_1"
 	for(var/obj/I in component_parts)