part1

code/game/objects/structures/crates_lockers/closets.dm

@@ -11,9 +11,11 @@
 	var/wall_mounted = 0 //never solid (You can always pass over it)
 	var/health = 100
 	var/lastbang
+	var/cutting_tool = /obj/item/weapon/weldingtool
 	var/sound = 'sound/machines/click.ogg'
-	var/storage_capacity = 30 //This is so that someone can't pack hundreds of items in a locker/crate
-							  //then open it in a populated area to crash clients.
+	var/cutting_sound = 'sound/items/Welder.ogg'
+	var/storage_capacity = 30 //This is so that someone can't pack hundreds of items in a locker/crate then open it in a populated area to crash clients.
+	var/material_drop = /obj/item/stack/sheet/metal
 
 /obj/structure/closet/New()
 	..()
@@ -257,16 +259,24 @@
 			src.MouseDrop_T(W:affecting, user)      //act like they were dragged onto the closet
 		if(istype(W,/obj/item/tk_grab))
 			return 0
-		if(istype(W, /obj/item/weapon/weldingtool))
-			var/obj/item/weapon/weldingtool/WT = W
-			if(!WT.remove_fuel(0,user))
-				to_chat(user, "<span class='notice'>You need more welding fuel to complete this task.</span>")
-				return
-			new /obj/item/stack/sheet/metal(src.loc)
-			for(var/mob/M in viewers(src))
-				M.show_message("<span class='notice'>\The [src] has been cut apart by [user] with \the [WT].</span>", 3, "You hear welding.", 2)
-			qdel(src)
-			return
+		if(istype(W, cutting_tool))
+			if(istype(W, /obj/item/weapon/weldingtool))
+				var/obj/item/weapon/weldingtool/WT = W
+				if(!WT.remove_fuel(0, user))
+					return
+				to_chat(user, "<span class='notice'>You begin cutting \the [src] apart...</span>")
+				playsound(loc, cutting_sound, 40, 1)
+				if(do_after(user, 40, 1, target = src))
+					if(!opened || !WT.isOn())
+						return
+					playsound(loc, cutting_sound, 50, 1)
+					visible_message("<span class='notice'>[user] slices apart \the [src].</span>",
+									"<span class='notice'>You cut \the [src] apart with \the [WT].</span>",
+									"<span class='italics'>You hear welding.</span>")
+					var/turf/T = get_turf(src)
+					new material_drop(T)
+					qdel(src)
+					return
 		if(isrobot(user))
 			return
 		if(!usr.drop_item())

code/game/objects/structures/crates_lockers/closets/cardboardbox.dm

@@ -6,6 +6,8 @@
 	icon_closed = "cardboard"
 	health = 10
 	sound = 'sound/effects/rustle2.ogg'
+	material_drop = /obj/item/stack/sheet/cardboard
+	cutting_sound = 'sound/items/poster_ripped.ogg'
 	var/move_delay = 0
 	var/egged = 0
 

code/game/objects/structures/crates_lockers/closets/crittercrate.dm

@@ -3,4 +3,5 @@
 	desc = "A crate which can sustain life for a while."
 	icon_state = "critter"
 	icon_opened = "critteropen"
-	icon_closed = "critter"
+	icon_closed = "critter"
+	material_drop = /obj/item/stack/sheet/wood