diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm
index 25de2c5138b..b4b2830cbf8 100644
--- a/code/game/machinery/pipe/pipe_dispenser.dm
+++ b/code/game/machinery/pipe/pipe_dispenser.dm
@@ -5,6 +5,7 @@
 	density = 1
 	anchored = 1
 	var/unwrenched = 0
+	var/wait = 0
 
 /obj/machinery/pipedispenser/attack_paw(user as mob)
 	return src.attack_hand(user)
@@ -49,16 +50,20 @@
 	usr.machine = src
 	src.add_fingerprint(usr)
 	if(href_list["make"])
-		var/p_type = text2num(href_list["make"])
-		var/p_dir = text2num(href_list["dir"])
-		var/obj/item/pipe/P = new (/*usr.loc*/ src.loc, pipe_type=p_type, dir=p_dir)
-		P.update()
+		if(!wait)
+			var/p_type = text2num(href_list["make"])
+			var/p_dir = text2num(href_list["dir"])
+			var/obj/item/pipe/P = new (/*usr.loc*/ src.loc, pipe_type=p_type, dir=p_dir)
+			P.update()
+			wait = 1
+			spawn(10)
+				wait = 0
 	if(href_list["makemeter"])
-		new /obj/item/pipe_meter(/*usr.loc*/ src.loc)
-
-/*	for(var/mob/M in viewers(1, src))
-		if ((M.client && M.machine == src))
-			src.attack_hand(M)*/
+		if(!wait)
+			new /obj/item/pipe_meter(/*usr.loc*/ src.loc)
+			wait = 1
+			spawn(15)
+				wait = 0
 	return
 
 /obj/machinery/pipedispenser/attackby(var/obj/item/W as obj, var/mob/user as mob)
@@ -128,23 +133,24 @@
 	usr.machine = src
 	src.add_fingerprint(usr)
 	if(href_list["dmake"])
-		var/p_type = text2num(href_list["dmake"])
-		var/obj/structure/disposalconstruct/C = new (src.loc)
-		switch(p_type)
-			if(0)
-				C.ptype = 0
-			if(1)
-				C.ptype = 1
-			if(2)
-				C.ptype = 2
-			if(3)
-				C.ptype = 4
-			if(4)
-				C.ptype = 5
+		if(!wait)
+			var/p_type = text2num(href_list["dmake"])
+			var/obj/structure/disposalconstruct/C = new (src.loc)
+			switch(p_type)
+				if(0)
+					C.ptype = 0
+				if(1)
+					C.ptype = 1
+				if(2)
+					C.ptype = 2
+				if(3)
+					C.ptype = 4
+				if(4)
+					C.ptype = 5
 
-		C.update()
-
-		usr << browse(null, "window=pipedispenser")
-		usr.machine = null
+			C.update()
+			wait = 1
+			spawn(15)
+				wait = 0
 	return
 
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index d3b8c0e0782..81038181894 100644
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -103,15 +103,18 @@
 	desc = "Used to set the destination of properly wrapped packages."
 	icon_state = "forensic0"
 	var/currTag = 0
-	var/list/locationList = list(
-	"Disposals", "Bartender's Workspace", "Cafeteria", "Cargo Bay", "Chapel Office",
-	"Chemistry", "Chief Medical Officer's Office", "Crew Quarters Toilets", "Fitness",
-	"Head of Personnel's Office", "Head of Security's Office", "Hydroponics",
-	"Janitor's Closet", "Kitchen", "Library", "Locker Room", "Locker Toilets", "Medbay",
-	"Quartermaster's Office", "Research Director's Office", "Research Lab", "Robotics",
-	"Security", "Surgery", "Theatre", "Tool Storage")
+	var/list/locationList = list("Disposals",
+	"Cargo Bay", "QM Office", "Engineering", "CE Office",
+	"Atmospherics", "Security", "HoS Office", "Medbay",
+	"CMO Office", "Chemistry", "Research", "RD Office",
+	"Robotics", "HoP Office", "Library", "Chapel", "Theatre",
+	"Bar", "Kitchen", "Hydroponics", "Janitor Closet",)
 	//The whole system for the sorttype var is determined based on the order of this list,
 	//disposals must always be 1, since anything that's untagged will automatically go to disposals, or sorttype = 1 --Superxpdude
+
+	//If you don't want to fuck up disposals, add to this list, and don't change the order.
+	//If you insist on changing the order, you'll have to change every sort junction to reflect the new order. --Pete
+
 	w_class = 1
 	item_state = "electronic"
 	flags = FPRINT | TABLEPASS | ONBELT | CONDUCT
diff --git a/icons/obj/pipes/disposal.dmi b/icons/obj/pipes/disposal.dmi
index 395b2ffa727..92a4447d727 100644
Binary files a/icons/obj/pipes/disposal.dmi and b/icons/obj/pipes/disposal.dmi differ
diff --git a/icons/obj/recycling.dmi b/icons/obj/recycling.dmi
index df35fd37d8d..d1157432eca 100644
Binary files a/icons/obj/recycling.dmi and b/icons/obj/recycling.dmi differ