Fixed issue 222.

Improved closet/secure closet/crate code a bit. (Updated the paths on the map.)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2585 316c924e-a436-60f5-8080-3fe189b3f50e

code/modules/chemical/Chemistry-Tools.dm

@@ -604,7 +604,7 @@
 		/obj/machinery/chem_dispenser/,
 		/obj/machinery/reagentgrinder,
 		/obj/structure/table,
-		/obj/structure/secure_closet,
+		/obj/structure/closet/secure_closet,
 		/obj/structure/closet,
 		/obj/machinery/sink,
 		/obj/item/weapon/storage,

code/modules/mining/mine_items.dm

@@ -9,7 +9,7 @@
 
 /**********************Miner Lockers**************************/
 
-/obj/structure/secure_closet/miner
+/obj/structure/closet/secure_closet/miner
 	name = "Miner's Equipment"
 	icon_state = "miningsec1"
 	icon_closed = "miningsec"
@@ -18,7 +18,7 @@
 	icon_off = "miningsecoff"
 	req_access = list(access_mining)
 
-/obj/structure/secure_closet/miner/New()
+/obj/structure/closet/secure_closet/miner/New()
 	..()
 	sleep(2)
 	new /obj/item/device/analyzer(src)
@@ -220,14 +220,14 @@ proc/move_mining_shuttle()
 
 /**********************Mining car (Crate like thing, not the rail car)**************************/
 
-/obj/structure/crate/miningcar
+/obj/structure/closet/crate/miningcar
 	desc = "A mining car. This one doesn't work on rails, but has to be dragged."
 	name = "Mining car (not for rails)"
 	icon = 'storage.dmi'
 	icon_state = "miningcar"
 	density = 1
-	openicon = "miningcaropen"
-	closedicon = "miningcar"
+	icon_opened = "miningcaropen"
+	icon_closed = "miningcar"
 
 
 

code/modules/recycling/disposal.dm

@@ -94,7 +94,7 @@
 		for (var/mob/V in viewers(usr))
 			if(target == user && !user.stat && !user.weakened && !user.stunned && !user.paralysis)
 				V.show_message("[usr] starts climbing into the disposal.", 3)
-			if(target != user && !user.restrained())
+			if(target != user && !user.restrained() && !user.stat && !user.weakened && !user.stunned && !user.paralysis)
 				if(target.anchored) return
 				V.show_message("[usr] starts stuffing [target.name] into the disposal.", 3)
 		if(!do_after(usr, 20))
@@ -103,7 +103,7 @@
 												// must be awake, not stunned or whatever
 			msg = "[user.name] climbs into the [src]."
 			user << "You climb into the [src]."
-		else if(target != user && !user.restrained())
+		else if(target != user && !user.restrained() && !user.stat && !user.weakened && !user.stunned && !user.paralysis)
 			msg = "[user.name] stuffs [target.name] into the [src]!"
 			user << "You stuff [target.name] into the [src]!"
 		else

code/modules/recycling/sortingmachinery.dm

@@ -70,8 +70,8 @@
 				P.wrapped = O
 				O.loc = P
 				src.amount -= 1
-		else if (istype(target, /obj/structure/crate))
-			var/obj/structure/crate/O = target
+		else if (istype(target, /obj/structure/closet/crate))
+			var/obj/structure/closet/crate/O = target
 			if (src.amount > 3)
 				var/obj/effect/bigDelivery/P = new /obj/effect/bigDelivery(get_turf(O.loc))
 				P.wrapped = O