From d1218e38bbff658eeb8d00c849ffb5eb48b6f98d Mon Sep 17 00:00:00 2001
From: Bone White <glaucus_adonis@hotmail.com>
Date: Mon, 4 Aug 2014 12:28:26 +0100
Subject: [PATCH] Pipe wall drilling fix

Fixes the var/dir of the bent pipes when drilling into walls
---
 code/game/turfs/simulated/walls.dm            | 22 +++++++++++--------
 code/game/turfs/simulated/walls_reinforced.dm | 22 +++++++++++--------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm
index c30969bea07..e8dd96e844d 100644
--- a/code/game/turfs/simulated/walls.dm
+++ b/code/game/turfs/simulated/walls.dm
@@ -496,16 +496,20 @@
 					"[user] drills a hole in \the [src] and pushes \a [P] into the void", \
 					"\blue You have finished drilling in \the [src] and push the [P] into the void.", \
 					"You hear ratchet.")
-				/*
-				new /obj/item/pipe(loc, make_from=src)
-				for (var/obj/machinery/meter/meter in T)
-					if (meter.target == src)
-						new /obj/item/pipe_meter(T)
-						del(meter)
-				qdel(src)
-				*/
+
 				user.drop_item()
-				P.dir = user.dir
+				if (P.pipe_type in list (1,3,12))  // bent pipe rotation fix see construction.dm
+					P.dir = 5
+					if (user.dir == 1)
+						P.dir = 6
+					if (user.dir == 2)
+						P.dir = 9
+					if (user.dir == 4)
+						P.dir = 10
+					if (user.dir == 5)
+						P.dir = 8
+				else
+					P.dir = user.dir
 				P.x = src.x
 				P.y = src.y
 				P.z = src.z
diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm
index a74299cfb69..f16106cef99 100644
--- a/code/game/turfs/simulated/walls_reinforced.dm
+++ b/code/game/turfs/simulated/walls_reinforced.dm
@@ -327,16 +327,20 @@
 					"[user] drills a hole in \the [src] and pushes \a [P] into the void", \
 					"\blue You have finished drilling in \the [src] and push the [P] into the void.", \
 					"You hear ratchet.")
-				/*
-				new /obj/item/pipe(loc, make_from=src)
-				for (var/obj/machinery/meter/meter in T)
-					if (meter.target == src)
-						new /obj/item/pipe_meter(T)
-						del(meter)
-				qdel(src)
-				*/
+
 				user.drop_item()
-				P.dir = user.dir
+				if (P.pipe_type in list (1,3,12))  // bent pipe rotation fix see construction.dm
+					P.dir = 5
+					if (user.dir == 1)
+						P.dir = 6
+					if (user.dir == 2)
+						P.dir = 9
+					if (user.dir == 4)
+						P.dir = 10
+					if (user.dir == 5)
+						P.dir = 8
+				else
+					P.dir = user.dir
 				P.x = src.x
 				P.y = src.y
 				P.z = src.z