From 4a1dd9b312a184d2399dd0f20598a048a9a89b63 Mon Sep 17 00:00:00 2001
From: Supermichael777 <supermichael777@gmail.com>
Date: Wed, 7 Dec 2016 18:08:53 -0500
Subject: [PATCH 1/2] buffsssssss

---
 code/modules/recycling/conveyor2.dm | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 40a4bcc6340..a4919ed4d28 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -116,12 +116,15 @@
 // attack with item, place item on conveyor
 /obj/machinery/conveyor/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/weapon/crowbar))
-		if(!(stat & BROKEN))
-			var/obj/item/conveyor_construct/C = new/obj/item/conveyor_construct(src.loc)
-			C.id = id
-			transfer_fingerprints_to(C)
-		user << "<span class='notice'>You remove the conveyor belt.</span>"
-		qdel(src)
+		user.visible_message("<span class='notice'>[user] struggles to pry up \the [src] with \the [I].</span>", \
+		"<span class='notice'>You struggle to pry up \the [src] with \the [I].</span>")
+		if(do_after(user, 40/I.toolspeed, target = src))	
+			if(!(stat & BROKEN))
+				var/obj/item/conveyor_construct/C = new/obj/item/conveyor_construct(src.loc)
+				C.id = id
+				transfer_fingerprints_to(C)
+			user << "<span class='notice'>You remove the conveyor belt.</span>"
+			qdel(src)
 
 	else if(istype(I, /obj/item/weapon/wrench))
 		if(!(stat & BROKEN))

From dee934a9e9c572e3d83c974af5cd94af7c21fa04 Mon Sep 17 00:00:00 2001
From: oranges <email@oranges.net.nz>
Date: Sat, 10 Dec 2016 10:38:21 +1300
Subject: [PATCH 2/2] Update conveyor2.dm

---
 code/modules/recycling/conveyor2.dm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index a4919ed4d28..87ffac068c5 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -118,7 +118,9 @@
 	if(istype(I, /obj/item/weapon/crowbar))
 		user.visible_message("<span class='notice'>[user] struggles to pry up \the [src] with \the [I].</span>", \
 		"<span class='notice'>You struggle to pry up \the [src] with \the [I].</span>")
-		if(do_after(user, 40/I.toolspeed, target = src))	
+		if(do_after(user, 40/I.toolspeed, target = src))
+			if(qdeleted(src))
+				return //prevent multiple decontructs
 			if(!(stat & BROKEN))
 				var/obj/item/conveyor_construct/C = new/obj/item/conveyor_construct(src.loc)
 				C.id = id