From b04d45f5668156853dfb08c8082784800ad7a37d Mon Sep 17 00:00:00 2001
From: hobnob13 <hobnob13@896068b8-3a4a-0410-b2c2-a9973c1052ca>
Date: Thu, 21 Aug 2008 16:52:07 +0000
Subject: [PATCH] Fix small visual bug for pipes

---
 Code/Machinery/Computer/drone_control.dm | 15 ++++++++-------
 Code/Machinery/pipes.dm                  |  4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Code/Machinery/Computer/drone_control.dm b/Code/Machinery/Computer/drone_control.dm
index ef1c694..5d5998b 100644
--- a/Code/Machinery/Computer/drone_control.dm
+++ b/Code/Machinery/Computer/drone_control.dm
@@ -3,14 +3,15 @@
 	icon = 'stationobjs.dmi'
 	icon_state = "drone_control"
 	var/mob/user = null
-	
+
 	New()
+		..()
 		spawn(10)
 			while (!config)
 				sleep(10)
 			if ((!config.humans_can_use_drones) || (!config.enable_drones))
 				del(src)
-		
+
 	attack_hand(var/mob/user as mob)
 		if(stat & (NOPOWER|BROKEN) ) return
 		if (!config.humans_can_use_drones)
@@ -19,17 +20,17 @@
 			return
 		if (istype(user, /mob/drone))
 			return
-		
+
 		var/list/L = list(  )
 		user.machine = src
-		
+
 		var/numDrones = 0
 		for(var/mob/drone/rob in world)
 			if (rob.stat==0)
 				L[rob.name] = rob
 				numDrones+=1
 		L = sortList(L)
-		
+
 		L["Cancel"] = "Cancel"
 		var/t = input(user, "Which drone would you like to change to?") as null|anything in L
 
@@ -41,7 +42,7 @@
 			user.machine = null
 			user.reset_view(null)
 			return 0
-		
+
 		var/selected = L[t]
 		if (istype(selected, /mob/drone))
 			user.machine = null
@@ -52,7 +53,7 @@
 	attack_ai(var/mob/user as mob)
 		user << "To control a drone, click it. The drone control stations are for humans."
 		return
-	
+
 	attack_paw(var/mob/user as mob)
 		user << "Monkeys can't control drones."
 		return
diff --git a/Code/Machinery/pipes.dm b/Code/Machinery/pipes.dm
index 861da97..0750df0 100644
--- a/Code/Machinery/pipes.dm
+++ b/Code/Machinery/pipes.dm
@@ -223,7 +223,7 @@ obj/machinery/pipes
 			if(!findbrokenpipe(T, dirs[1], level, 0))					// no broken pipe present
 				overlays += image('pipes.dmi', "discon[dirs[1]]", FLY_LAYER)
 
-		else if(!node2)														// node2 is not connected
+		if(!node2)														// node2 is not connected
 			if(!findbrokenpipe(T, dirs[2], level, 0))					// no broken pipe present
 				overlays += image('pipes.dmi', "discon[dirs[2]]", FLY_LAYER)
 
@@ -560,7 +560,7 @@ obj/machinery/pipes
 				if(!findbrokenpipe(T, dirs[1], level, 1))					// no broken pipe present
 					overlays += image('pipes.dmi', "discon-he[dirs[1]]", FLY_LAYER)
 
-			else if(!node2)														// node2 is not connected
+			if(!node2)														// node2 is not connected
 				if(!findbrokenpipe(T, dirs[2], level, 1))					// no broken pipe present
 					overlays += image('pipes.dmi', "discon-he[dirs[2]]", FLY_LAYER)